diff --git a/pom.xml b/pom.xml index 54f642d30..7200d5274 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 7.17.7 - 8.5.0 + 8.5.1 2.18.0 4.1.65.Final diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index 5806fbcef..1c4e1b11e 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -37,6 +37,7 @@ built and tested. [cols="^,^,^,^,^",options="header"] |=== | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot +| 2022.1 | 5.1.x | 8.5.1 | 6.0.x | 3.0.x | 2022.0 (Turing) | 5.0.x | 8.5.0 | 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 diff --git a/src/main/asciidoc/reference/elasticsearch-new.adoc b/src/main/asciidoc/reference/elasticsearch-new.adoc index 65aae6123..50acb8dab 100644 --- a/src/main/asciidoc/reference/elasticsearch-new.adoc +++ b/src/main/asciidoc/reference/elasticsearch-new.adoc @@ -1,12 +1,17 @@ [[new-features]] = What's new +[[new-features.5-1-0]] +== New in Spring Data Elasticsearch 5.1 + +* Upgrade to Elasticsearch 8.5.1 + [[new-features.5-0-0]] == New in Spring Data Elasticsearch 5.0 * Upgrade to Java 17 baseline * Upgrade to Spring Framework 6 -* Upograde to Elasticsearch 8.5.0 +* Upgrade to Elasticsearch 8.5.0 * Use the new Elasticsearch client library [[new-features.4-4-0]] diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt index 48a5f193f..ee4521154 100644 --- a/src/main/resources/notice.txt +++ b/src/main/resources/notice.txt @@ -1,5 +1,5 @@ Spring Data Elasticsearch 5.0 GA (2022.0.0) -Copyright (c) [2013-2021] Pivotal Software, Inc. +Copyright (c) [2013-2022] Pivotal Software, Inc. This product is licensed to you under the Apache License, Version 2.0 (the "License"). You may not use this product except in compliance with the License. @@ -8,11 +8,3 @@ This product may include a number of subcomponents with separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. - - - - - - - - diff --git a/src/test/resources/testcontainers-elasticsearch.properties b/src/test/resources/testcontainers-elasticsearch.properties index 6219c1501..885a9a585 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.5.0 +sde.testcontainers.image-version=8.5.1 # # # 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