diff --git a/pom.xml b/pom.xml index e90ef3df0..3119d320a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.6 - 7.5.2 + 7.6.1 2.9.1 2.3.0.BUILD-SNAPSHOT 4.1.39.Final diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index 5913f6cd3..ce2185f0e 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -35,8 +35,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 Boot -| Neumannfootnote:cdv[Currently in development] |4.0.xfootnote:cdv[]|7.5.2 |2.3.xfootnote:cdv[] -| Moore | 3.2.x |6.8.4 | 2.2.x +| Neumannfootnote:cdv[Currently in development] |4.0.xfootnote:cdv[]|7.6.1 |2.3.xfootnote:cdv[] +| Moore | 3.2.x |6.8.6 | 2.2.x | Lovelace | 3.1.x | 6.2.2 |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[] diff --git a/src/main/asciidoc/reference/elasticsearch-new.adoc b/src/main/asciidoc/reference/elasticsearch-new.adoc index f41bf934f..7684c084d 100644 --- a/src/main/asciidoc/reference/elasticsearch-new.adoc +++ b/src/main/asciidoc/reference/elasticsearch-new.adoc @@ -5,7 +5,7 @@ == New in Spring Data Elasticsearch 4.0 * Uses Spring 5.2. -* Upgrade to Elasticsearch 7.5.2. +* Upgrade to Elasticsearch 7.6.1. * Deprecation of `TransportClient` usage. * Implements most of the mapping-types available for the index mappings. * Removal of the Jackson `ObjectMapper`, now using the <> diff --git a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.5.2.jar b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.5.2.jar deleted file mode 100644 index a2c7da81a..000000000 Binary files a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.5.2.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.6.1.jar b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.6.1.jar new file mode 100644 index 000000000..f1e7ef32e Binary files /dev/null and b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties index 4361d81e8..a43dbe50a 100644 --- a/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Adds "built in" analyzers to Elasticsearch. # # 'version': plugin's version -version=7.5.2 +version=7.6.1 # # 'name': the plugin name name=analysis-common @@ -35,7 +35,7 @@ classname=org.elasticsearch.analysis.common.CommonAnalysisPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.5.2 +elasticsearch.version=7.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.5.2.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.5.2.jar deleted file mode 100644 index 0f745b49a..000000000 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.5.2.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.6.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.6.1.jar new file mode 100644 index 000000000..d98f28316 Binary files /dev/null and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.5.2.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.5.2.jar deleted file mode 100644 index 86c594ac9..000000000 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.5.2.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.6.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.6.1.jar new file mode 100644 index 000000000..c05ba4b6a Binary files /dev/null and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.5.2.jar b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.5.2.jar deleted file mode 100644 index 482a81a70..000000000 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.5.2.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.6.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.6.1.jar new file mode 100644 index 000000000..e8166a18d Binary files /dev/null and b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties index 5bffb9554..98d70ce6c 100644 --- a/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Module for ingest processors that do not require additional security permissions or have large dependencies and resources # # 'version': plugin's version -version=7.5.2 +version=7.6.1 # # 'name': the plugin name name=ingest-common @@ -35,7 +35,7 @@ classname=org.elasticsearch.ingest.common.IngestCommonPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.5.2 +elasticsearch.version=7.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.5.2.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.5.2.jar deleted file mode 100644 index e627e6807..000000000 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.5.2.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.6.1.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.6.1.jar new file mode 100644 index 000000000..68951ebd8 Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.3.0.jar b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.4.0.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.3.0.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.4.0.jar index b870ca615..f0a43e718 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.3.0.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.4.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties index d5ecfbf5e..c52e59353 100644 --- a/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Lucene expressions integration for Elasticsearch # # 'version': plugin's version -version=7.5.2 +version=7.6.1 # # 'name': the plugin name name=lang-expression @@ -35,7 +35,7 @@ classname=org.elasticsearch.script.expression.ExpressionPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.5.2 +elasticsearch.version=7.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.5.2.jar b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.5.2.jar deleted file mode 100644 index d4cf33bdd..000000000 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.5.2.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.6.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.6.1.jar new file mode 100644 index 000000000..19714bc92 Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.5.2.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.5.2.jar deleted file mode 100644 index 0287d08ac..000000000 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.5.2.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.6.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.6.1.jar new file mode 100644 index 000000000..42374bf17 Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties index af45c22f5..715613ee5 100644 --- a/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=An easy, safe and fast scripting language for Elasticsearch # # 'version': plugin's version -version=7.5.2 +version=7.6.1 # # 'name': the plugin name name=lang-painless @@ -35,7 +35,7 @@ classname=org.elasticsearch.painless.PainlessPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.5.2 +elasticsearch.version=7.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties index 536025826..22068bb58 100644 --- a/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Adds advanced field mappers # # 'version': plugin's version -version=7.5.2 +version=7.6.1 # # 'name': the plugin name name=mapper-extras @@ -35,7 +35,7 @@ classname=org.elasticsearch.index.mapper.MapperExtrasPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.5.2 +elasticsearch.version=7.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties index 7adcf9865..898bff7b7 100644 --- a/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=The Reindex module adds APIs to reindex from one index to another or update documents in place. # # 'version': plugin's version -version=7.5.2 +version=7.6.1 # # 'name': the plugin name name=reindex @@ -35,7 +35,7 @@ classname=org.elasticsearch.index.reindex.ReindexPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.5.2 +elasticsearch.version=7.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties index cb860f800..c2fe80f0b 100644 --- a/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Module for URL repository # # 'version': plugin's version -version=7.5.2 +version=7.6.1 # # 'name': the plugin name name=repository-url @@ -35,7 +35,7 @@ classname=org.elasticsearch.plugin.repository.url.URLRepositoryPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.5.2 +elasticsearch.version=7.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.5.2.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.5.2.jar deleted file mode 100644 index 969a2fcb7..000000000 Binary files a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.5.2.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.6.1.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.6.1.jar new file mode 100644 index 000000000..1ebc7e363 Binary files /dev/null and b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.6.1.jar differ