diff --git a/pom.xml b/pom.xml index 34126a1dd..07fe3298b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.6 - 6.8.10 + 6.8.12 2.9.1 2.2.10.BUILD-SNAPSHOT 4.1.39.Final diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index ab5649b70..d33be9023 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 -|Moore |3.2.x |6.8.10 |2.2.x +|Moore |3.2.x |6.8.12 |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.10.jar b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.12.jar similarity index 88% rename from src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.10.jar rename to src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.12.jar index 7b179a96f..54f25edd4 100644 Binary files a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.10.jar and b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.12.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 8e959f170..7844764cc 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.10 +version=6.8.12 # # '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.10 +elasticsearch.version=6.8.12 ### 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.10.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.12.jar similarity index 86% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.10.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.12.jar index b6d6dacd2..642ad783a 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.10.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.12.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.10.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.12.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.10.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.12.jar index aa1068315..5c9e42cf5 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.10.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.12.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.10.jar b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.12.jar similarity index 82% rename from src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.10.jar rename to src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.12.jar index fda26cbac..454c75081 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.10.jar and b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.12.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 08448659c..67aaa8aeb 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.10 +version=6.8.12 # # '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.10 +elasticsearch.version=6.8.12 ### 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.10.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.12.jar similarity index 89% rename from src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.10.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.12.jar index 455ad02d4..42413c2bc 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.10.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.12.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 e534300e0..01cd65be0 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.10 +version=6.8.12 # # '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.10 +elasticsearch.version=6.8.12 ### 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.10.jar b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.12.jar similarity index 83% rename from src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.10.jar rename to src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.12.jar index 0de09651f..1b111c789 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.10.jar and b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.12.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.10.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.12.jar similarity index 93% rename from src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.10.jar rename to src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.12.jar index 05fc551f8..b212bff3d 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.10.jar and b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.12.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 833baffca..72b4e22a2 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.10 +version=6.8.12 # # '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.10 +elasticsearch.version=6.8.12 ### 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.10.jar b/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.12.jar similarity index 88% rename from src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.10.jar rename to src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.12.jar index b8506b2a1..4a3387f14 100644 Binary files a/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.10.jar and b/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.12.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 b9282d93a..385792922 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.10 +version=6.8.12 # # '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.10 +elasticsearch.version=6.8.12 ### 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 6f8b231f7..d73eb9257 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.10 +version=6.8.12 # # '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.10 +elasticsearch.version=6.8.12 ### 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 8be443e4f..0745c00f3 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.10 +version=6.8.12 # # '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.10 +elasticsearch.version=6.8.12 ### 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.10.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.12.jar similarity index 82% rename from src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.10.jar rename to src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.12.jar index 56dbc285d..d3a5e0d23 100644 Binary files a/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.10.jar and b/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.12.jar differ