From bbee64c8a41cc29a908c8b378a6e4ba1d2193700 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sat, 30 Oct 2021 21:27:44 +0200 Subject: [PATCH] Upgrade to Elasticsearch 7.15.1. Original Pull Request #1980 Closes #1979 --- pom.xml | 2 +- src/main/asciidoc/preface.adoc | 2 +- src/main/asciidoc/reference/elasticsearch-new.adoc | 2 +- .../springframework/data/elasticsearch/annotations/Field.java | 2 +- src/test/resources/testcontainers-elasticsearch.properties | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index c0dbe754a..24ed3e709 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ https://github.com/spring-projects/spring-data-elasticsearch - 7.15.0 + 7.15.1 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 d739b9d9a..df1ea27a1 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.15.0 | 5.3.xfootnote:cdv[] | 2.5 .xfootnote:cdv[] +| 2021.1 (Q)footnote:cdv[Currently in development] | 4.3.xfootnote:cdv[] | 7.15.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 diff --git a/src/main/asciidoc/reference/elasticsearch-new.adoc b/src/main/asciidoc/reference/elasticsearch-new.adoc index 8675f6c8b..7660b5277 100644 --- a/src/main/asciidoc/reference/elasticsearch-new.adoc +++ b/src/main/asciidoc/reference/elasticsearch-new.adoc @@ -4,7 +4,7 @@ [[new-features.4-3-0]] == New in Spring Data Elasticsearch 4.3 -* Upgrade to Elasticsearch 7.15.0. +* Upgrade to Elasticsearch 7.15.1. * Allow runtime_fields to be defined in the index mapping. * Add native support for range field types by using a range object. * Add repository search for nullable or empty properties. diff --git a/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java b/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java index 7495e3f13..ff3da8457 100644 --- a/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java +++ b/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java @@ -206,7 +206,7 @@ public @interface Field { /** * marks this field to be excluded from the _source in Elasticsearch - * (https://www.elastic.co/guide/en/elasticsearch/reference/7.15.0/mapping-source-field.html#include-exclude) + * (https://www.elastic.co/guide/en/elasticsearch/reference/7.15/mapping-source-field.html#include-exclude) * * @since 4.3 */ diff --git a/src/test/resources/testcontainers-elasticsearch.properties b/src/test/resources/testcontainers-elasticsearch.properties index 39ee0d151..1cbaea5c6 100644 --- a/src/test/resources/testcontainers-elasticsearch.properties +++ b/src/test/resources/testcontainers-elasticsearch.properties @@ -17,7 +17,7 @@ # 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.15.0 +sde.testcontainers.image-version=7.15.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