Skip to content

Commit 4a9c6a4

Browse files
marko-bekhtamarko-bekhta
committed
HSEARCH-5160 Adjustments for the dependency update job
1 parent 155f61f commit 4a9c6a4

File tree

5 files changed

+55
-27
lines changed

5 files changed

+55
-27
lines changed

‎ci/dependency-update/Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ Map settings() {
3434
]
3535
case 'lucene10':
3636
return [
37-
updateProperties: ['version.org.apache.lucene'],
38-
onlyRunTestDependingOn: ['hibernate-search-backend-lucene'],
39-
additionalMavenArgs: '-Dtest.elasticsearch.skip=true -pl :hibernate-search-engine,:hibernate-search-backend-lucene,:hibernate-search-util-internal-integrationtest-backend-lucene,:hibernate-search-v5migrationhelper-engine'
37+
updateProperties: ['version.org.apache.lucene.next'],
38+
onlyRunTestDependingOn: ['hibernate-search-backend-lucene-next'],
39+
additionalMavenArgs: '-Dtest.elasticsearch.skip=true -pl :hibernate-search-backend-lucene-next,:hibernate-search-util-internal-integrationtest-backend-lucene-next'
4040
]
4141
// Targets the next micro release of the latest/currently integrated version of Elasticsearch
4242
// (previous minor version is already published)

‎lucene-next/build/parents/integrationtest/pom.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
<transform.output.test.resources.path>${transform.output.root.path}/test/resources</transform.output.test.resources.path>
3131

3232
<sonar.tests>${project.build.directory}/copied-sources</sonar.tests>
33+
<!--
34+
Maven's versions plugin is not able to update the `version.org.apache.lucene.next` property in the root POM
35+
But it can update it once it's in these poms that override the Lucene dependency management.
36+
Hence, we are using this `version.org.apache.lucene.next.updatable` property:
37+
-->
38+
<version.org.apache.lucene.next.updatable>${version.org.apache.lucene.next}</version.org.apache.lucene.next.updatable>
3339
</properties>
3440

3541
<dependencyManagement>
@@ -38,32 +44,32 @@
3844
<dependency>
3945
<groupId>org.apache.lucene</groupId>
4046
<artifactId>lucene-core</artifactId>
41-
<version>${version.org.apache.lucene.next}</version>
47+
<version>${version.org.apache.lucene.next.updatable}</version>
4248
</dependency>
4349
<dependency>
4450
<groupId>org.apache.lucene</groupId>
4551
<artifactId>lucene-analysis-common</artifactId>
46-
<version>${version.org.apache.lucene.next}</version>
52+
<version>${version.org.apache.lucene.next.updatable}</version>
4753
</dependency>
4854
<dependency>
4955
<groupId>org.apache.lucene</groupId>
5056
<artifactId>lucene-queryparser</artifactId>
51-
<version>${version.org.apache.lucene.next}</version>
57+
<version>${version.org.apache.lucene.next.updatable}</version>
5258
</dependency>
5359
<dependency>
5460
<groupId>org.apache.lucene</groupId>
5561
<artifactId>lucene-join</artifactId>
56-
<version>${version.org.apache.lucene.next}</version>
62+
<version>${version.org.apache.lucene.next.updatable}</version>
5763
</dependency>
5864
<dependency>
5965
<groupId>org.apache.lucene</groupId>
6066
<artifactId>lucene-facet</artifactId>
61-
<version>${version.org.apache.lucene.next}</version>
67+
<version>${version.org.apache.lucene.next.updatable}</version>
6268
</dependency>
6369
<dependency>
6470
<groupId>org.apache.lucene</groupId>
6571
<artifactId>lucene-highlighter</artifactId>
66-
<version>${version.org.apache.lucene.next}</version>
72+
<version>${version.org.apache.lucene.next.updatable}</version>
6773
</dependency>
6874
</dependencies>
6975
</dependencyManagement>

‎lucene-next/build/parents/internal/pom.xml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,46 @@
1818
<name>Hibernate Search Parent POM for Internal Artifacts - Lucene 10</name>
1919
<description>Common build configuration for all internal (non-published) artifacts - Lucene 10 version</description>
2020

21+
<properties>
22+
<!--
23+
Maven's versions plugin is not able to update the `version.org.apache.lucene.next` property in the root POM
24+
But it can update it once it's in these poms that override the Lucene dependency management.
25+
Hence, we are using this `version.org.apache.lucene.next.updatable` property:
26+
-->
27+
<version.org.apache.lucene.next.updatable>${version.org.apache.lucene.next}</version.org.apache.lucene.next.updatable>
28+
</properties>
2129
<dependencyManagement>
2230
<dependencies>
2331
<!-- Lucene backend -->
2432
<dependency>
2533
<groupId>org.apache.lucene</groupId>
2634
<artifactId>lucene-core</artifactId>
27-
<version>${version.org.apache.lucene.next}</version>
35+
<version>${version.org.apache.lucene.next.updatable}</version>
2836
</dependency>
2937
<dependency>
3038
<groupId>org.apache.lucene</groupId>
3139
<artifactId>lucene-analysis-common</artifactId>
32-
<version>${version.org.apache.lucene.next}</version>
40+
<version>${version.org.apache.lucene.next.updatable}</version>
3341
</dependency>
3442
<dependency>
3543
<groupId>org.apache.lucene</groupId>
3644
<artifactId>lucene-queryparser</artifactId>
37-
<version>${version.org.apache.lucene.next}</version>
45+
<version>${version.org.apache.lucene.next.updatable}</version>
3846
</dependency>
3947
<dependency>
4048
<groupId>org.apache.lucene</groupId>
4149
<artifactId>lucene-join</artifactId>
42-
<version>${version.org.apache.lucene.next}</version>
50+
<version>${version.org.apache.lucene.next.updatable}</version>
4351
</dependency>
4452
<dependency>
4553
<groupId>org.apache.lucene</groupId>
4654
<artifactId>lucene-facet</artifactId>
47-
<version>${version.org.apache.lucene.next}</version>
55+
<version>${version.org.apache.lucene.next.updatable}</version>
4856
</dependency>
4957
<dependency>
5058
<groupId>org.apache.lucene</groupId>
5159
<artifactId>lucene-highlighter</artifactId>
52-
<version>${version.org.apache.lucene.next}</version>
60+
<version>${version.org.apache.lucene.next.updatable}</version>
5361
</dependency>
5462

5563
<dependency>

‎lucene-next/build/parents/public/pom.xml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,46 @@
1818
<name>Hibernate Search Parent POM for Public Artifacts - Lucene 10</name>
1919
<description>Common build configuration for all public artifacts - Lucene 10</description>
2020

21+
<properties>
22+
<!--
23+
Maven's versions plugin is not able to update the `version.org.apache.lucene.next` property in the root POM
24+
But it can update it once it's in these poms that override the Lucene dependency management.
25+
Hence, we are using this `version.org.apache.lucene.next.updatable` property:
26+
-->
27+
<version.org.apache.lucene.next.updatable>${version.org.apache.lucene.next}</version.org.apache.lucene.next.updatable>
28+
</properties>
2129
<dependencyManagement>
2230
<dependencies>
2331
<!-- Lucene backend -->
2432
<dependency>
2533
<groupId>org.apache.lucene</groupId>
2634
<artifactId>lucene-core</artifactId>
27-
<version>${version.org.apache.lucene.next}</version>
35+
<version>${version.org.apache.lucene.next.updatable}</version>
2836
</dependency>
2937
<dependency>
3038
<groupId>org.apache.lucene</groupId>
3139
<artifactId>lucene-analysis-common</artifactId>
32-
<version>${version.org.apache.lucene.next}</version>
40+
<version>${version.org.apache.lucene.next.updatable}</version>
3341
</dependency>
3442
<dependency>
3543
<groupId>org.apache.lucene</groupId>
3644
<artifactId>lucene-queryparser</artifactId>
37-
<version>${version.org.apache.lucene.next}</version>
45+
<version>${version.org.apache.lucene.next.updatable}</version>
3846
</dependency>
3947
<dependency>
4048
<groupId>org.apache.lucene</groupId>
4149
<artifactId>lucene-join</artifactId>
42-
<version>${version.org.apache.lucene.next}</version>
50+
<version>${version.org.apache.lucene.next.updatable}</version>
4351
</dependency>
4452
<dependency>
4553
<groupId>org.apache.lucene</groupId>
4654
<artifactId>lucene-facet</artifactId>
47-
<version>${version.org.apache.lucene.next}</version>
55+
<version>${version.org.apache.lucene.next.updatable}</version>
4856
</dependency>
4957
<dependency>
5058
<groupId>org.apache.lucene</groupId>
5159
<artifactId>lucene-highlighter</artifactId>
52-
<version>${version.org.apache.lucene.next}</version>
60+
<version>${version.org.apache.lucene.next.updatable}</version>
5361
</dependency>
5462

5563
<dependency>

‎lucene-next/build/parents/springtest/pom.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<transform.output.test.resources.path>${transform.output.root.path}/test/resources</transform.output.test.resources.path>
3030

3131
<sonar.tests>${project.build.directory}/copied-sources</sonar.tests>
32+
<!--
33+
Maven's versions plugin is not able to update the `version.org.apache.lucene.next` property in the root POM
34+
But it can update it once it's in these poms that override the Lucene dependency management.
35+
Hence, we are using this `version.org.apache.lucene.next.updatable` property:
36+
-->
37+
<version.org.apache.lucene.next.updatable>${version.org.apache.lucene.next}</version.org.apache.lucene.next.updatable>
3238
</properties>
3339

3440
<dependencyManagement>
@@ -37,32 +43,32 @@
3743
<dependency>
3844
<groupId>org.apache.lucene</groupId>
3945
<artifactId>lucene-core</artifactId>
40-
<version>${version.org.apache.lucene.next}</version>
46+
<version>${version.org.apache.lucene.next.updatable}</version>
4147
</dependency>
4248
<dependency>
4349
<groupId>org.apache.lucene</groupId>
4450
<artifactId>lucene-analysis-common</artifactId>
45-
<version>${version.org.apache.lucene.next}</version>
51+
<version>${version.org.apache.lucene.next.updatable}</version>
4652
</dependency>
4753
<dependency>
4854
<groupId>org.apache.lucene</groupId>
4955
<artifactId>lucene-queryparser</artifactId>
50-
<version>${version.org.apache.lucene.next}</version>
56+
<version>${version.org.apache.lucene.next.updatable}</version>
5157
</dependency>
5258
<dependency>
5359
<groupId>org.apache.lucene</groupId>
5460
<artifactId>lucene-join</artifactId>
55-
<version>${version.org.apache.lucene.next}</version>
61+
<version>${version.org.apache.lucene.next.updatable}</version>
5662
</dependency>
5763
<dependency>
5864
<groupId>org.apache.lucene</groupId>
5965
<artifactId>lucene-facet</artifactId>
60-
<version>${version.org.apache.lucene.next}</version>
66+
<version>${version.org.apache.lucene.next.updatable}</version>
6167
</dependency>
6268
<dependency>
6369
<groupId>org.apache.lucene</groupId>
6470
<artifactId>lucene-highlighter</artifactId>
65-
<version>${version.org.apache.lucene.next}</version>
71+
<version>${version.org.apache.lucene.next.updatable}</version>
6672
</dependency>
6773

6874
<dependency>

0 commit comments

Comments
 (0)