From 1754f59e70c4c11151ca5a754511b83d868ba441 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sun, 17 Jul 2022 08:02:23 +0200 Subject: [PATCH] Upgrade to Elasticsearch 8.3.2. Original Pull Request #2225 Closes #2214 --- pom.xml | 4 ++-- src/main/asciidoc/preface.adoc | 2 +- .../reference/elasticsearch-migration-guide-4.4-5.0.adoc | 4 ++-- src/test/resources/testcontainers-elasticsearch.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 06911df58..b8b031da7 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,9 @@ - 7.17.4 + 7.17.5 - 8.3.1 + 8.3.2 2.17.2 4.1.65.Final diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index bd3aba6e9..d59488d58 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -37,7 +37,7 @@ built and tested. [cols="^,^,^,^,^",options="header"] |=== | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot -| 2022.0 (Turing) | 5.0.x | 8.3.1 | 6.0.x | 3.0.x? +| 2022.0 (Turing) | 5.0.x | 8.3.2 | 6.0.x | 3.0.x? | 2021.2 (Raj) | 4.4.x | 7.17.3 | 5.3.x | 2.7.x | 2021.1 (Q) | 4.3.x | 7.15.2 | 5.3.x | 2.6.x | 2021.0 (Pascal) | 4.2.xfootnote:oom[Out of maintenance] | 7.12.0 | 5.3.x | 2.5.x diff --git a/src/main/asciidoc/reference/elasticsearch-migration-guide-4.4-5.0.adoc b/src/main/asciidoc/reference/elasticsearch-migration-guide-4.4-5.0.adoc index eda9792ee..f136f58ec 100644 --- a/src/main/asciidoc/reference/elasticsearch-migration-guide-4.4-5.0.adoc +++ b/src/main/asciidoc/reference/elasticsearch-migration-guide-4.4-5.0.adoc @@ -111,7 +111,7 @@ your application as Spring Data Elasticsearch does not pull it in automatically org.elasticsearch.client elasticsearch-rest-high-level-client - 7.17.4 + 7.17.5 commons-logging @@ -122,4 +122,4 @@ your application as Spring Data Elasticsearch does not pull it in automatically ---- ==== -Make sure to specify the version 7.17.4 explicitly, otherwise maven will resolve to 8.3.1, and this does not exist. +Make sure to specify the version 7.17.5 explicitly, otherwise maven will resolve to 8.3.2, and this does not exist. diff --git a/src/test/resources/testcontainers-elasticsearch.properties b/src/test/resources/testcontainers-elasticsearch.properties index 5fb15c3bc..98d5e20bb 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=8.3.1 +sde.testcontainers.image-version=8.3.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