diff --git a/pom.xml b/pom.xml index b48d4489e..06911df58 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 7.17.4 - 8.2.3 + 8.3.1 2.17.2 4.1.65.Final diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index fef63b845..bd3aba6e9 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -37,7 +37,7 @@ built and tested. [cols="^,^,^,^,^",options="header"] |=== | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot -| 2022.0 (Turing) | 5.0.x | 8.2.3 | 6.0.x | 3.0.x? +| 2022.0 (Turing) | 5.0.x | 8.3.1 | 6.0.x | 3.0.x? | 2021.2 (Raj) | 4.4.x | 7.17.3 | 5.3.x | 2.7.x | 2021.1 (Q) | 4.3.x | 7.15.2 | 5.3.x | 2.6.x | 2021.0 (Pascal) | 4.2.xfootnote:oom[Out of maintenance] | 7.12.0 | 5.3.x | 2.5.x diff --git a/src/main/asciidoc/reference/elasticsearch-migration-guide-4.4-5.0.adoc b/src/main/asciidoc/reference/elasticsearch-migration-guide-4.4-5.0.adoc index d4549f488..eda9792ee 100644 --- a/src/main/asciidoc/reference/elasticsearch-migration-guide-4.4-5.0.adoc +++ b/src/main/asciidoc/reference/elasticsearch-migration-guide-4.4-5.0.adoc @@ -122,4 +122,4 @@ your application as Spring Data Elasticsearch does not pull it in automatically ---- ==== -Make sure to specify the version 7.17.4 explicitly, otherwise maven will resolve to 8.2.3, and this does not exist. +Make sure to specify the version 7.17.4 explicitly, otherwise maven will resolve to 8.3.1, and this does not exist. diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java index 55968deea..e65be7da3 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java @@ -15,6 +15,7 @@ */ package org.springframework.data.elasticsearch.client.elc; +import static co.elastic.clients.util.ApiTypeHelper.*; import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*; import co.elastic.clients.elasticsearch.ElasticsearchClient; @@ -274,8 +275,11 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate { @Override public String getClusterVersion() { - return execute(client -> client.info().version().number()); - + return execute(client -> { + try (var ignored = DANGEROUS_disableRequiredPropertiesCheck(true)) { + return client.info().version().number(); + } + }); } @Override diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java index 4434f1a1f..bd3552cc3 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java @@ -15,6 +15,7 @@ */ package org.springframework.data.elasticsearch.client.elc; +import static co.elastic.clients.util.ApiTypeHelper.*; import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*; import co.elastic.clients.elasticsearch._types.Result; @@ -422,7 +423,11 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch @Override public Mono getClusterVersion() { - return Mono.from(execute(ReactiveElasticsearchClient::info)).map(infoResponse -> infoResponse.version().number()); + return Mono.from(execute((ReactiveElasticsearchClient reactiveElasticsearchClient) -> { + try (var ignored = DANGEROUS_disableRequiredPropertiesCheck(true)) { + return reactiveElasticsearchClient.info(); + } + })).map(infoResponse -> infoResponse.version().number()); } @Override diff --git a/src/test/resources/testcontainers-elasticsearch.properties b/src/test/resources/testcontainers-elasticsearch.properties index 0196a9015..5fb15c3bc 100644 --- a/src/test/resources/testcontainers-elasticsearch.properties +++ b/src/test/resources/testcontainers-elasticsearch.properties @@ -15,7 +15,7 @@ # # sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch -sde.testcontainers.image-version=8.2.3 +sde.testcontainers.image-version=8.3.1 # # # needed as we do a DELETE /* at the end of the tests, will be required from 8.0 on, produces a warning since 7.13