From 5b6789539c83ee9ffe439ff3534280d77d157a50 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Fri, 30 Apr 2021 21:18:25 +0200 Subject: [PATCH] Upgrade to Elasticsearch 7.12.1. Original Pull Request #1796 Closes #1792 --- pom.xml | 2 +- src/main/asciidoc/preface.adoc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eb4fe2df3..edca9801b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.6 - 7.12.0 + 7.12.1 2.13.3 4.1.52.Final 2.6.0-SNAPSHOT diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index 49b75f3ce..e6987b0fb 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -34,7 +34,8 @@ The following table shows the Elasticsearch versions that are used by Spring Dat [cols="^,^,^,^,^",options="header"] |=== | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot -| 2021.0 (Pascal)footnote:cdv[Currently in development] | 4.2.xfootnote:cdv[] | 7.12.0 | 5.3.xfootnote:cdv[] | 2.4.xfootnote:cdv[] +| 2021.1 (Q)footnote:cdv[Currently in development] | 4.3.xfootnote:cdv[] | 7.12.1 | 5.3.xfootnote:cdv[] | 2.5.xfootnote:cdv[] +| 2021.0 (Pascal) | 4.2.x | 7.12.0 | 5.3.x | 2.5.x | 2020.0 (Ockham) | 4.1.x | 7.9.3 | 5.3.2 | 2.4.x | Neumann | 4.0.x | 7.6.2 | 5.2.12 |2.3.x | Moore | 3.2.x |6.8.12 | 5.2.12| 2.2.x