diff --git a/build-parent/pom.xml b/build-parent/pom.xml index cc7f3002da4d3..349696b7b323e 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -83,12 +83,12 @@ :Z - 8.12.1 + 8.13.2 docker.io/elastic/elasticsearch:${elasticsearch-server.version} docker.io/elastic/logstash:${elasticsearch-server.version} docker.io/elastic/kibana:${elasticsearch-server.version} http - 2.11.1 + 2.13.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 d7010af28865f..82faa37cf6a5b 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.11 +quarkus.hibernate-search-orm.elasticsearch.version=opensearch:2.13 ---- 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 00d750fab9282..6e4fb29c07ae4 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.11 +quarkus.hibernate-search-standalone.elasticsearch.version=opensearch:2.13 ---- All other configuration options and APIs are exactly the same as with Elasticsearch. 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 769dd2f7205a8..2308d705a40e9 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.12/modules-cluster.html#disk-based-shard-allocation + // See https://www.elastic.co/guide/en/elasticsearch/reference/8.13/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; @@ -260,6 +260,10 @@ private GenericContainer createOpensearchContainer(ElasticsearchDevServicesBu // See https://opensearch.org/docs/latest/api-reference/cluster-api/cluster-settings/ container.addEnv("cluster.routing.allocation.disk.threshold_enabled", "false"); container.addEnv("OPENSEARCH_JAVA_OPTS", config.javaOpts); + // OpenSearch 2.12 and later requires an admin password, or it won't start. + // Considering dev services are transient and not intended for production by nature, + // we'll just set some hardcoded password. + container.addEnv("OPENSEARCH_INITIAL_ADMIN_PASSWORD", "NotActua11y$trongPa$$word"); 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 188eadaadb8e6..081995a71699b 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.12 +quarkus.hibernate-search-orm.elasticsearch.version=8.13 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.12 +quarkus.hibernate-search-orm."namedpu".elasticsearch.version=8.13 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 52608bd073759..1804e4ca0e7df 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.12 +quarkus.hibernate-search-orm.elasticsearch.version=8.13 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 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 aa923ae29cb4e..bde3946908e04 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.12 +quarkus.hibernate-search-orm.elasticsearch.version=8.13 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 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 8cadcad4a8d95..6e7974322bc7f 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.12 +quarkus.hibernate-search-orm.elasticsearch.version=8.13 # 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 88acdf6870c66..6414c9416ce28 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.12 +quarkus.hibernate-search-standalone.elasticsearch.version=8.13 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 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 d428fabb0a19e..85771c96daa2b 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.12 +quarkus.hibernate-search-standalone.elasticsearch.version=8.13 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 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 476885eeb643e..5d2bcd9676b60 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.12 +quarkus.hibernate-search-standalone.elasticsearch.version=8.13 # 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 dc14ebfb51541..ccec9b60217b9 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 7aa9df7d935bb..ffd8366460876 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 178fb422d602d..5cfd9bc32ece9 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 8449847353d2e..d9a83a0011e1e 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml @@ -231,7 +231,7 @@ false diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml index 43b6e979b6353..e3e8f3e6e1269 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 5f10e53b649b2..241287f81172b 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.12")); + "quarkus.hibernate-search-orm.elasticsearch.version", "8.13")); 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 9d5ec8bc047b7..d5899b31f1f0e 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.12"); + "quarkus.hibernate-search-orm.elasticsearch.version", "8.13"); } @Override diff --git a/integration-tests/hibernate-search-orm-opensearch/pom.xml b/integration-tests/hibernate-search-orm-opensearch/pom.xml index 0dbdd56c2eafc..777a12a84c135 100644 --- a/integration-tests/hibernate-search-orm-opensearch/pom.xml +++ b/integration-tests/hibernate-search-orm-opensearch/pom.xml @@ -190,6 +190,9 @@ --> false -Xms512m -Xmx512m + + NotActua11y$trongPa$$word false -Xms512m -Xmx512m + + NotActua11y$trongPa$$word false