From c4c73709c8cb1af1e6d8610af03c3ee6dbbe481c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Nov 2025 13:56:29 +0100 Subject: [PATCH 1/4] Prepare next development iteration. See #3186 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c81bc28cc..c9d979011 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-elasticsearch - 6.0.0 + 6.0.1-SNAPSHOT org.springframework.data.build From 175614cd949b8c9eab3274edc504a3ea6ce25c4b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Nov 2025 13:56:30 +0100 Subject: [PATCH 2/4] After release cleanups. See #3186 --- Jenkinsfile | 2 +- pom.xml | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d2500ed1..2cff32bd7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { triggers { pollSCM 'H/10 * * * *' - upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS) + upstream(upstreamProjects: "spring-data-commons/4.0.x", threshold: hudson.model.Result.SUCCESS) } options { diff --git a/pom.xml b/pom.xml index c9d979011..fb8cd5e85 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.data.build spring-data-parent - 4.0.0 + 4.0.1-SNAPSHOT Spring Data Elasticsearch @@ -18,7 +18,7 @@ https://github.com/spring-projects/spring-data-elasticsearch - 4.0.0 + 4.0.1-SNAPSHOT 9.2.1 @@ -489,8 +489,20 @@ - - + + spring-snapshot + https://repo.spring.io/snapshot + + true + + + false + + + + spring-milestone + https://repo.spring.io/milestone + From bea651bc9539b18a68608bb0e9dd55e04ee17108 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Fri, 14 Nov 2025 19:01:33 +0100 Subject: [PATCH 3/4] Fix documentation. Closes #3199 Signed-off-by: Peter-Josef Meisch (cherry picked from commit 5821a81db965ff09fef7ee46150ecd01e950f589) --- src/main/antora/modules/ROOT/pages/elasticsearch/clients.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/antora/modules/ROOT/pages/elasticsearch/clients.adoc b/src/main/antora/modules/ROOT/pages/elasticsearch/clients.adoc index 40cd83448..a44ea3649 100644 --- a/src/main/antora/modules/ROOT/pages/elasticsearch/clients.adoc +++ b/src/main/antora/modules/ROOT/pages/elasticsearch/clients.adoc @@ -461,7 +461,7 @@ To see what is actually sent to and received from the server `Request` / `Respon This can be enabled in the Elasticsearch client by setting the level of the `co.elastic.clients.transport.rest5_client.low_level.Request` package to "trace" (see https://www.elastic.co/docs/reference/elasticsearch/clients/java/transport/rest5-client/usage/logging) -.Enable transport layer logging +.Enable transport layer logging [tabs] ====== XML:: @@ -485,4 +485,4 @@ ini:: ---- logging.level.co.elastic.clients.transport.rest5_client.low_level.Request=trace ---- -===== +====== From b3bd77aa469ba91ef16706740b415751487d1a58 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Tue, 25 Nov 2025 20:09:58 +0100 Subject: [PATCH 4/4] Adjust aot hints for Elasticsearch 9 client. The hints for the old httpclient are only needed when the old library is on the classpath, in case a user still uses the old RestClient. For the new Elasticsearch client there are no aot hints required. Closes: #3203 Signed-off-by: Peter-Josef Meisch (cherry picked from commit e31b66768bcd01ebbafd32e9f64b7cd33dbdda7f) --- .../aot/ElasticsearchClientRuntimeHints.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/aot/ElasticsearchClientRuntimeHints.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/aot/ElasticsearchClientRuntimeHints.java index 2c177a13a..8c6bc14c5 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/aot/ElasticsearchClientRuntimeHints.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/aot/ElasticsearchClientRuntimeHints.java @@ -24,6 +24,7 @@ import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.RuntimeHintsRegistrar; import org.springframework.aot.hint.TypeReference; +import org.springframework.util.ClassUtils; /** * runtime hints for the Elasticsearch client libraries, as these do not provide any of their own. @@ -37,20 +38,20 @@ public class ElasticsearchClientRuntimeHints implements RuntimeHintsRegistrar { public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) { hints.reflection() - .registerType(TypeReference.of(IndexSettings.class), builder -> builder.withField("_DESERIALIZER")) // - .registerType(TypeReference.of(PutMappingRequest.class), builder -> builder.withField("_DESERIALIZER")) // - .registerType(TypeReference.of(RuntimeFieldType.class), builder -> builder.withField("_DESERIALIZER"))// - .registerType(TypeReference.of(TypeMapping.class), builder -> builder.withField("_DESERIALIZER")) // - ; + .registerType(TypeReference.of(IndexSettings.class), builder -> builder.withField("_DESERIALIZER")) + .registerType(TypeReference.of(PutMappingRequest.class), builder -> builder.withField("_DESERIALIZER")) + .registerType(TypeReference.of(RuntimeFieldType.class), builder -> builder.withField("_DESERIALIZER")) + .registerType(TypeReference.of(TypeMapping.class), builder -> builder.withField("_DESERIALIZER")); - hints.serialization() // - .registerType(org.apache.http.impl.auth.BasicScheme.class) // - .registerType(org.apache.http.impl.auth.RFC2617Scheme.class) // - .registerType(java.util.HashMap.class) // - ; + if (ClassUtils.isPresent("org.apache.http.impl.auth.BasicScheme", + ElasticsearchClientRuntimeHints.class.getClassLoader())) { + hints.serialization() + .registerType(org.apache.http.impl.auth.BasicScheme.class) + .registerType(org.apache.http.impl.auth.RFC2617Scheme.class) + .registerType(java.util.HashMap.class); + } hints.resources() // - .registerPattern("co/elastic/clients/version.properties") // - ; + .registerPattern("co/elastic/clients/version.properties"); } }