Upgrade Elasticsearch to 9.4.3.

Closes #3301
Closes #3298

Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>6.1.0</version>
+	<version>6.2.0-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>4.1.0</version>
+		<version>4.2.0-SNAPSHOT</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.1.0</springdata.commons>
+		<springdata.commons>4.2.0-SNAPSHOT</springdata.commons>
 
 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>9.4.2</elasticsearch-java>
+		<elasticsearch-java>9.4.3</elasticsearch-java>
-		<elasticsearch-rest-client>9.4.2</elasticsearch-rest-client>
+		<elasticsearch-rest-client>9.4.3</elasticsearch-rest-client>
 
 		<hoverfly>0.20.2</hoverfly>
 		<log4j>2.25.4</log4j>
@@ -498,8 +498,20 @@
 	</profiles>
 
 	<repositories>
-		
+		<repository>
-		
+			<id>spring-snapshot</id>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>spring-milestone</id>
+			<url>https://repo.spring.io/milestone</url>
+		</repository>
 	</repositories>
 
 </project>

src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc

@@ -1,6 +1,11 @@
 [[new-features]]
 = What's new
 
+[[new-features.6-2-0]]
+== New in Spring Data Elasticsearch 6.2
+
+* Upgrade to Elasticsearch 9.4.3
+
 [[new-features.6-1-0]]
 == New in Spring Data Elasticsearch 6.1
 

src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc

@@ -6,6 +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
+| 2026.1 | 6.2.x | 9.4.3 | 7.0.x
 | 2026.0 | 6.1.x | 9.4.2 | 7.0.x
 | 2025.1 | 6.0.x | 9.2.2 | 7.0.x
 | 2025.0 | 5.5.xfootnote:oom[Out of maintenance] | 8.18.1 | 6.2.x

src/main/antora/resources/antora-resources/antora.yml

@@ -13,7 +13,7 @@ asciidoc:
     include-xml-namespaces: false
     spring-data-commons-docs-url: '${documentation.baseurl}/spring-data/commons/reference/${springdata.commons.short}'
     spring-data-commons-javadoc-base: '{spring-data-commons-docs-url}/api/java'
-    springdocsurl: '${documentation.baseurl}/spring-framework/reference/{springversionshort}'
+    springdocsurl: '${documentation.spring-reference-url}/{springversionshort}'
     spring-framework-docs: '{springdocsurl}'
     springjavadocurl: '${documentation.spring-javadoc-url}'
     spring-framework-javadoc: '{springjavadocurl}'

src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java

@@ -280,6 +280,12 @@ public abstract class MappingBuilderIntegrationTests extends MappingContextBaseT
 		operations.indexOps(FieldAliasEntity.class).createWithMapping();
 	}
 
+	@Test // #3298
+	@DisplayName("should write index prefixes with default value")
+	void shouldWriteIndexPrefixesWithDefaultValue() {
+		operations.indexOps(TextIndexPrefixesEntity.class).createWithMapping();
+	}
+
 	// region Entities
 	@Document(indexName = "#{@indexNameProvider.indexName()}")
 	static class Book {
@@ -931,5 +937,14 @@ public abstract class MappingBuilderIntegrationTests extends MappingContextBaseT
 		@Field(type = Text) private String otherText;
 	}
 
+	@Document(indexName = "#{@indexNameProvider.indexName()}")
+	private static class TextIndexPrefixesEntity {
+		@Id
+		@Nullable private String id;
+		@Nullable
+		// the min value is set to the default
+		@Field(type = Text, indexPrefixes = @IndexPrefixes(maxChars = 10)) private String someText;
+	}
+
 	// endregion
 }

src/test/resources/testcontainers-elasticsearch.properties

@@ -15,7 +15,7 @@
 #
 #
 sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
-sde.testcontainers.image-version=9.4.2
+sde.testcontainers.image-version=9.4.3
 #
 #
 # 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