Upgrade to Elasticsearch-8.14.0.

Original Pull Request #2926 Closes #2924
spring-projects · Jun 11, 2024 · d101eeb · d101eeb
1 parent 4ef5af1
commit d101eeb
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
 		<springdata.commons>3.4.0-SNAPSHOT</springdata.commons>
 
 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>8.13.4</elasticsearch-java>
+		<elasticsearch-java>8.14.0</elasticsearch-java>
 
 		<blockhound-junit>1.0.9.RELEASE</blockhound-junit>
 		<hoverfly>0.18.1</hoverfly>

diff --git a/src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc b/src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc
@@ -4,7 +4,7 @@
 [[new-features.5-4-0]]
 == New in Spring Data Elasticsearch 5.4
 
-* Upgrade to Elasticsearch 8.13.4.
+* Upgrade to Elasticsearch 8.14.0.
 
 [[new-features.5-3-0]]
 == New in Spring Data Elasticsearch 5.3

diff --git a/src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc b/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
-| 2024.1 (in development) | 5.3.x | 8.13.4 | 6.1.x
+| 2024.1 (in development) | 5.3.x | 8.14.0 | 6.1.x
 | 2024.0  | 5.3.1 | 8.13.4 | 6.1.x
 | 2023.1 (Vaughan) | 5.2.x | 8.11.1 | 6.1.x
 | 2023.0 (Ullmann) | 5.1.x | 8.7.1 | 6.0.x

diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java
@@ -409,7 +409,7 @@ public co.elastic.clients.elasticsearch.indices.PutTemplateRequest indicesPutTem
 
 		if (putTemplateRequest.getSettings() != null) {
 			Map<String, JsonData> settings = getTemplateParams(putTemplateRequest.getSettings().entrySet());
-			builder.settings(settings);
+			builder.settings(sb -> sb.otherSettings(settings));
 		}
 
 		if (putTemplateRequest.getMappings() != null) {

diff --git a/...va/org/springframework/data/elasticsearch/repositories/knn/KnnSearchIntegrationTests.java b/...va/org/springframework/data/elasticsearch/repositories/knn/KnnSearchIntegrationTests.java
@@ -94,7 +94,7 @@ public void shouldReturnXAxisVector() {
 
 		// when
 		NativeQuery query = new NativeQueryBuilder()
-				.withKnnSearches(ksb -> ksb.queryVector(xAxisVector).k(3L).field("vector"))
+				.withKnnSearches(ksb -> ksb.queryVector(xAxisVector).k(3).field("vector"))
 				.withPageable(Pageable.ofSize(2))
 				.build();
 		SearchHits<VectorEntity> result = operations.search(query, VectorEntity.class);
@@ -118,7 +118,7 @@ public void shouldReturnYAxisVector() {
 
 		// when
 		NativeQuery query = new NativeQueryBuilder()
-				.withKnnSearches(ksb -> ksb.queryVector(yAxisVector).k(3L).field("vector"))
+				.withKnnSearches(ksb -> ksb.queryVector(yAxisVector).k(3).field("vector"))
 				.withPageable(Pageable.ofSize(2))
 				.build();
 		SearchHits<VectorEntity> result = operations.search(query, VectorEntity.class);

diff --git 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.13.4
+sde.testcontainers.image-version=8.14.0
 #
 #
 # 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