From d03811d281b81c191492169c6fbe69edadeea147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 27 Jun 2024 10:26:18 +0200 Subject: [PATCH 1/3] Bump OpenSearch version used for tests/devservices to 2.16 --- build-parent/pom.xml | 2 +- docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc | 2 +- .../asciidoc/hibernate-search-standalone-elasticsearch.adoc | 2 +- ...ernateSearchOpenSearchDevServicesDisabledExplicitlyTest.java | 2 +- ...ernateSearchOpenSearchDevServicesDisabledImplicitlyTest.java | 2 +- ...ernateSearchOpenSearchDevServicesDisabledExplicitlyTest.java | 2 +- ...ernateSearchOpenSearchDevServicesDisabledImplicitlyTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 724accf69fcc3..6b47e4b50322e 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -75,7 +75,7 @@ docker.io/elastic/logstash:${elasticsearch-server.version} docker.io/elastic/kibana:${elasticsearch-server.version} http - 2.13.0 + 2.16.0 docker.io/opensearchproject/opensearch:${opensearch-server.version} http 2.2.0 diff --git a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc index 6963c8491c95a..674de2b0c9248 100644 --- a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc +++ b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc @@ -823,7 +823,7 @@ as shown below. [source,properties] ---- -quarkus.hibernate-search-orm.elasticsearch.version=opensearch:2.13 +quarkus.hibernate-search-orm.elasticsearch.version=opensearch:2.16 ---- All other configuration options and APIs are exactly the same as with Elasticsearch. diff --git a/docs/src/main/asciidoc/hibernate-search-standalone-elasticsearch.adoc b/docs/src/main/asciidoc/hibernate-search-standalone-elasticsearch.adoc index 6e4fb29c07ae4..bf2b4ef7dd14c 100644 --- a/docs/src/main/asciidoc/hibernate-search-standalone-elasticsearch.adoc +++ b/docs/src/main/asciidoc/hibernate-search-standalone-elasticsearch.adoc @@ -741,7 +741,7 @@ as shown below. [source,properties] ---- -quarkus.hibernate-search-standalone.elasticsearch.version=opensearch:2.13 +quarkus.hibernate-search-standalone.elasticsearch.version=opensearch:2.16 ---- All other configuration options and APIs are exactly the same as with Elasticsearch. diff --git a/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledExplicitlyTest.java b/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledExplicitlyTest.java index 9b96bb9216fa3..05e418748ab6c 100644 --- a/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledExplicitlyTest.java +++ b/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledExplicitlyTest.java @@ -38,7 +38,7 @@ public Map getConfigOverrides() { // But here it doesn't matter as we won't send a request to OpenSearch anyway, // so we're free to put anything. // Just make sure to set something consistent with what we have in application.properties. - "quarkus.hibernate-search-orm.elasticsearch.version", "opensearch:2.13")); + "quarkus.hibernate-search-orm.elasticsearch.version", "opensearch:2.16")); return config; } diff --git a/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledImplicitlyTest.java b/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledImplicitlyTest.java index 63b1a6ebc3bea..ac9a8b06bd270 100644 --- a/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledImplicitlyTest.java +++ b/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledImplicitlyTest.java @@ -37,7 +37,7 @@ public Map getConfigOverrides() { // But here it doesn't matter as we won't send a request to OpenSearch anyway, // so we're free to put anything. // Just make sure to set something consistent with what we have in application.properties. - "quarkus.hibernate-search-orm.elasticsearch.version", "opensearch:2.13"); + "quarkus.hibernate-search-orm.elasticsearch.version", "opensearch:2.16"); } @Override diff --git a/integration-tests/hibernate-search-standalone-opensearch/src/test/java/io/quarkus/it/hibernate/search/standalone/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledExplicitlyTest.java b/integration-tests/hibernate-search-standalone-opensearch/src/test/java/io/quarkus/it/hibernate/search/standalone/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledExplicitlyTest.java index 71d8d74b754ca..024a463b9b38c 100644 --- a/integration-tests/hibernate-search-standalone-opensearch/src/test/java/io/quarkus/it/hibernate/search/standalone/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledExplicitlyTest.java +++ b/integration-tests/hibernate-search-standalone-opensearch/src/test/java/io/quarkus/it/hibernate/search/standalone/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledExplicitlyTest.java @@ -38,7 +38,7 @@ public Map getConfigOverrides() { // But here it doesn't matter as we won't send a request to OpenSearch anyway, // so we're free to put anything. // Just make sure to set something consistent with what we have in application.properties. - "quarkus.hibernate-search-standalone.elasticsearch.version", "opensearch:2.13")); + "quarkus.hibernate-search-standalone.elasticsearch.version", "opensearch:2.16")); return config; } diff --git a/integration-tests/hibernate-search-standalone-opensearch/src/test/java/io/quarkus/it/hibernate/search/standalone/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledImplicitlyTest.java b/integration-tests/hibernate-search-standalone-opensearch/src/test/java/io/quarkus/it/hibernate/search/standalone/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledImplicitlyTest.java index b32409cf54a5b..c91b2b245d6ad 100644 --- a/integration-tests/hibernate-search-standalone-opensearch/src/test/java/io/quarkus/it/hibernate/search/standalone/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledImplicitlyTest.java +++ b/integration-tests/hibernate-search-standalone-opensearch/src/test/java/io/quarkus/it/hibernate/search/standalone/opensearch/devservices/HibernateSearchOpenSearchDevServicesDisabledImplicitlyTest.java @@ -37,7 +37,7 @@ public Map getConfigOverrides() { // But here it doesn't matter as we won't send a request to OpenSearch anyway, // so we're free to put anything. // Just make sure to set something consistent with what we have in application.properties. - "quarkus.hibernate-search-standalone.elasticsearch.version", "opensearch:2.13"); + "quarkus.hibernate-search-standalone.elasticsearch.version", "opensearch:2.16"); } @Override From ceed6e92457eb6894809d14a15255c08fe744d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 27 Jun 2024 10:34:20 +0200 Subject: [PATCH 2/3] Bump Elasticsearch version for tests/devservices to 8.15 --- build-parent/pom.xml | 2 +- .../common/deployment/DevServicesElasticsearchProcessor.java | 2 +- ...ion-devui-active-false-and-named-pu-active-true.properties | 4 ++-- .../test/resources/application-devui-active-false.properties | 4 ++-- .../src/test/resources/application-devui.properties | 4 ++-- .../src/test/resources/application-start-offline.properties | 2 +- .../test/resources/application-devui-active-false.properties | 4 ++-- .../src/test/resources/application-devui.properties | 4 ++-- .../src/test/resources/application-start-offline.properties | 2 +- integration-tests/elasticsearch-java-client/pom.xml | 4 ++-- integration-tests/elasticsearch-rest-client/pom.xml | 2 +- .../hibernate-search-orm-elasticsearch-outbox-polling/pom.xml | 2 +- .../hibernate-search-orm-elasticsearch-tenancy/pom.xml | 2 +- integration-tests/hibernate-search-orm-elasticsearch/pom.xml | 2 +- ...eSearchElasticsearchDevServicesDisabledExplicitlyTest.java | 2 +- ...eSearchElasticsearchDevServicesDisabledImplicitlyTest.java | 2 +- ...eSearchElasticsearchDevServicesDisabledExplicitlyTest.java | 2 +- ...eSearchElasticsearchDevServicesDisabledImplicitlyTest.java | 2 +- integration-tests/logging-gelf/pom.xml | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 6b47e4b50322e..b92bf6f9f44a7 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -70,7 +70,7 @@ :Z - 8.13.2 + 8.15.0 docker.io/elastic/elasticsearch:${elasticsearch-server.version} docker.io/elastic/logstash:${elasticsearch-server.version} docker.io/elastic/kibana:${elasticsearch-server.version} diff --git a/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java b/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java index d01d7e79a2abc..e007e2270adf8 100644 --- a/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java +++ b/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java @@ -238,7 +238,7 @@ private GenericContainer createElasticsearchContainer(ElasticsearchDevService // Disable disk-based shard allocation thresholds: // in a single-node setup they just don't make sense, // and lead to problems on large disks with little space left. - // See https://www.elastic.co/guide/en/elasticsearch/reference/8.13/modules-cluster.html#disk-based-shard-allocation + // See https://www.elastic.co/guide/en/elasticsearch/reference/8.15/modules-cluster.html#disk-based-shard-allocation container.addEnv("cluster.routing.allocation.disk.threshold_enabled", "false"); container.addEnv("ES_JAVA_OPTS", config.javaOpts); return container; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui-active-false-and-named-pu-active-true.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui-active-false-and-named-pu-active-true.properties index 081995a71699b..c9f6732578046 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui-active-false-and-named-pu-active-true.properties +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui-active-false-and-named-pu-active-true.properties @@ -17,11 +17,11 @@ quarkus.hibernate-orm."namedpu".database.generation=drop-and-create # Hibernate Search is inactive for the default PU quarkus.hibernate-search-orm.active=false -quarkus.hibernate-search-orm.elasticsearch.version=8.13 +quarkus.hibernate-search-orm.elasticsearch.version=8.15 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop # ... but it's (implicitly) active for a named PU -quarkus.hibernate-search-orm."namedpu".elasticsearch.version=8.13 +quarkus.hibernate-search-orm."namedpu".elasticsearch.version=8.15 quarkus.hibernate-search-orm."namedpu".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} quarkus.hibernate-search-orm."namedpu".schema-management.strategy=drop-and-create-and-drop diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui-active-false.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui-active-false.properties index 1804e4ca0e7df..7565fede55c8b 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui-active-false.properties +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui-active-false.properties @@ -7,6 +7,6 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1 quarkus.hibernate-orm.database.generation=drop-and-create quarkus.hibernate-search-orm.active=false -quarkus.hibernate-search-orm.elasticsearch.version=8.13 +quarkus.hibernate-search-orm.elasticsearch.version=8.15 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} -quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop \ No newline at end of file +quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui.properties index bde3946908e04..d1abcfc9d6c66 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui.properties +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-devui.properties @@ -6,6 +6,6 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1 quarkus.hibernate-orm.database.generation=drop-and-create -quarkus.hibernate-search-orm.elasticsearch.version=8.13 +quarkus.hibernate-search-orm.elasticsearch.version=8.15 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} -quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop \ No newline at end of file +quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties index 6e7974322bc7f..f70482294dce6 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties @@ -3,7 +3,7 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1 quarkus.hibernate-orm.database.generation=drop-and-create -quarkus.hibernate-search-orm.elasticsearch.version=8.13 +quarkus.hibernate-search-orm.elasticsearch.version=8.15 # Simulate an offline Elasticsearch instance by pointing to a non-existing cluster quarkus.hibernate-search-orm.elasticsearch.hosts=localhost:14800 quarkus.hibernate-search-orm.schema-management.strategy=none diff --git a/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-devui-active-false.properties b/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-devui-active-false.properties index 6414c9416ce28..074a1335c3fa7 100644 --- a/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-devui-active-false.properties +++ b/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-devui-active-false.properties @@ -2,6 +2,6 @@ quarkus.devservices.enabled=false quarkus.hibernate-search-standalone.active=false -quarkus.hibernate-search-standalone.elasticsearch.version=8.13 +quarkus.hibernate-search-standalone.elasticsearch.version=8.15 quarkus.hibernate-search-standalone.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} -quarkus.hibernate-search-standalone.schema-management.strategy=drop-and-create-and-drop \ No newline at end of file +quarkus.hibernate-search-standalone.schema-management.strategy=drop-and-create-and-drop diff --git a/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-devui.properties b/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-devui.properties index 85771c96daa2b..ea7e3cc9ae861 100644 --- a/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-devui.properties +++ b/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-devui.properties @@ -1,6 +1,6 @@ # We already start Elasticsearch with Maven quarkus.devservices.enabled=false -quarkus.hibernate-search-standalone.elasticsearch.version=8.13 +quarkus.hibernate-search-standalone.elasticsearch.version=8.15 quarkus.hibernate-search-standalone.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} -quarkus.hibernate-search-standalone.schema-management.strategy=drop-and-create-and-drop \ No newline at end of file +quarkus.hibernate-search-standalone.schema-management.strategy=drop-and-create-and-drop diff --git a/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-start-offline.properties b/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-start-offline.properties index 5d2bcd9676b60..2c0827bb87e8e 100644 --- a/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-start-offline.properties +++ b/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application-start-offline.properties @@ -1,4 +1,4 @@ -quarkus.hibernate-search-standalone.elasticsearch.version=8.13 +quarkus.hibernate-search-standalone.elasticsearch.version=8.15 # Simulate an offline Elasticsearch instance by pointing to a non-existing cluster quarkus.hibernate-search-standalone.elasticsearch.hosts=localhost:14800 quarkus.hibernate-search-standalone.schema-management.strategy=none diff --git a/integration-tests/elasticsearch-java-client/pom.xml b/integration-tests/elasticsearch-java-client/pom.xml index ccec9b60217b9..4c9397b191228 100644 --- a/integration-tests/elasticsearch-java-client/pom.xml +++ b/integration-tests/elasticsearch-java-client/pom.xml @@ -170,7 +170,7 @@ false @@ -245,4 +245,4 @@ - \ No newline at end of file + diff --git a/integration-tests/elasticsearch-rest-client/pom.xml b/integration-tests/elasticsearch-rest-client/pom.xml index ffd8366460876..1d6e67da6dec0 100644 --- a/integration-tests/elasticsearch-rest-client/pom.xml +++ b/integration-tests/elasticsearch-rest-client/pom.xml @@ -170,7 +170,7 @@ false diff --git a/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml index 5cfd9bc32ece9..851094c5a34ca 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml @@ -211,7 +211,7 @@ false diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml index a559d605bc34c..f15cdeb990a98 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml @@ -227,7 +227,7 @@ false diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml index e3e8f3e6e1269..ca0cc797fea5f 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml @@ -189,7 +189,7 @@ false diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledExplicitlyTest.java b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledExplicitlyTest.java index 241287f81172b..83f6c783fbbaa 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledExplicitlyTest.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledExplicitlyTest.java @@ -38,7 +38,7 @@ public Map getConfigOverrides() { // But here it doesn't matter as we won't send a request to Elasticsearch anyway, // so we're free to put anything. // Just make sure to set something consistent with what we have in application.properties. - "quarkus.hibernate-search-orm.elasticsearch.version", "8.13")); + "quarkus.hibernate-search-orm.elasticsearch.version", "8.15")); return config; } diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledImplicitlyTest.java b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledImplicitlyTest.java index d5899b31f1f0e..768ead7d20475 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledImplicitlyTest.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledImplicitlyTest.java @@ -37,7 +37,7 @@ public Map getConfigOverrides() { // But here it doesn't matter as we won't send a request to Elasticsearch anyway, // so we're free to put anything. // Just make sure to set something consistent with what we have in application.properties. - "quarkus.hibernate-search-orm.elasticsearch.version", "8.13"); + "quarkus.hibernate-search-orm.elasticsearch.version", "8.15"); } @Override diff --git a/integration-tests/hibernate-search-standalone-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/standalone/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledExplicitlyTest.java b/integration-tests/hibernate-search-standalone-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/standalone/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledExplicitlyTest.java index 1af8368516271..5a32300a279d2 100644 --- a/integration-tests/hibernate-search-standalone-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/standalone/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledExplicitlyTest.java +++ b/integration-tests/hibernate-search-standalone-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/standalone/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledExplicitlyTest.java @@ -38,7 +38,7 @@ public Map getConfigOverrides() { // But here it doesn't matter as we won't send a request to Elasticsearch anyway, // so we're free to put anything. // Just make sure to set something consistent with what we have in application.properties. - "quarkus.hibernate-search-standalone.elasticsearch.version", "8.13")); + "quarkus.hibernate-search-standalone.elasticsearch.version", "8.15")); return config; } diff --git a/integration-tests/hibernate-search-standalone-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/standalone/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledImplicitlyTest.java b/integration-tests/hibernate-search-standalone-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/standalone/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledImplicitlyTest.java index d26f55cc46d9d..a5c43c6a6f9cf 100644 --- a/integration-tests/hibernate-search-standalone-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/standalone/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledImplicitlyTest.java +++ b/integration-tests/hibernate-search-standalone-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/standalone/elasticsearch/devservices/HibernateSearchElasticsearchDevServicesDisabledImplicitlyTest.java @@ -37,7 +37,7 @@ public Map getConfigOverrides() { // But here it doesn't matter as we won't send a request to Elasticsearch anyway, // so we're free to put anything. // Just make sure to set something consistent with what we have in application.properties. - "quarkus.hibernate-search-standalone.elasticsearch.version", "8.13"); + "quarkus.hibernate-search-standalone.elasticsearch.version", "8.15"); } @Override diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml index 1b1e3a8a8e7ae..543488450233d 100644 --- a/integration-tests/logging-gelf/pom.xml +++ b/integration-tests/logging-gelf/pom.xml @@ -162,7 +162,7 @@ false From aabab6d5d1df16ab83ec07be019df2a9712dd54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 27 Jun 2024 11:37:40 +0200 Subject: [PATCH 3/3] Avoid links to specific versions of Elasticsearch in code comments It's a pain to keep up to date. --- .../common/deployment/DevServicesElasticsearchProcessor.java | 2 +- integration-tests/elasticsearch-java-client/pom.xml | 2 +- integration-tests/elasticsearch-rest-client/pom.xml | 2 +- .../hibernate-search-orm-elasticsearch-outbox-polling/pom.xml | 2 +- .../hibernate-search-orm-elasticsearch-tenancy/pom.xml | 2 +- integration-tests/hibernate-search-orm-elasticsearch/pom.xml | 2 +- integration-tests/logging-gelf/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java b/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java index e007e2270adf8..c66158226f627 100644 --- a/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java +++ b/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java @@ -238,7 +238,7 @@ private GenericContainer createElasticsearchContainer(ElasticsearchDevService // Disable disk-based shard allocation thresholds: // in a single-node setup they just don't make sense, // and lead to problems on large disks with little space left. - // See https://www.elastic.co/guide/en/elasticsearch/reference/8.15/modules-cluster.html#disk-based-shard-allocation + // See https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-cluster.html#disk-based-shard-allocation container.addEnv("cluster.routing.allocation.disk.threshold_enabled", "false"); container.addEnv("ES_JAVA_OPTS", config.javaOpts); return container; diff --git a/integration-tests/elasticsearch-java-client/pom.xml b/integration-tests/elasticsearch-java-client/pom.xml index 4c9397b191228..c370065d77d14 100644 --- a/integration-tests/elasticsearch-java-client/pom.xml +++ b/integration-tests/elasticsearch-java-client/pom.xml @@ -170,7 +170,7 @@ false diff --git a/integration-tests/elasticsearch-rest-client/pom.xml b/integration-tests/elasticsearch-rest-client/pom.xml index 1d6e67da6dec0..64720ca0c3079 100644 --- a/integration-tests/elasticsearch-rest-client/pom.xml +++ b/integration-tests/elasticsearch-rest-client/pom.xml @@ -170,7 +170,7 @@ false diff --git a/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml index 851094c5a34ca..019a60502f8e4 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml @@ -211,7 +211,7 @@ false diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml index f15cdeb990a98..511ca67aaea4c 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml @@ -227,7 +227,7 @@ false diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml index ca0cc797fea5f..38f57af9e3fcb 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml @@ -189,7 +189,7 @@ false diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml index 543488450233d..580e941cf9908 100644 --- a/integration-tests/logging-gelf/pom.xml +++ b/integration-tests/logging-gelf/pom.xml @@ -162,7 +162,7 @@ false