From e4306c570d94815a6ce6f758e25fb4db1d3e36dd Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Thu, 12 Aug 2021 20:35:49 +0200 Subject: [PATCH] Upgrade to Elasticsearch 7.13.4. Closes #1896 --- pom.xml | 2 +- src/main/asciidoc/preface.adoc | 2 +- .../testcontainers-elasticsearch.properties | 17 ++++++++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 63925dcd4..8a024510a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ https://github.com/spring-projects/spring-data-elasticsearch - 7.13.3 + 7.13.4 2.14.1 4.1.65.Final 2.6.0-SNAPSHOT diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index 30e4f1a36..4a598ab9f 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -34,7 +34,7 @@ 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.1 (Q)footnote:cdv[Currently in development] | 4.3.xfootnote:cdv[] | 7.13.3 | 5.3.xfootnote:cdv[] | 2.5.xfootnote:cdv[] +| 2021.1 (Q)footnote:cdv[Currently in development] | 4.3.xfootnote:cdv[] | 7.13.4 | 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 diff --git a/src/test/resources/testcontainers-elasticsearch.properties b/src/test/resources/testcontainers-elasticsearch.properties index 2ca3d43e3..67b11aa78 100644 --- a/src/test/resources/testcontainers-elasticsearch.properties +++ b/src/test/resources/testcontainers-elasticsearch.properties @@ -1,8 +1,23 @@ # +# Copyright 2021 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# # properties defining the image, these are not passed to the container on startup # sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch -sde.testcontainers.image-version=7.13.3 +sde.testcontainers.image-version=7.13.4 # # # 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