Skip to content

Commit

Permalink
HSEARCH-4993 Add compatibility with OpenSearch 2.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
marko-bekhta committed Oct 18, 2023
1 parent 72407ed commit 05d35d6
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
3 changes: 2 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ stage('Configure') {
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.ON_DEMAND),
new LocalOpenSearchBuildEnvironment(version: '2.10.0', condition: TestCondition.BEFORE_MERGE),
new LocalOpenSearchBuildEnvironment(version: '2.10.0', condition: TestCondition.ON_DEMAND),
new LocalOpenSearchBuildEnvironment(version: '2.11.0', condition: TestCondition.BEFORE_MERGE),
// See https://opensearch.org/lines/2x.html for a list of all 2.x versions

// --------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ private ElasticsearchProtocolDialect createProtocolDialectOpenSearchV1(Elasticse
}

private ElasticsearchProtocolDialect createProtocolDialectOpenSearchV2(ElasticsearchVersion version, int minor) {
if ( minor > 10 ) {
if ( minor > 11 ) {
log.unknownElasticsearchVersion( version );
}
return new Elasticsearch70ProtocolDialect();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,22 @@ public static List<? extends Arguments> params() {
ElasticsearchDistributionName.OPENSEARCH, "2.10.0", "2.10.0",
Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
),
successWithWarning(
success(
ElasticsearchDistributionName.OPENSEARCH, "2.11", "2.11.0",
Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
),
successWithWarning(
success(
ElasticsearchDistributionName.OPENSEARCH, "2.11.0", "2.11.0",
Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
),
successWithWarning(
ElasticsearchDistributionName.OPENSEARCH, "2.12", "2.12.0",
Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
),
successWithWarning(
ElasticsearchDistributionName.OPENSEARCH, "2.12.0", "2.12.0",
Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
),
successWithWarning(
ElasticsearchDistributionName.OPENSEARCH, "3", "3.0.0",
Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
Expand Down
4 changes: 2 additions & 2 deletions build/parents/build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,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.10</version.org.opensearch.compatible.regularly-tested.text>
<version.org.opensearch.compatible.regularly-tested.text>1.3 or 2.11</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.10.0</version.org.opensearch.latest>
<version.org.opensearch.latest>2.11.0</version.org.opensearch.latest>

<version.com.google.code.gson>2.9.1</version.com.google.code.gson>
<version.software.amazon.awssdk>2.21.1</version.software.amazon.awssdk>
Expand Down

0 comments on commit 05d35d6

Please sign in to comment.