Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of synced 2026-05-22 20:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Elasticsearch 9.4.0.

Browse Source 
Closes #3284

Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>
This commit is contained in:
Peter-Josef Meisch
2026-05-09 17:50:47 +02:00
committed by GitHub
parent 8ad2e8e0a0
commit 4cbfef39c6
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+2 -2
View File
@@ -21,8 +21,8 @@
<springdata.commons>4.1.0-SNAPSHOT</springdata.commons> <springdata.commons>4.1.0-SNAPSHOT</springdata.commons>
<!-- version of the ElasticsearchClient --> <!-- version of the ElasticsearchClient -->
<elasticsearch-java>9.3.4</elasticsearch-java> <elasticsearch-java>9.4.0</elasticsearch-java>
<elasticsearch-rest-client>9.3.3</elasticsearch-rest-client> <elasticsearch-rest-client>9.4.0</elasticsearch-rest-client>
<hoverfly>0.20.2</hoverfly> <hoverfly>0.20.2</hoverfly>
<log4j>2.25.4</log4j> <log4j>2.25.4</log4j>
src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc
+1 -1
View File
@@ -4,7 +4,7 @@
[[new-features.6-1-0]] [[new-features.6-1-0]]
== New in Spring Data Elasticsearch 6.1 == New in Spring Data Elasticsearch 6.1
* Upgrade to Elasticsearch 9.3.3/ Client 9.3.4 * Upgrade to Elasticsearch 9.4.0
* Add support to use `IndexCoordinates` as repository query parameter * Add support to use `IndexCoordinates` as repository query parameter
* Add support for includeNamedQueriesScore in Query * Add support for includeNamedQueriesScore in Query
* Add support for Micrometer observation. * Add support for Micrometer observation.
src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc
+1 -1
View File
@@ -6,7 +6,7 @@ The following table shows the Elasticsearch and Spring versions that are used by
[cols="^,^,^,^",options="header"] [cols="^,^,^,^",options="header"]
|=== |===
| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
| 2026.0 | 6.1.x | 9.3.4 | 7.0.x | 2026.0 | 6.1.x | 9.4.0 | 7.0.x
| 2025.1 | 6.0.x | 9.2.2 | 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 | 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.1 | 5.4.xfootnote:oom[Out of maintenance] | 8.15.5 | 6.1.x
src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java
+3 -3
View File
@@ -22,7 +22,7 @@ import co.elastic.clients.elasticsearch._types.BulkIndexByScrollFailure;
import co.elastic.clients.elasticsearch._types.ErrorCause; import co.elastic.clients.elasticsearch._types.ErrorCause;
import co.elastic.clients.elasticsearch._types.Time; import co.elastic.clients.elasticsearch._types.Time;
import co.elastic.clients.elasticsearch._types.query_dsl.Query; import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch.cluster.ComponentTemplateSummary; import co.elastic.clients.elasticsearch.cluster.ComponentTemplateSummaryRes;
import co.elastic.clients.elasticsearch.cluster.GetComponentTemplateResponse; import co.elastic.clients.elasticsearch.cluster.GetComponentTemplateResponse;
import co.elastic.clients.elasticsearch.cluster.HealthResponse; import co.elastic.clients.elasticsearch.cluster.HealthResponse;
import co.elastic.clients.elasticsearch.core.DeleteByQueryResponse; import co.elastic.clients.elasticsearch.core.DeleteByQueryResponse;
@@ -133,7 +133,7 @@ class ResponseConverter {
.build(); .build();
} }
private TemplateResponseData clusterGetComponentTemplateData(ComponentTemplateSummary componentTemplateSummary) { private TemplateResponseData clusterGetComponentTemplateData(ComponentTemplateSummaryRes componentTemplateSummary) {
var mapping = typeMapping(componentTemplateSummary.mappings()); var mapping = typeMapping(componentTemplateSummary.mappings());
var settings = new Settings(); var settings = new Settings();
@@ -336,7 +336,7 @@ class ResponseConverter {
.build(); .build();
} }
private TemplateResponseData indexGetComponentTemplateData(IndexTemplateSummary indexTemplateSummary, private TemplateResponseData indexGetComponentTemplateData(IndexTemplateSummaryWithRollover indexTemplateSummary,
List<String> composedOf) { List<String> composedOf) {
var mapping = typeMapping(indexTemplateSummary.mappings()); var mapping = typeMapping(indexTemplateSummary.mappings());
src/test/resources/testcontainers-elasticsearch.properties
+1 -1
View File
@@ -15,7 +15,7 @@
# #
# #
sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
sde.testcontainers.image-version=9.3.3 sde.testcontainers.image-version=9.4.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 # 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