Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-28 14:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Elasticsearch-8.14.0.

Browse Source 
Original Pull Request #2926
Closes #2924
This commit is contained in:
Peter-Josef Meisch 2024-06-11 21:24:57 +02:00 committed by GitHub
parent 4ef5af1f2d
commit d101eebc6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -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>

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

@ -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

2
src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc
View File

@ -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

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

@ -409,7 +409,7 @@ class RequestConverter extends AbstractQueryProcessor {
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) {

4
src/test/java/org/springframework/data/elasticsearch/repositories/knn/KnnSearchIntegrationTests.java
View File

@ -94,7 +94,7 @@ public abstract class KnnSearchIntegrationTests {
// 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 abstract class KnnSearchIntegrationTests {
// 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);

2
src/test/resources/testcontainers-elasticsearch.properties
View File

@ -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