Bump Elasticsearch/OpenSearch containers to latest-compatible with Hibernate Search

marko-bekhta · marko-bekhta · commit 06fc7532a50c · 2025-06-02T14:51:15.000+02:00
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -5659,11 +5659,11 @@
                 <groupId>co.elastic.clients</groupId>
                 <artifactId>elasticsearch-java</artifactId>
                 <version>${elasticsearch-opensource-components.version}</version>
-                <!-- exclude log4j2 to get its version from log4j2-jboss-logmanager -->
+                <!-- exclude commons-logging to get its version from commons-logging-jboss-logmanager -->
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.logging.log4j</groupId>
-                        <artifactId>log4j-core</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -73,12 +73,12 @@
         <volume.access.modifier>:Z</volume.access.modifier>
 
         <!-- Defaults for integration tests -->
-        <elasticsearch-server.version>8.18.2</elasticsearch-server.version>
+        <elasticsearch-server.version>9.0.1</elasticsearch-server.version>
         <elasticsearch.image>docker.io/elastic/elasticsearch:${elasticsearch-server.version}</elasticsearch.image>
         <logstash.image>docker.io/elastic/logstash:${elasticsearch-server.version}</logstash.image>
         <kibana.image>docker.io/elastic/kibana:${elasticsearch-server.version}</kibana.image>
         <elasticsearch.protocol>http</elasticsearch.protocol>
-        <opensearch-server.version>2.16.0</opensearch-server.version>
+        <opensearch-server.version>3.0.0</opensearch-server.version>
         <opensearch.image>docker.io/opensearchproject/opensearch:${opensearch-server.version}</opensearch.image>
         <opensearch.protocol>http</opensearch.protocol>
         <junit-pioneer.version>2.2.0</junit-pioneer.version>
diff --git a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc
@@ -631,7 +631,7 @@ quarkus.datasource.db-kind=postgresql <1>
 
 quarkus.hibernate-orm.sql-load-script=import.sql <2>
 
-quarkus.hibernate-search-orm.elasticsearch.version=8 <3>
+quarkus.hibernate-search-orm.elasticsearch.version=9 <3>
 quarkus.hibernate-search-orm.indexing.plan.synchronization.strategy=sync <4>
 
 %prod.quarkus.datasource.jdbc.url=jdbc:postgresql://localhost/quarkus_test
@@ -820,7 +820,7 @@ as shown below.
 
 [source,properties]
 ----
-quarkus.hibernate-search-orm.elasticsearch.version=opensearch:2.16
+quarkus.hibernate-search-orm.elasticsearch.version=opensearch:3.0
 ----
 
 All other configuration options and APIs are exactly the same as with Elasticsearch.
@@ -850,7 +850,7 @@ quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
 
 quarkus.hibernate-search-orm.elasticsearch.hosts=es1.mycompany.com:9200
-quarkus.hibernate-search-orm.elasticsearch.version=8
+quarkus.hibernate-search-orm.elasticsearch.version=9
 ----
 
 Using a map based approach, it is also possible to configure named persistence units:
@@ -870,10 +870,10 @@ quarkus.hibernate-orm."inventory".datasource=inventory <4>
 quarkus.hibernate-orm."inventory".packages=org.acme.model.inventory
 
 quarkus.hibernate-search-orm."users".elasticsearch.hosts=es1.mycompany.com:9200 <5>
-quarkus.hibernate-search-orm."users".elasticsearch.version=8
+quarkus.hibernate-search-orm."users".elasticsearch.version=9
 
 quarkus.hibernate-search-orm."inventory".elasticsearch.hosts=es2.mycompany.com:9200 <6>
-quarkus.hibernate-search-orm."inventory".elasticsearch.version=8
+quarkus.hibernate-search-orm."inventory".elasticsearch.version=9
 ----
 <1> Define a datasource named `users`.
 <2> Define a datasource named `inventory`.
diff --git a/docs/src/main/asciidoc/hibernate-search-standalone-elasticsearch.adoc b/docs/src/main/asciidoc/hibernate-search-standalone-elasticsearch.adoc
@@ -560,7 +560,7 @@ Edit `src/main/resources/application.properties` and inject the following config
 [source,properties]
 ----
 quarkus.hibernate-search-standalone.mapping.structure=document <1>
-quarkus.hibernate-search-standalone.elasticsearch.version=8 <2>
+quarkus.hibernate-search-standalone.elasticsearch.version=9 <2>
 quarkus.hibernate-search-standalone.indexing.plan.synchronization.strategy=sync <3>
 
 %prod.quarkus.hibernate-search-standalone.elasticsearch.hosts=localhost:9200 <4>
@@ -738,7 +738,7 @@ as shown below.
 
 [source,properties]
 ----
-quarkus.hibernate-search-standalone.elasticsearch.version=opensearch:2.16
+quarkus.hibernate-search-standalone.elasticsearch.version=opensearch:3.0
 ----
 
 All other configuration options and APIs are exactly the same as with Elasticsearch.
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
@@ -17,11 +17,11 @@ quarkus.hibernate-orm."namedpu".schema-management.strategy=drop-and-create
 
 # Hibernate Search is inactive for the default PU
 quarkus.hibernate-search-orm.active=false
-quarkus.hibernate-search-orm.elasticsearch.version=8.18
+quarkus.hibernate-search-orm.elasticsearch.version=9.0
 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.18
+quarkus.hibernate-search-orm."namedpu".elasticsearch.version=9.0
 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
@@ -7,6 +7,6 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
 quarkus.hibernate-orm.schema-management.strategy=drop-and-create
 
 quarkus.hibernate-search-orm.active=false
-quarkus.hibernate-search-orm.elasticsearch.version=8.18
+quarkus.hibernate-search-orm.elasticsearch.version=9.0
 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 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
@@ -6,6 +6,6 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
 
 quarkus.hibernate-orm.schema-management.strategy=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=8.18
+quarkus.hibernate-search-orm.elasticsearch.version=9.0
 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 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-multiple-persistence-units.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-multiple-persistence-units.properties
@@ -13,7 +13,7 @@ quarkus.datasource.data3.jdbc.url=jdbc:h2:mem:data3;DB_CLOSE_DELAY=-1
 quarkus.hibernate-orm.datasource=<default>
 quarkus.hibernate-orm.schema-management.strategy=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=8
+quarkus.hibernate-search-orm.elasticsearch.version=9
 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
@@ -22,7 +22,7 @@ quarkus.hibernate-search-orm.indexing.plan.synchronization.strategy=sync
 quarkus.hibernate-orm."pu1".schema-management.strategy=drop-and-create
 quarkus.hibernate-orm."pu1".datasource=data1
 
-quarkus.hibernate-search-orm."pu1".elasticsearch.version=8
+quarkus.hibernate-search-orm."pu1".elasticsearch.version=9
 quarkus.hibernate-search-orm."pu1".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 quarkus.hibernate-search-orm."pu1".elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.hibernate-search-orm."pu1".schema-management.strategy=drop-and-create-and-drop
@@ -31,7 +31,7 @@ quarkus.hibernate-search-orm."pu1".indexing.plan.synchronization.strategy=sync
 quarkus.hibernate-orm."pu2".schema-management.strategy=drop-and-create
 quarkus.hibernate-orm."pu2".datasource=data2
 
-quarkus.hibernate-search-orm."pu2".elasticsearch.version=8
+quarkus.hibernate-search-orm."pu2".elasticsearch.version=9
 quarkus.hibernate-search-orm."pu2".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 quarkus.hibernate-search-orm."pu2".elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.hibernate-search-orm."pu2".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
@@ -3,7 +3,7 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
 
 quarkus.hibernate-orm.schema-management.strategy=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=8.18
+quarkus.hibernate-search-orm.elasticsearch.version=9.0
 # 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-orm-elasticsearch/deployment/src/test/resources/application.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application.properties
@@ -3,7 +3,7 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
 
 quarkus.hibernate-orm.schema-management.strategy=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=8
+quarkus.hibernate-search-orm.elasticsearch.version=9
 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
diff --git a/extensions/hibernate-search-orm-outbox-polling/deployment/src/test/resources/application-multiple-persistence-units.properties b/extensions/hibernate-search-orm-outbox-polling/deployment/src/test/resources/application-multiple-persistence-units.properties
@@ -7,7 +7,7 @@ quarkus.datasource.data1.jdbc.url=jdbc:h2:mem:data1;DB_CLOSE_DELAY=-1
 quarkus.hibernate-orm.schema-management.strategy=drop-and-create
 quarkus.hibernate-orm.datasource=<default>
 
-quarkus.hibernate-search-orm.elasticsearch.version=8
+quarkus.hibernate-search-orm.elasticsearch.version=9
 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
@@ -16,7 +16,7 @@ quarkus.hibernate-search-orm.coordination.strategy=outbox-polling
 quarkus.hibernate-orm."pu1".schema-management.strategy=drop-and-create
 quarkus.hibernate-orm."pu1".datasource=data1
 
-quarkus.hibernate-search-orm."pu1".elasticsearch.version=8
+quarkus.hibernate-search-orm."pu1".elasticsearch.version=9
 quarkus.hibernate-search-orm."pu1".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 quarkus.hibernate-search-orm."pu1".elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.hibernate-search-orm."pu1".schema-management.strategy=drop-and-create-and-drop
diff --git a/extensions/hibernate-search-orm-outbox-polling/deployment/src/test/resources/application.properties b/extensions/hibernate-search-orm-outbox-polling/deployment/src/test/resources/application.properties
@@ -3,7 +3,7 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
 
 quarkus.hibernate-orm.schema-management.strategy=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=8
+quarkus.hibernate-search-orm.elasticsearch.version=9
 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
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
@@ -2,6 +2,6 @@
 quarkus.devservices.enabled=false
 
 quarkus.hibernate-search-standalone.active=false
-quarkus.hibernate-search-standalone.elasticsearch.version=8.18
+quarkus.hibernate-search-standalone.elasticsearch.version=9.0
 quarkus.hibernate-search-standalone.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 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
@@ -1,6 +1,6 @@
 # We already start Elasticsearch with Maven
 quarkus.devservices.enabled=false
 
-quarkus.hibernate-search-standalone.elasticsearch.version=8.18
+quarkus.hibernate-search-standalone.elasticsearch.version=9.0
 quarkus.hibernate-search-standalone.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 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
@@ -1,4 +1,4 @@
-quarkus.hibernate-search-standalone.elasticsearch.version=8.18
+quarkus.hibernate-search-standalone.elasticsearch.version=9.0
 # 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/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application.properties b/extensions/hibernate-search-standalone-elasticsearch/deployment/src/test/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.hibernate-search-standalone.elasticsearch.version=8
+quarkus.hibernate-search-standalone.elasticsearch.version=9
 quarkus.hibernate-search-standalone.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 quarkus.hibernate-search-standalone.elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.hibernate-search-standalone.schema-management.strategy=drop-and-create-and-drop
diff --git a/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/src/main/resources/application.properties b/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/src/main/resources/application.properties
@@ -6,7 +6,7 @@ quarkus.datasource.jdbc.max-size=8
 
 quarkus.hibernate-orm.schema-management.strategy=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=8
+quarkus.hibernate-search-orm.elasticsearch.version=9
 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/resources/application.properties b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/resources/application.properties
@@ -7,7 +7,7 @@ quarkus.hibernate-orm.schema-management.strategy=none
 quarkus.hibernate-orm.multitenant=schema
 quarkus.hibernate-orm.packages=io.quarkus.it.hibernate.search.orm.elasticsearch.multitenancy.fruit
 
-quarkus.hibernate-search-orm.elasticsearch.version=8
+quarkus.hibernate-search-orm.elasticsearch.version=9
 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
@@ -19,8 +19,8 @@ quarkus.hibernate-orm."books".schema-management.strategy=none
 quarkus.hibernate-orm."books".multitenant=schema
 quarkus.hibernate-orm."books".packages=io.quarkus.it.hibernate.search.orm.elasticsearch.multitenancy.book
 
-quarkus.hibernate-search-orm."books".elasticsearch.version=8
+quarkus.hibernate-search-orm."books".elasticsearch.version=9
 quarkus.hibernate-search-orm."books".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
 quarkus.hibernate-search-orm."books".elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.hibernate-search-orm."books".schema-management.strategy=drop-and-create-and-drop
-quarkus.hibernate-search-orm."books".indexing.plan.synchronization.strategy=sync
+quarkus.hibernate-search-orm."books".indexing.plan.synchronization.strategy=sync
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties b/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties
@@ -6,7 +6,7 @@ quarkus.datasource.jdbc.max-size=8
 quarkus.hibernate-orm.schema-management.strategy=drop-and-create
 
 quarkus.hibernate-search-orm.mapping.configurer=bean:custom-dependent-bean-mapping-configurer,class:io.quarkus.it.hibernate.search.orm.elasticsearch.mapping.CustomClassMappingConfigurer,bean:custom-application-bean-mapping-configurer
-quarkus.hibernate-search-orm.elasticsearch.version=8
+quarkus.hibernate-search-orm.elasticsearch.version=9
 quarkus.hibernate-search-orm.elasticsearch.analysis.configurer=bean:backend-analysis
 quarkus.hibernate-search-orm.elasticsearch.indexes.Analysis1TestingEntity.analysis.configurer=class:io.quarkus.it.hibernate.search.orm.elasticsearch.analysis.IndexAnalysis1Configurer
 quarkus.hibernate-search-orm.elasticsearch.indexes.Analysis2TestingEntity.analysis.configurer=bean:index-analysis-2
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
@@ -37,7 +37,7 @@ public Map<String, String> 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.18"));
+                    "quarkus.hibernate-search-orm.elasticsearch.version", "9.0"));
             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
@@ -36,7 +36,7 @@ public Map<String, String> 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.18");
+                    "quarkus.hibernate-search-orm.elasticsearch.version", "9.0");
         }
 
         @Override
diff --git a/integration-tests/hibernate-search-orm-opensearch/src/main/resources/application.properties b/integration-tests/hibernate-search-orm-opensearch/src/main/resources/application.properties
@@ -6,7 +6,7 @@ quarkus.datasource.jdbc.max-size=8
 
 quarkus.hibernate-orm.schema-management.strategy=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=opensearch:2
+quarkus.hibernate-search-orm.elasticsearch.version=opensearch:3
 quarkus.hibernate-search-orm.elasticsearch.analysis.configurer=bean:backend-analysis
 quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
 quarkus.hibernate-search-orm.indexing.plan.synchronization.strategy=sync
@@ -17,4 +17,4 @@ quarkus.hibernate-search-orm.indexing.plan.synchronization.strategy=sync
 # See io.quarkus.it.hibernate.search.orm.opensearch.devservices.HibernateSearchOpenSearchDevServicesEnabledImplicitlyTest.testHibernateSearch
 %test.quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create
 %test.quarkus.hibernate-search-orm.elasticsearch.hosts=${opensearch.hosts:localhost:9200}
-%test.quarkus.hibernate-search-orm.elasticsearch.protocol=${opensearch.protocol:http}
+%test.quarkus.hibernate-search-orm.elasticsearch.protocol=${opensearch.protocol:http}
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
@@ -37,7 +37,7 @@ public Map<String, String> 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.16"));
+                    "quarkus.hibernate-search-orm.elasticsearch.version", "opensearch:3.0"));
             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
@@ -36,7 +36,7 @@ public Map<String, String> 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.16");
+                    "quarkus.hibernate-search-orm.elasticsearch.version", "opensearch:3.0");
         }
 
         @Override
diff --git a/integration-tests/hibernate-search-standalone-elasticsearch/src/main/resources/application.properties b/integration-tests/hibernate-search-standalone-elasticsearch/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 quarkus.ssl.native = false
 
-quarkus.hibernate-search-standalone.elasticsearch.version=8
+quarkus.hibernate-search-standalone.elasticsearch.version=9
 quarkus.hibernate-search-standalone.indexing.plan.synchronization.strategy=sync
 
 quarkus.hibernate-search-standalone.schema-management.strategy=drop-and-create-and-drop
@@ -11,4 +11,4 @@ quarkus.hibernate-search-standalone.schema-management.strategy=drop-and-create-a
 # we want to enable management so that we can access Hibernate Search management endpoints:
 quarkus.management.enabled=true
 # now enable the Hibernate Search management itself:
-quarkus.hibernate-search-standalone.management.enabled=true
+quarkus.hibernate-search-standalone.management.enabled=true
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
@@ -37,7 +37,7 @@ public Map<String, String> 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.18"));
+                    "quarkus.hibernate-search-standalone.elasticsearch.version", "9.0"));
             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
@@ -36,7 +36,7 @@ public Map<String, String> 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.18");
+                    "quarkus.hibernate-search-standalone.elasticsearch.version", "9.0");
         }
 
         @Override
diff --git a/integration-tests/hibernate-search-standalone-opensearch/src/main/resources/application.properties b/integration-tests/hibernate-search-standalone-opensearch/src/main/resources/application.properties
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
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
