From b9e3f0555c348a49415c6caf6d472751e580ea89 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Thu, 4 Dec 2025 23:37:43 +0100 Subject: [PATCH] Upgrade to Elasticsearch 9.2.2. Closes #3207 Signed-off-by: Peter-Josef Meisch --- pom.xml | 4 ++-- .../ROOT/pages/elasticsearch/elasticsearch-new.adoc | 7 ++++++- .../antora/modules/ROOT/pages/elasticsearch/versions.adoc | 3 ++- src/test/resources/testcontainers-elasticsearch.properties | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index cc7d103fb..9597235d4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,8 +21,8 @@ 4.1.0-SNAPSHOT - 9.2.1 - 9.2.1 + 9.2.2 + 9.2.2 0.20.2 2.25.1 diff --git a/src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc b/src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc index 8d187634a..b1b7a47fe 100644 --- a/src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc +++ b/src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc @@ -1,9 +1,14 @@ [[new-features]] = What's new -[[new-features.6-0-0]] +[[new-features.6-1-0]] == New in Spring Data Elasticsearch 6.0 +* Upgrade to Elasticsearch 9.2.2 + +[[new-features.6-0-0]] +== New in Spring Data Elasticsearch 6.1 + * Upgrade to Spring 7 * Switch to jspecify nullability annotations * Upgrade to Elasticsearch 9.2.1 diff --git a/src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc b/src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc index 9af35a774..dc73741be 100644 --- a/src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc +++ b/src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc @@ -6,7 +6,8 @@ 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 -| 2025.1 | 6.0.x | 9.2.1 | 7.0.x +| 2026.0 | 6.1.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 | 2024.1 | 5.4.xfootnote:oom[Out of maintenance] | 8.15.5 | 6.1.x | 2024.0 | 5.3.xfootnote:oom[] | 8.13.4 | 6.1.x diff --git a/src/test/resources/testcontainers-elasticsearch.properties b/src/test/resources/testcontainers-elasticsearch.properties index 50a467206..5812e2c9a 100644 --- 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=9.2.1 +sde.testcontainers.image-version=9.2.2 # # # 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