From 6092da6fe7e4ed0694d680548265cdb087b8aee1 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Tue, 10 Sep 2019 12:35:21 +0200 Subject: [PATCH] DATAES-648 - Unified version compatibility matrix into reference docs. Added information about which Boot version uses which Spring Data Elasticsearch version as well as hints about which versions are still under active maintenance. Tweaked the readme to rather point to the reference documentation. This needs to be updated to point to the "current" alias once we've reached GA. Original pull request: #317. --- README.adoc | 11 +---------- src/main/asciidoc/preface.adoc | 19 +++++++++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/README.adoc b/README.adoc index c2c8882a..4b6de664 100644 --- a/README.adoc +++ b/README.adoc @@ -118,16 +118,7 @@ Add the Maven dependency: // Always change both files! **Compatibility Matrix** -[cols="^,^"] -|=== -|Spring Data Elasticsearch | Elasticsearch -|_3.2.x_ (not yet released) |_6.8.1_ -|3.1.x |6.2.2 -|3.0.x |5.5.0 -|2.1.x |2.4.0 -|2.0.x |2.2.0 -|1.3.x |1.5.2 -|=== +The compatibility between Spring Data Elasticsearch, Elasticsearch client drivers and Spring Boot versions can be found in the https://docs.spring.io/spring-data/elasticsearch/docs/3.2.0.RC3/reference/html/#preface.versions[reference documentation]. To use the Release candidate versions of the upcoming major version, use our Maven milestone repository and declare the appropriate dependency version: diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index e938f37f..7e6aca9a 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -31,15 +31,14 @@ Requires an installation of https://www.elastic.co/products/elasticsearch[Elasti // this file is duplicated in the toplevel README // Always change both files! -The following table shows the Elasticsearch versions that are used by Spring Data Elasticsearch: -[cols="^,^"] +The following table shows the Elasticsearch versions that are used by Spring Data release trains and version of Spring Data Elasticsearch included in that, as well as the Spring Boot versions refering to that particular Spring Data release train: +[cols="^,^,^,^",options="header"] +|=== +|Spring Data Release Train |Spring Data Elasticsearch |Elasticsearch | Spring Boot +|Moorefootnote:cdv[Currently in development] |3.2.xfootnote:cdv[]|6.8.1 / 7.xfootnote:hrc[via the <>]|2.2.0footnote:cdv[] +|Lovelace |3.1.x |6.2.2 / 7.xfootnote:hrc[]|2.1.x +|Kayfootnote:oom[Out of maintenance]|3.0.xfootnote:oom[] |5.5.0 |2.0.xfootnote:oom[] +|Ingallsfootnote:oom[]|2.1.xfootnote:oom[] |2.4.0 |1.5.xfootnote:oom[] |=== -|Spring Data Elasticsearch |Elasticsearch -|3.2.x |6.8.1 -|3.1.x |6.2.2 -|3.0.x |5.5.0 -|2.1.x |2.4.0 -|2.0.x |2.2.0 -|1.3.x |1.5.2 -|=== +Support for upcoming versions of Elasticsearch is being tracked and general compatibility should be given assuming the usage of the <>.