diff --git a/Jenkinsfile b/Jenkinsfile index 9e2d85fd46d..4c83079965d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -255,7 +255,8 @@ stage('Configure') { new LocalOpenSearchBuildEnvironment(version: '2.6.0', condition: TestCondition.ON_DEMAND), new LocalOpenSearchBuildEnvironment(version: '2.7.0', condition: TestCondition.ON_DEMAND), new LocalOpenSearchBuildEnvironment(version: '2.8.0', condition: TestCondition.ON_DEMAND), - new LocalOpenSearchBuildEnvironment(version: '2.9.0', condition: TestCondition.BEFORE_MERGE), + new LocalOpenSearchBuildEnvironment(version: '2.9.0', condition: TestCondition.ON_DEMAND), + new LocalOpenSearchBuildEnvironment(version: '2.10.0', condition: TestCondition.BEFORE_MERGE), // See https://opensearch.org/lines/2x.html for a list of all 2.x versions // -------------------------------------------- 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 18f132b00a3..740bc85e77d 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 @@ -220,7 +220,7 @@ private ElasticsearchProtocolDialect createProtocolDialectOpenSearchV1(Elasticse } private ElasticsearchProtocolDialect createProtocolDialectOpenSearchV2(ElasticsearchVersion version, int minor) { - if ( minor > 9 ) { + if ( minor > 10 ) { log.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 e4ba1e52bc8..84570fe6e8d 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 @@ -322,14 +322,22 @@ public static List params() { ElasticsearchDistributionName.OPENSEARCH, "2.9.0", "2.9.0", Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class ), - successWithWarning( + success( ElasticsearchDistributionName.OPENSEARCH, "2.10", "2.10.0", Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class ), - successWithWarning( + success( ElasticsearchDistributionName.OPENSEARCH, "2.10.0", "2.10.0", Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class ), + successWithWarning( + ElasticsearchDistributionName.OPENSEARCH, "2.11", "2.11.0", + Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class + ), + successWithWarning( + ElasticsearchDistributionName.OPENSEARCH, "2.11.0", "2.11.0", + Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class + ), successWithWarning( ElasticsearchDistributionName.OPENSEARCH, "3", "3.0.0", Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml index 941ea85551c..29133f388ff 100644 --- a/build/parents/build/pom.xml +++ b/build/parents/build/pom.xml @@ -68,13 +68,13 @@ --> - 1.3 or 2.9 + 1.3 or 2.10 1.3 or 2.x - 2.9.0 + 2.10.0 2.9.1 2.20.2