Upgrade to Elasticsearch 8 in tests

quarkusio · Jul 24, 2023 · 5ea74e6 · 5ea74e6
1 parent ef3cf51
commit 5ea74e6
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 24 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -80,7 +80,7 @@
         <volume.access.modifier>:Z</volume.access.modifier>
 
         <!-- Defaults for integration tests -->
-        <elasticsearch-server.version>7.16.3</elasticsearch-server.version>
+        <elasticsearch-server.version>8.8.2</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>

diff --git a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc
@@ -564,7 +564,7 @@ quarkus.datasource.db-kind=postgresql <2>
 
 quarkus.hibernate-orm.sql-load-script=import.sql <3>
 
-quarkus.hibernate-search-orm.elasticsearch.version=7 <4>
+quarkus.hibernate-search-orm.elasticsearch.version=8 <4>
 quarkus.hibernate-search-orm.indexing.plan.synchronization.strategy=sync <5>
 
 %prod.quarkus.datasource.jdbc.url=jdbc:postgresql://localhost/quarkus_test <6>
@@ -724,7 +724,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=7
+quarkus.hibernate-search-orm.elasticsearch.version=8
 ----
 
 Using a map based approach, it is also possible to configure named persistence units:
@@ -744,10 +744,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=7
+quarkus.hibernate-search-orm."users".elasticsearch.version=8
 
 quarkus.hibernate-search-orm."inventory".elasticsearch.hosts=es2.mycompany.com:9200 <6>
-quarkus.hibernate-search-orm."inventory".elasticsearch.version=7
+quarkus.hibernate-search-orm."inventory".elasticsearch.version=8
 ----
 <1> Define a datasource named `users`.
 <2> Define a datasource named `inventory`.

diff --git a/...x-polling/deployment/src/test/resources/application-multiple-persistence-units.properties b/...x-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.database.generation=drop-and-create
 quarkus.hibernate-orm.datasource=<default>
 
-quarkus.hibernate-search-orm.elasticsearch.version=7
+quarkus.hibernate-search-orm.elasticsearch.version=8
 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".database.generation=drop-and-create
 quarkus.hibernate-orm."pu1".datasource=data1
 
-quarkus.hibernate-search-orm."pu1".elasticsearch.version=7
+quarkus.hibernate-search-orm."pu1".elasticsearch.version=8
 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/...arch-orm-coordination-outbox-polling/deployment/src/test/resources/application.properties b/...arch-orm-coordination-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.database.generation=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=7
+quarkus.hibernate-search-orm.elasticsearch.version=8
 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/...ticsearch/deployment/src/test/resources/application-multiple-persistence-units.properties b/...ticsearch/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.database.generation=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=7
+quarkus.hibernate-search-orm.elasticsearch.version=8
 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".database.generation=drop-and-create
 quarkus.hibernate-orm."pu1".datasource=data1
 
-quarkus.hibernate-search-orm."pu1".elasticsearch.version=7
+quarkus.hibernate-search-orm."pu1".elasticsearch.version=8
 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".database.generation=drop-and-create
 quarkus.hibernate-orm."pu2".datasource=data2
 
-quarkus.hibernate-search-orm."pu2".elasticsearch.version=7
+quarkus.hibernate-search-orm."pu2".elasticsearch.version=8
 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/...arch-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties b/...arch-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=7.10
+quarkus.hibernate-search-orm.elasticsearch.version=8.8
 # 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/...s/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application.properties b/...s/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.database.generation=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=7
+quarkus.hibernate-search-orm.elasticsearch.version=8
 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/...quarkus/test/devconsole/DevConsoleHibernateSearchActiveFalseAndNamedPuActiveTrueTest.java b/...quarkus/test/devconsole/DevConsoleHibernateSearchActiveFalseAndNamedPuActiveTrueTest.java
@@ -26,11 +26,11 @@ public class DevConsoleHibernateSearchActiveFalseAndNamedPuActiveTrueTest {
                             + "quarkus.hibernate-orm.datasource=<default>\n"
                             + "quarkus.hibernate-orm.packages=io.quarkus.test.devconsole\n"
                             + "quarkus.hibernate-search-orm.active=false\n"
-                            + "quarkus.hibernate-search-orm.elasticsearch.version=7.10\n"
+                            + "quarkus.hibernate-search-orm.elasticsearch.version=8.8\n"
                             // ... but it's (implicitly) active for a named PU
                             + "quarkus.hibernate-orm.\"namedpu\".datasource=nameddatasource\n"
                             + "quarkus.hibernate-orm.\"namedpu\".packages=io.quarkus.test.devconsole.namedpu\n"
-                            + "quarkus.hibernate-search-orm.\"namedpu\".elasticsearch.version=7.10\n"
+                            + "quarkus.hibernate-search-orm.\"namedpu\".elasticsearch.version=8.8\n"
                             // Start Hibernate Search offline for the named PU,
                             // because we don't have dev services except for the default PU
                             + "quarkus.hibernate-search-orm.\"namedpu\".schema-management.strategy=none\n"

diff --git a/...de/src/test/java/io/quarkus/test/devconsole/DevConsoleHibernateSearchActiveFalseTest.java b/...de/src/test/java/io/quarkus/test/devconsole/DevConsoleHibernateSearchActiveFalseTest.java
@@ -21,7 +21,7 @@ public class DevConsoleHibernateSearchActiveFalseTest {
                             + "quarkus.datasource.jdbc.url=jdbc:h2:mem:test\n"
                             // Hibernate Search is inactive: the dev console should be empty.
                             + "quarkus.hibernate-search-orm.active=false\n"
-                            + "quarkus.hibernate-search-orm.elasticsearch.version=7.10\n"),
+                            + "quarkus.hibernate-search-orm.elasticsearch.version=8.8\n"),
                     "application.properties")
                     .addClasses(MyIndexedEntity.class));
 

diff --git a/.../devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleHibernateSearchSmokeTest.java b/.../devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleHibernateSearchSmokeTest.java
@@ -19,7 +19,7 @@ public class DevConsoleHibernateSearchSmokeTest {
             .withApplicationRoot((jar) -> jar.addAsResource(
                     new StringAsset("quarkus.datasource.db-kind=h2\n"
                             + "quarkus.datasource.jdbc.url=jdbc:h2:mem:test\n"
-                            + "quarkus.hibernate-search-orm.elasticsearch.version=7.10\n"
+                            + "quarkus.hibernate-search-orm.elasticsearch.version=8.8\n"
                             // Start offline, we don't have an Elasticsearch cluster here
                             + "quarkus.hibernate-search-orm.schema-management.strategy=none\n"
                             + "quarkus.hibernate-search-orm.elasticsearch.version-check.enabled=false\n"),

diff --git a/...t/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseAndNamedPuActiveTrueTest.java b/...t/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseAndNamedPuActiveTrueTest.java
@@ -19,11 +19,11 @@ public class DevUIHibernateSearchActiveFalseAndNamedPuActiveTrueTest extends Abs
                             + "quarkus.hibernate-orm.datasource=<default>\n"
                             + "quarkus.hibernate-orm.packages=io.quarkus.test.devui\n"
                             + "quarkus.hibernate-search-orm.active=false\n"
-                            + "quarkus.hibernate-search-orm.elasticsearch.version=7.10\n"
+                            + "quarkus.hibernate-search-orm.elasticsearch.version=8.8\n"
                             // ... but it's (implicitly) active for a named PU
                             + "quarkus.hibernate-orm.\"namedpu\".datasource=nameddatasource\n"
                             + "quarkus.hibernate-orm.\"namedpu\".packages=io.quarkus.test.devui.namedpu\n"
-                            + "quarkus.hibernate-search-orm.\"namedpu\".elasticsearch.version=7.10\n"
+                            + "quarkus.hibernate-search-orm.\"namedpu\".elasticsearch.version=8.8\n"
                             // Start Hibernate Search offline for the named PU,
                             // because we don't have dev services except for the default PU
                             + "quarkus.hibernate-search-orm.\"namedpu\".schema-management.strategy=none\n"

diff --git a/...ests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseTest.java b/...ests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseTest.java
@@ -14,7 +14,7 @@ public class DevUIHibernateSearchActiveFalseTest extends AbstractDevUIHibernateS
                             + "quarkus.datasource.jdbc.url=jdbc:h2:mem:test\n"
                             // Hibernate Search is inactive: the dev console should be empty.
                             + "quarkus.hibernate-search-orm.active=false\n"
-                            + "quarkus.hibernate-search-orm.elasticsearch.version=7.10\n"),
+                            + "quarkus.hibernate-search-orm.elasticsearch.version=8.8\n"),
                     "application.properties")
                     .addClasses(MyIndexedEntity.class));
 

diff --git a/...tion-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchSmokeTest.java b/...tion-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchSmokeTest.java
@@ -12,7 +12,7 @@ public class DevUIHibernateSearchSmokeTest extends AbstractDevUIHibernateSearchT
             .withApplicationRoot((jar) -> jar.addAsResource(
                     new StringAsset("quarkus.datasource.db-kind=h2\n"
                             + "quarkus.datasource.jdbc.url=jdbc:h2:mem:test\n"
-                            + "quarkus.hibernate-search-orm.elasticsearch.version=7.10\n"
+                            + "quarkus.hibernate-search-orm.elasticsearch.version=8.8\n"
                             // Start offline, we don't have an Elasticsearch cluster here
                             + "quarkus.hibernate-search-orm.schema-management.strategy=none\n"
                             + "quarkus.hibernate-search-orm.elasticsearch.version-check.enabled=false\n"),

diff --git a/...h-orm-elasticsearch-coordination-outbox-polling/src/main/resources/application.properties b/...h-orm-elasticsearch-coordination-outbox-polling/src/main/resources/application.properties
@@ -6,7 +6,7 @@ quarkus.datasource.jdbc.max-size=8
 
 quarkus.hibernate-orm.database.generation=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=7
+quarkus.hibernate-search-orm.elasticsearch.version=8
 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/...ests/hibernate-search-orm-elasticsearch-tenancy/src/main/resources/application.properties b/...ests/hibernate-search-orm-elasticsearch-tenancy/src/main/resources/application.properties
@@ -6,7 +6,7 @@ quarkus.flyway.clean-at-start=true
 quarkus.hibernate-orm.database.generation=none
 quarkus.hibernate-orm.multitenant=schema
 
-quarkus.hibernate-search-orm.elasticsearch.version=7
+quarkus.hibernate-search-orm.elasticsearch.version=8
 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/...ration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties b/...ration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties
@@ -5,7 +5,7 @@ quarkus.datasource.jdbc.max-size=8
 
 quarkus.hibernate-orm.database.generation=drop-and-create
 
-quarkus.hibernate-search-orm.elasticsearch.version=7
+quarkus.hibernate-search-orm.elasticsearch.version=8
 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