Upgrade to Elasticsearch 9.3.1.

Closes #3250

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

Author: sothawo

pom.xml

@@ -21,8 +21,8 @@
 		<springdata.commons>4.1.0-SNAPSHOT</springdata.commons>
 
 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>9.2.5</elasticsearch-java>
-		<elasticsearch-rest-client>9.2.5</elasticsearch-rest-client>
+		<elasticsearch-java>9.3.1</elasticsearch-java>
+		<elasticsearch-rest-client>9.3.1</elasticsearch-rest-client>
 
 		<hoverfly>0.20.2</hoverfly>
 		<log4j>2.25.3</log4j>

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

@@ -4,7 +4,7 @@
 [[new-features.6-1-0]]
 == New in Spring Data Elasticsearch 6.1
 
-* Upgrade to Elasticsearch 9.2.5
+* Upgrade to Elasticsearch 9.3.1
 * Add support to use `IndexCoordinates` as repository query parameter
 * Add support for includeNamedQueriesScore in Query
 

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

@@ -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
-| 2026.0 | 6.1.x | 9.2.5 | 7.0.x
+| 2026.0 | 6.1.x | 9.3.1 | 7.0.x
 | 2025.1 | 6.0.x | 9.2.2 | 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

src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java

@@ -900,8 +900,17 @@ public co.elastic.clients.elasticsearch.core.ReindexRequest reindex(ReindexReque
 					}
 
 					SourceFilter sourceFilter = source.getSourceFilter();
-					if (sourceFilter != null && sourceFilter.getIncludes() != null) {
-						s.sourceFields(Arrays.asList(sourceFilter.getIncludes()));
+					if (sourceFilter != null && (sourceFilter.getIncludes() != null || sourceFilter.getExcludes() != null)) {
+						s.sourceFields(cfg -> cfg
+								.filter(f -> {
+									if (sourceFilter.getIncludes() != null) {
+										f.includes(Arrays.asList(sourceFilter.getIncludes()));
+									}
+									if (sourceFilter.getExcludes() != null) {
+										f.excludes(Arrays.asList(sourceFilter.getExcludes()));
+									}
+									return f;
+								}));
 					}
 					return s;
 				}) //

src/test/resources/testcontainers-elasticsearch.properties

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