Skip to content

Commit 4620f9b

Browse files
committed
HSEARCH-5508 Test against Elasticsearch 9.2.0 by default
1 parent 0d31a39 commit 4620f9b

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,8 @@ stage('Configure') {
262262
new LocalElasticsearchBuildEnvironment(version: '8.18.7', condition: TestCondition.ON_DEMAND),
263263
new LocalElasticsearchBuildEnvironment(version: '8.19.4', condition: TestCondition.AFTER_MERGE),
264264
new LocalElasticsearchBuildEnvironment(version: '9.0.7', condition: TestCondition.ON_DEMAND),
265-
new LocalElasticsearchBuildEnvironment(version: '9.1.5', condition: TestCondition.BEFORE_MERGE, isDefault: true),
265+
new LocalElasticsearchBuildEnvironment(version: '9.1.5', condition: TestCondition.ON_DEMAND),
266+
new LocalElasticsearchBuildEnvironment(version: '9.2.0', condition: TestCondition.BEFORE_MERGE, isDefault: true),
266267
// IMPORTANT: Make sure to update the documentation for any newly supported Elasticsearch versions
267268
// See version.org.elasticsearch.compatible.expected.text
268269
// and version.org.elasticsearch.compatible.regularly-tested.text in POMs.

build/container/search-backend/elastic.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# * update `version.org.elasticsearch.latest` property in a POM file.
66
# * update the tags for 'elasticsearch-current' and 'elasticsearch-next' builds in ci/dependency-update/Jenkinsfile
77
#
8-
FROM docker.io/elastic/elasticsearch:9.1.5
8+
FROM docker.io/elastic/elasticsearch:9.2.0

build/parents/build/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<!-- The versions of Elasticsearch advertised as compatible with Hibernate Search -->
6262
<!-- Make sure to only mention tested versions here -->
6363
<!-- Make sure that 7.10 stays explicitly mentioned here, because that's the last open-source version -->
64-
<version.org.elasticsearch.compatible.regularly-tested.text>7.10, 7.17, 8.18 or 9.1</version.org.elasticsearch.compatible.regularly-tested.text>
64+
<version.org.elasticsearch.compatible.regularly-tested.text>7.10, 7.17, 8.18 or 9.2</version.org.elasticsearch.compatible.regularly-tested.text>
6565
<!-- These are the versions same as above, but pointing only to the major part (used in compatibility section of ES backend documentation
6666
as versions that Hibernate Search is compatible with. -->
6767
<!-- NOTE: Adding new major versions would require to update the compatibility table in `backend-elasticsearch-compatibility` section of `backend-elasticsearch.adoc`. -->

ci/dependency-update/Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Map settings() {
5353
updateProperties: [],
5454
onlyRunTestDependingOn: ['hibernate-search-backend-elasticsearch'],
5555
// We want to use the snapshot version of an image from the ES registry since that's where they are publishing their snapshots.
56-
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.1.6-SNAPSHOT',
56+
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.2.1-SNAPSHOT',
5757
// This job won't change the versions in the pom. We are passing the latest Elasticsearch version through an additional maven argument `-D`
5858
skipSourceModifiedCheck: true
5959
]
@@ -65,7 +65,7 @@ Map settings() {
6565
updateProperties: [],
6666
onlyRunTestDependingOn: ['hibernate-search-backend-elasticsearch'],
6767
// We want to use the snapshot version of an image from the ES registry since that's where they are publishing their snapshots.
68-
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.2.0-SNAPSHOT',
68+
additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.3.0-SNAPSHOT',
6969
// This job won't change the versions in the pom. We are passing the latest Elasticsearch version through an additional maven argument `-D`
7070
skipSourceModifiedCheck: true
7171
]

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389

390390
<!-- Container images for various integration tests -->
391391
<!-- The latest version of Elasticsearch tested against by default -->
392-
<version.org.elasticsearch.latest>9.1.5</version.org.elasticsearch.latest>
392+
<version.org.elasticsearch.latest>9.2.0</version.org.elasticsearch.latest>
393393
<test.elasticsearch.version></test.elasticsearch.version>
394394
<test.elasticsearch.distribution>elastic</test.elasticsearch.distribution>
395395

0 commit comments

Comments
 (0)