diff --git a/pom.xml b/pom.xml index 39862ef55..95ec1a7aa 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.6 - 6.8.1 + 6.8.4 2.9.1 2.2.1.BUILD-SNAPSHOT 4.1.39.Final diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index 68260801b..04c035a5a 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 -|Moorefootnote:cdv[Currently in development] |3.2.xfootnote:cdv[]|6.8.1 |2.2.0footnote:cdv[] +|Moore |3.2.x |6.8.4 |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/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.1.jar b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.4.jar similarity index 88% rename from src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.1.jar rename to src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.4.jar index 3144fa5a7..9d27030e5 100644 Binary files a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.1.jar and b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.4.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 614e3217b..69d44fdc7 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=6.8.1 +version=6.8.4 # # '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=6.8.1 +elasticsearch.version=6.8.4 ### 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-6.8.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.4.jar similarity index 86% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.4.jar index 31b1ef980..bed1e303d 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.4.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.4.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.4.jar index 4c21c6ccc..043f4ec99 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.4.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.1.jar b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.4.jar similarity index 89% rename from src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.1.jar rename to src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.4.jar index 720d319ed..04ca2d253 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.1.jar and b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.4.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 75a092172..4c0fee630 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=6.8.1 +version=6.8.4 # # '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=6.8.1 +elasticsearch.version=6.8.4 ### 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-6.8.1.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.4.jar similarity index 89% rename from src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.1.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.4.jar index c159c159d..09306d4b3 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.1.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.4.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.7.0.jar b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.7.2.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.7.0.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.7.2.jar index efafbd09f..61859b3a6 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.7.0.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.7.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 1e0675d63..ecdcddc4c 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=6.8.1 +version=6.8.4 # # '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=6.8.1 +elasticsearch.version=6.8.4 ### 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-6.8.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.4.jar similarity index 83% rename from src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.1.jar rename to src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.4.jar index 6b0ff6842..137798552 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.1.jar and b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.4.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.4.jar similarity index 93% rename from src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.1.jar rename to src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.4.jar index 9dcd6585f..3e542c8c2 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.1.jar and b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.4.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 cb3d13f94..ae6e11250 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=6.8.1 +version=6.8.4 # # '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=6.8.1 +elasticsearch.version=6.8.4 ### 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/mapper-extras-6.8.1.jar b/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.4.jar similarity index 89% rename from src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.1.jar rename to src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.4.jar index 8680f3b70..a80daa0c4 100644 Binary files a/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.1.jar and b/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.4.jar differ 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 57ac2e670..70af4b044 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=6.8.1 +version=6.8.4 # # '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=6.8.1 +elasticsearch.version=6.8.4 ### 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 0e9e9979e..9781a60a4 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=6.8.1 +version=6.8.4 # # '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=6.8.1 +elasticsearch.version=6.8.4 ### 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 340b26bfb..635c9fe62 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=6.8.1 +version=6.8.4 # # '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=6.8.1 +elasticsearch.version=6.8.4 ### 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-6.8.1.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.4.jar similarity index 81% rename from src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.1.jar rename to src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.4.jar index af2e541be..698939f13 100644 Binary files a/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.1.jar and b/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.4.jar differ