Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HSEARCH-4849 Upgrade to Elasticsearch client 8.7.1 and test against Elasticsearch 8.7.1 #3492

Merged
merged 2 commits into from
May 3, 2023
Merged

HSEARCH-4849 Upgrade to Elasticsearch client 8.7.1 and test against Elasticsearch 8.7.1 #3492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44d807f
HSEARCH-4849 Upgrade to Elasticsearch client 8.7.1
yrodiere May 3, 2023
aac2412
HSEARCH-4849 Test against Elasticsearch 8.7.1 by default
yrodiere May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ stage('Configure') {
new EsLocalBuildEnvironment(version: '8.4.3', condition: TestCondition.ON_DEMAND),
new EsLocalBuildEnvironment(version: '8.5.3', condition: TestCondition.ON_DEMAND),
new EsLocalBuildEnvironment(version: '8.6.2', condition: TestCondition.ON_DEMAND),
new EsLocalBuildEnvironment(version: '8.7.0', condition: TestCondition.BEFORE_MERGE, isDefault: true),
new EsLocalBuildEnvironment(version: '8.7.1', condition: TestCondition.BEFORE_MERGE, isDefault: true),

// --------------------------------------------
// OpenSearch
Expand Down
4 changes: 2 additions & 2 deletions .../hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public static List<Object[]> params() {
Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
),
success(
ElasticsearchDistributionName.ELASTIC, "8", "8.7.0",
ElasticsearchDistributionName.ELASTIC, "8", "8.7.1",
Elasticsearch8ModelDialect.class, Elasticsearch81ProtocolDialect.class
),
success(
Expand Down Expand Up @@ -351,7 +351,7 @@ public static List<Object[]> params() {
Elasticsearch8ModelDialect.class, Elasticsearch81ProtocolDialect.class
),
success(
ElasticsearchDistributionName.ELASTIC, "8.7", "8.7.0",
ElasticsearchDistributionName.ELASTIC, "8.7", "8.7.1",
Elasticsearch8ModelDialect.class, Elasticsearch81ProtocolDialect.class
),
success(
Expand Down
2 changes: 1 addition & 1 deletion ...tegrationtest/backend/elasticsearch/testsupport/util/ElasticsearchTckBackendFeatures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public boolean supportsExtremeScaledNumericValues() {
// https://github.com/elastic/elasticsearch/issues/91246
// Hopefully this will get fixed in a future version.
return isActualVersion(
esVersion -> !esVersion.isBetween( "7.17.7", "7.17" ) && !esVersion.isBetween( "8.5.0", "8.7.0" ),
esVersion -> !esVersion.isBetween( "7.17.7", "7.17" ) && !esVersion.isBetween( "8.5.0", "8.7.1" ),
osVersion -> true
);
}
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
<!-- >>> Elasticsearch -->
<!-- The version of the Elasticsearch client used by Hibernate Search, independently of the version of the remote cluster -->
<!-- Use the latest open-source version here. Currently, low-level clients are open-source even in 8.5+ -->
<version.org.elasticsearch.client>8.7.0</version.org.elasticsearch.client>
<version.org.elasticsearch.client>8.7.1</version.org.elasticsearch.client>
<!-- The main compatible version of Elasticsearch, advertised by default. Used in documentation links. -->
<!-- When updating the following version you will likely need to update the test profiles as well,
to make sure the corresponding profile (e.g. elasticsearch-8.4) becomes the default. -->
Expand All @@ -227,7 +227,7 @@
<!-- The versions of Elasticsearch that may work, but are not given priority for bugfixes and new features -->
<version.org.elasticsearch.compatible.not-regularly-tested.text>7.0 or 8.0</version.org.elasticsearch.compatible.not-regularly-tested.text>
<!-- The latest version of Elasticsearch tested against by default -->
<version.org.elasticsearch.latest>8.7.0</version.org.elasticsearch.latest>
<version.org.elasticsearch.latest>8.7.1</version.org.elasticsearch.latest>
<!-- 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.6</version.org.opensearch.compatible.regularly-tested.text>
Expand Down