Skip to content

Commit

Permalink
HSEARCH-5317 Add compatibility with OpenSearch 2.19.0
Browse files Browse the repository at this point in the history
  • Loading branch information
marko-bekhta committed Feb 11, 2025
1 parent e292a29 commit 1ae8a2b
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 8 deletions.
3 changes: 2 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,8 @@ stage('Configure') {
new LocalOpenSearchBuildEnvironment(version: '2.15.0', condition: TestCondition.ON_DEMAND),
new LocalOpenSearchBuildEnvironment(version: '2.16.0', condition: TestCondition.ON_DEMAND),
new LocalOpenSearchBuildEnvironment(version: '2.17.1', condition: TestCondition.ON_DEMAND),
new LocalOpenSearchBuildEnvironment(version: '2.18.0', condition: TestCondition.BEFORE_MERGE),
new LocalOpenSearchBuildEnvironment(version: '2.18.0', condition: TestCondition.ON_DEMAND),
new LocalOpenSearchBuildEnvironment(version: '2.19.0', condition: TestCondition.BEFORE_MERGE),
// See https://opensearch.org/lines/2x.html for a list of all 2.x versions
// IMPORTANT: Make sure to update the documentation for any newly supported OpenSearch versions
// See version.org.opensearch.compatible.expected.text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ private ElasticsearchProtocolDialect createProtocolDialectOpenSearchV1(Elasticse
}

private ElasticsearchProtocolDialect createProtocolDialectOpenSearchV2(ElasticsearchVersion version, int minor) {
if ( minor > 18 ) {
if ( minor > 19 ) {
VersionLog.INSTANCE.unknownElasticsearchVersion( version );
}
return new Elasticsearch70ProtocolDialect();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -460,14 +460,22 @@ public static List<? extends Arguments> params() {
ElasticsearchDistributionName.OPENSEARCH, "2.18.0", "2.18.0",
OpenSearch214ModelDialect.class, Elasticsearch70ProtocolDialect.class
),
successWithWarning(
success(
ElasticsearchDistributionName.OPENSEARCH, "2.19", "2.19.0",
OpenSearch214ModelDialect.class, Elasticsearch70ProtocolDialect.class
),
successWithWarning(
success(
ElasticsearchDistributionName.OPENSEARCH, "2.19.0", "2.19.0",
OpenSearch214ModelDialect.class, Elasticsearch70ProtocolDialect.class
),
successWithWarning(
ElasticsearchDistributionName.OPENSEARCH, "2.20", "2.20.0",
OpenSearch214ModelDialect.class, Elasticsearch70ProtocolDialect.class
),
successWithWarning(
ElasticsearchDistributionName.OPENSEARCH, "2.20.0", "2.20.0",
OpenSearch214ModelDialect.class, Elasticsearch70ProtocolDialect.class
),
successWithWarning(
ElasticsearchDistributionName.OPENSEARCH, "3", "3.0.0",
OpenSearch214ModelDialect.class, Elasticsearch70ProtocolDialect.class
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# IMPORTANT! When updating the version of OpenSearch in this Dockerfile,
# make sure to update `version.org.opensearch.latest` property in a POM file,
# and to update the version in opensearch.Dockerfile as well.
FROM docker.io/opensearchproject/opensearch:2.18.0
FROM docker.io/opensearchproject/opensearch:2.19.0
2 changes: 1 addition & 1 deletion build/container/search-backend/opensearch.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# IMPORTANT! When updating the version of OpenSearch in this Dockerfile,
# make sure to update `version.org.opensearch.latest` property in a POM file,
# and to update the version in amazon-opensearch-serverless.Dockerfile as well.
FROM docker.io/opensearchproject/opensearch:2.18.0
FROM docker.io/opensearchproject/opensearch:2.19.0
4 changes: 2 additions & 2 deletions build/parents/build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@
-->
<!-- The versions of OpenSearch advertised as compatible with Hibernate Search -->
<!-- Make sure to only mention tested versions here -->
<version.org.opensearch.compatible.regularly-tested.text>1.3 or 2.18</version.org.opensearch.compatible.regularly-tested.text>
<version.org.opensearch.compatible.regularly-tested.text>1.3 or 2.19</version.org.opensearch.compatible.regularly-tested.text>
<!-- These are the versions same as above, but pointing only to the major part (used in compatibility section of ES backend documentation
as versions that Hibernate Search is compatible with. -->
<!-- NOTE: Adding new major versions would require to update the compatibility table in `backend-elasticsearch-compatibility` section of `backend-elasticsearch.asciidoc`. -->
<version.org.opensearch.compatible.expected.text>1.3 or 2.x</version.org.opensearch.compatible.expected.text>
<!-- The latest version of OpenSearch tested against by default -->
<version.org.opensearch.latest>2.18.0</version.org.opensearch.latest>
<version.org.opensearch.latest>2.19.0</version.org.opensearch.latest>
<!-- The main compatible version of OpenSearch, advertised by default. Used in documentation links. -->
<version.org.opensearch.compatible.main>${version.org.opensearch.latest}</version.org.opensearch.compatible.main>
<documentation.org.opensearch.url>https://opensearch.org/docs/${parsed-version.org.opensearch.compatible.main.majorVersion}.${parsed-version.org.opensearch.compatible.main.minorVersion}</documentation.org.opensearch.url>
Expand Down

0 comments on commit 1ae8a2b

Please sign in to comment.