diff --git a/pom.xml b/pom.xml index 799e6a873..abf197b27 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.6 - 7.6.1 + 7.6.2 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 ce2185f0e..2b518b027 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -35,7 +35,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 Boot -| Neumannfootnote:cdv[Currently in development] |4.0.xfootnote:cdv[]|7.6.1 |2.3.xfootnote:cdv[] +| Neumannfootnote:cdv[Currently in development] |4.0.xfootnote:cdv[]|7.6.2 |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[] diff --git a/src/main/asciidoc/reference/elasticsearch-new.adoc b/src/main/asciidoc/reference/elasticsearch-new.adoc index 7684c084d..cf1915b92 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.6.1. +* Upgrade to Elasticsearch 7.6.2. * 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.6.1.jar b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.6.2.jar similarity index 88% rename from src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.6.1.jar rename to src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.6.2.jar index f1e7ef32e..1c948e374 100644 Binary files a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.6.1.jar and b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.6.2.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 a43dbe50a..6f7a0f23f 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.6.1 +version=7.6.2 # # '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.6.1 +elasticsearch.version=7.6.2 ### 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.6.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.6.2.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.6.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.6.2.jar index d98f28316..03d1fd85e 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.6.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.6.2.jar 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.2.jar similarity index 86% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.6.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.6.2.jar index c05ba4b6a..3a6c09d13 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.6.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.6.2.jar 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.2.jar similarity index 89% rename from src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.6.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.6.2.jar index e8166a18d..847077079 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.6.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.6.2.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 98d70ce6c..775c286a5 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.6.1 +version=7.6.2 # # '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.6.1 +elasticsearch.version=7.6.2 ### 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.6.1.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.6.2.jar similarity index 89% rename from src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.6.1.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.6.2.jar index 68951ebd8..6e8acfc35 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.6.1.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.6.2.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 c52e59353..615f4d45c 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.6.1 +version=7.6.2 # # '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.6.1 +elasticsearch.version=7.6.2 ### 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/asm-7.2.jar b/src/test/resources/test-home-dir/modules/lang-painless/asm-7.2.jar new file mode 100644 index 000000000..5058db4fa Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-painless/asm-7.2.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/asm-analysis-7.2.jar b/src/test/resources/test-home-dir/modules/lang-painless/asm-analysis-7.2.jar new file mode 100644 index 000000000..00efd57b4 Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-painless/asm-analysis-7.2.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/asm-commons-7.2.jar b/src/test/resources/test-home-dir/modules/lang-painless/asm-commons-7.2.jar new file mode 100644 index 000000000..bb84f3a9d Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-painless/asm-commons-7.2.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/asm-debug-all-5.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/asm-debug-all-5.1.jar deleted file mode 100644 index 34b7bfada..000000000 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/asm-debug-all-5.1.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/asm-tree-7.2.jar b/src/test/resources/test-home-dir/modules/lang-painless/asm-tree-7.2.jar new file mode 100644 index 000000000..031674ab6 Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-painless/asm-tree-7.2.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/asm-util-7.2.jar b/src/test/resources/test-home-dir/modules/lang-painless/asm-util-7.2.jar new file mode 100644 index 000000000..1047ab3e0 Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-painless/asm-util-7.2.jar 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.2.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.6.1.jar rename to src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.6.2.jar index 19714bc92..6e4f6e6c7 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.6.1.jar and b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.6.2.jar 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.2.jar similarity index 93% rename from src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.6.1.jar rename to src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.6.2.jar index 42374bf17..34e947446 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.6.1.jar and b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.6.2.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 715613ee5..b5bb4c414 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.6.1 +version=7.6.2 # # '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.6.1 +elasticsearch.version=7.6.2 ### 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 22068bb58..14a39cb7b 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.6.1 +version=7.6.2 # # '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.6.1 +elasticsearch.version=7.6.2 ### 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 898bff7b7..2f51173a5 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.6.1 +version=7.6.2 # # '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.6.1 +elasticsearch.version=7.6.2 ### 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 c2fe80f0b..cec2d76a4 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.6.1 +version=7.6.2 # # '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.6.1 +elasticsearch.version=7.6.2 ### 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.6.1.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.6.2.jar similarity index 81% rename from src/test/resources/test-home-dir/modules/repository-url/repository-url-7.6.1.jar rename to src/test/resources/test-home-dir/modules/repository-url/repository-url-7.6.2.jar index 1ebc7e363..99a221f2a 100644 Binary files a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.6.1.jar and b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.6.2.jar differ