From 1ae8a2ba9484c835977e19a3f26b7d30f897e613 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Wed, 12 Feb 2025 00:17:19 +0100 Subject: [PATCH] HSEARCH-5317 Add compatibility with OpenSearch 2.19.0 --- Jenkinsfile | 3 ++- .../dialect/impl/ElasticsearchDialectFactory.java | 2 +- .../impl/ElasticsearchDialectFactoryTest.java | 12 ++++++++++-- .../amazon-opensearch-serverless.Dockerfile | 2 +- build/container/search-backend/opensearch.Dockerfile | 2 +- build/parents/build/pom.xml | 4 ++-- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a14a906e392..fff8dab340a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java index d9608b150d6..4c178bd56fc 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java @@ -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(); diff --git a/backend/elasticsearch/src/test/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java b/backend/elasticsearch/src/test/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java index 72f4e08a7ac..9e6b54df668 100644 --- a/backend/elasticsearch/src/test/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java +++ b/backend/elasticsearch/src/test/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java @@ -460,14 +460,22 @@ public static List 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 diff --git a/build/container/search-backend/amazon-opensearch-serverless.Dockerfile b/build/container/search-backend/amazon-opensearch-serverless.Dockerfile index cc5b26cfe06..6a5ce01487d 100644 --- a/build/container/search-backend/amazon-opensearch-serverless.Dockerfile +++ b/build/container/search-backend/amazon-opensearch-serverless.Dockerfile @@ -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 diff --git a/build/container/search-backend/opensearch.Dockerfile b/build/container/search-backend/opensearch.Dockerfile index 7a01a65d3ec..5de396e53c2 100644 --- a/build/container/search-backend/opensearch.Dockerfile +++ b/build/container/search-backend/opensearch.Dockerfile @@ -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 diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml index c2be87fba6f..b9722991c46 100644 --- a/build/parents/build/pom.xml +++ b/build/parents/build/pom.xml @@ -70,13 +70,13 @@ --> - 1.3 or 2.18 + 1.3 or 2.19 1.3 or 2.x - 2.18.0 + 2.19.0 ${version.org.opensearch.latest} https://opensearch.org/docs/${parsed-version.org.opensearch.compatible.main.majorVersion}.${parsed-version.org.opensearch.compatible.main.minorVersion}