Release version 6.0.6 (2025.1.6).

See #3276
Upgrade to Maven Wrapper 3.9.16.
2026-07-07 02:30:01 +00:00 · 2026-06-09 10:50:10 +02:00 · 2026-06-02 14:57:30 +02:00 · 2026-06-02 09:21:52 +02:00 · 2026-04-17 16:41:58 +02:00 · 2026-04-17 16:41:57 +02:00
10 changed files with 29 additions and 54 deletions
@@ -25,3 +25,5 @@ jobs:
        uses: spring-projects/spring-data-build/actions/maven-build@4.0.x
        env:
          TESTCONTAINERS_REUSE_ENABLE: true
+        with:
+          settings-xml: '${{ vars.SETTINGS_XML }}'
@@ -18,7 +18,7 @@ permissions:
 jobs:
  Inbox:
    runs-on: ubuntu-latest
-    if: github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request == null && !contains(join(github.event.issue.labels.*.name, ', '), 'dependency-upgrade') && !contains(github.event.issue.title, 'Release ')
+    if: vars.PROJECT_CARDS_ENABLED == 'true' && github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request == null && !contains(join(github.event.issue.labels.*.name, ', '), 'dependency-upgrade') && !contains(github.event.issue.title, 'Release ')
    steps:
      - name: Create or Update Issue Card
        uses: actions/add-to-project@v1.0.2
@@ -27,7 +27,7 @@ jobs:
          github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }}
  Pull-Request:
    runs-on: ubuntu-latest
-    if: github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request != null
+    if: vars.PROJECT_CARDS_ENABLED == 'true' && github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request != null
    steps:
      - name: Create or Update Pull Request Card
        uses: actions/add-to-project@v1.0.2
@@ -36,7 +36,7 @@ jobs:
          github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }}
  Feedback-Provided:
    runs-on: ubuntu-latest
-    if: github.repository_owner == 'spring-projects' && github.event_name == 'issue_comment' && github.event.action == 'created' && github.actor != 'spring-projects-issues' && github.event.pull_request == null && github.event.issue.state == 'open' && contains(toJSON(github.event.issue.labels), 'waiting-for-feedback')
+    if: vars.PROJECT_CARDS_ENABLED == 'true' && github.repository_owner == 'spring-projects' && github.event_name == 'issue_comment' && github.event.action == 'created' && github.actor != 'spring-projects-issues' && github.event.pull_request == null && github.event.issue.state == 'open' && contains(toJSON(github.event.issue.labels), 'waiting-for-feedback')
    steps:
      - name: Update Project Card
        uses: actions/add-to-project@v1.0.2
@@ -26,3 +26,7 @@ jobs:
          build-name: 'spring-data-elasticsearch'
          username: '${{ secrets.ARTIFACTORY_USERNAME }}'
          password: '${{ secrets.ARTIFACTORY_PASSWORD }}'
+          context-url: '${{ vars.ARTIFACTORY_CONTEXT_URL }}'
+          repository: '${{ vars.ARTIFACTORY_REPOSITORY }}'
+          project: '${{ vars.ARTIFACTORY_PROJECT }}'
+          settings-xml: '${{ vars.SETTINGS_XML }}'
@@ -1,3 +1,3 @@
-#Thu Jul 17 13:59:56 CEST 2025
+#Tue Jun 02 14:59:45 CEST 2026
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
 wrapperUrl=https\://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
-distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
@@ -5,12 +5,12 @@

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>6.0.4</version>
+	<version>6.0.6</version>

 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>4.0.4</version>
+		<version>4.0.6</version>
 	</parent>

 	<name>Spring Data Elasticsearch</name>
@@ -18,11 +18,11 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>

 	<properties>
-		<springdata.commons>4.0.4</springdata.commons>
+		<springdata.commons>4.0.6</springdata.commons>

 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>9.2.6</elasticsearch-java>
-		<elasticsearch-rest-client>9.2.6</elasticsearch-rest-client>
+		<elasticsearch-java>9.2.8</elasticsearch-java>
+		<elasticsearch-rest-client>9.2.8</elasticsearch-rest-client>

 		<hoverfly>0.20.2</hoverfly>
 		<log4j>2.25.1</log4j>
@@ -82,8 +82,7 @@
 	<scm>
 		<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 		<connection>scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git</connection>
-		<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git
-		</developerConnection>
+		<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git</developerConnection>
 	</scm>

 	<issueManagement>
@@ -1,29 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-	<servers>
-		<server>
-			<id>spring-plugins-release</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-		<server>
-			<id>spring-libs-snapshot</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-		<server>
-			<id>spring-libs-milestone</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-		<server>
-			<id>spring-libs-release</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-	</servers>
-
-</settings>
@@ -6,7 +6,7 @@ The following table shows the Elasticsearch and Spring versions that are used by
 [cols="^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
-| 2025.1 | 6.0.x | 9.2.6 | 7.0.x
+| 2025.1 | 6.0.x | 9.2.8 | 7.0.x
 | 2025.0 | 5.5.x | 8.18.1 | 6.2.x
 | 2024.1 | 5.4.xfootnote:oom[Out of maintenance] | 8.15.5 | 6.1.x
 | 2024.0 | 5.3.xfootnote:oom[] | 8.13.4 | 6.1.x
@@ -15,15 +15,9 @@
 */
 package org.springframework.data.elasticsearch.client.elc.aot;

-import co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType;
-import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
-import co.elastic.clients.elasticsearch.indices.IndexSettings;
-import co.elastic.clients.elasticsearch.indices.PutMappingRequest;
-
 import org.jspecify.annotations.Nullable;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.TypeReference;
 import org.springframework.util.ClassUtils;

 /**
@@ -38,10 +32,14 @@ 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"));
+				.registerTypeIfPresent(classLoader, "co.elastic.clients.elasticsearch.indices.IndexSettings",
+						builder -> builder.withField("_DESERIALIZER"))
+				.registerTypeIfPresent(classLoader, "co.elastic.clients.elasticsearch.indices.PutMappingRequest",
+						builder -> builder.withField("_DESERIALIZER"))
+				.registerTypeIfPresent(classLoader, "co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType",
+						builder -> builder.withField("_DESERIALIZER"))
+				.registerTypeIfPresent(classLoader, "co.elastic.clients.elasticsearch._types.mapping.TypeMapping",
+						builder -> builder.withField("_DESERIALIZER"));

 		if (ClassUtils.isPresent("org.apache.http.impl.auth.BasicScheme",
 				ElasticsearchClientRuntimeHints.class.getClassLoader())) {
@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 6.0.4 (2025.1.4)
+Spring Data Elasticsearch 6.0.6 (2025.1.6)
 Copyright (c) [2013-2022] Pivotal Software, Inc.

 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -20,3 +20,4 @@ conditions of the subcomponent's license, as noted in the LICENSE file.



+
@@ -15,7 +15,7 @@
 #
 #
 sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
-sde.testcontainers.image-version=9.2.6
+sde.testcontainers.image-version=9.2.8
 #
 #
 # 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
Author	SHA1	Message	Date
Christoph Strobl	97939f58dc	Release version 6.0.6 (2025.1.6). See #3276	2026-06-09 10:50:10 +02:00
Mark Paluch	8bccf42d9c	Upgrade to Maven Wrapper 3.9.16. See #3292	2026-06-02 14:57:30 +02:00
Mark Paluch	ccb5016928	Refine GitHub Actions workflows. See #3276	2026-06-02 09:21:52 +02:00
Mark Paluch	3757d9d1d6	After release cleanups. See #3257	2026-04-17 16:41:58 +02:00
Mark Paluch	4796629f6e	Prepare next development iteration. See #3257	2026-04-17 16:41:57 +02:00
Mark Paluch	dde239cab6	Release version 6.0.5 (2025.1.5). See #3257	2026-04-17 16:39:32 +02:00
Mark Paluch	f34dbb1915	Prepare 6.0.5 (2025.1.5). See #3257	2026-04-17 16:39:11 +02:00
Peter-Josef Meisch	8875fb79a8	Upgrade to Elasticsearch 9.2.8 - the missing parts (#3271 ) Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2026-04-11 12:31:55 +02:00
Mark Paluch	f6af6b6f33	Upgrade to Elasticsearch REST Client 9.2.8. See #3269	2026-04-10 16:58:21 +02:00
Ralph Ursprung	6b3646bcc1	Make AOT hints for ELC optional. see also opensearch-project/spring-data-opensearch#441 Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com> (cherry picked from commit `ffdbea4dba`)	2026-03-31 18:20:14 +02:00
Peter-Josef Meisch	1cccc1cbb2	Ugrade Elasticsearch to version 9.2.7. Closes #3264 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2026-03-22 17:04:39 +01:00
Mark Paluch	2c8e18ac35	After release cleanups. See #3245	2026-03-13 11:38:31 +01:00
Mark Paluch	c11146b0f2	Prepare next development iteration. See #3245	2026-03-13 11:38:30 +01:00