diff --git a/pom.xml b/pom.xml index 0c622de17..9f54385f4 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.6 - 6.8.13 + 6.8.14 2.9.1 2.2.13.BUILD-SNAPSHOT 4.1.39.Final diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index 1952f4b9e..9f3fc522d 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.13 |2.2.x +|Moore |3.2.x |6.8.14 |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.13.jar b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.14.jar similarity index 88% rename from src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.13.jar rename to src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.14.jar index 7f08f0351..924cb93a4 100644 Binary files a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.13.jar and b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.8.14.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 4ede8e8d7..a55010a49 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.13 +version=6.8.14 # # '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.13 +elasticsearch.version=6.8.14 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI @@ -43,3 +43,4 @@ extended.plugins=lang-painless # # 'has.native.controller': whether or not the plugin has a native controller has.native.controller=false + diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.13.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.14.jar similarity index 86% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.13.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.14.jar index 0ed2c9695..32430a2b2 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.13.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.8.14.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.13.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.14.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.13.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.14.jar index 89903d520..0bface318 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.13.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.8.14.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.13.jar b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.14.jar similarity index 89% rename from src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.13.jar rename to src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.14.jar index 4238ed5b6..0e542103b 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.13.jar and b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.8.14.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 9927fa210..3e0dd9009 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.13 +version=6.8.14 # # '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.13 +elasticsearch.version=6.8.14 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI @@ -43,3 +43,4 @@ extended.plugins=lang-painless # # 'has.native.controller': whether or not the plugin has a native controller has.native.controller=false + diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.13.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.14.jar similarity index 89% rename from src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.13.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.14.jar index 8c55ea7c2..0dab749a9 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.13.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.8.14.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 f85538ed9..9f7d7a9e7 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.13 +version=6.8.14 # # '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.13 +elasticsearch.version=6.8.14 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI @@ -43,3 +43,4 @@ extended.plugins= # # 'has.native.controller': whether or not the plugin has a native controller has.native.controller=false + diff --git a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.13.jar b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.14.jar similarity index 83% rename from src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.13.jar rename to src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.14.jar index 03b7a1b7f..946e29fc3 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.13.jar and b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.8.14.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.13.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.14.jar similarity index 93% rename from src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.13.jar rename to src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.14.jar index 55794fc1e..ce6c91044 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.13.jar and b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.8.14.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 8fa856286..84c916af8 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.13 +version=6.8.14 # # '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.13 +elasticsearch.version=6.8.14 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI @@ -43,3 +43,4 @@ extended.plugins= # # 'has.native.controller': whether or not the plugin has a native controller has.native.controller=false + diff --git a/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.13.jar b/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.14.jar similarity index 88% rename from src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.13.jar rename to src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.14.jar index 49c2c65c6..74d98f072 100644 Binary files a/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.13.jar and b/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.8.14.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 3a681c353..122be2b81 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.13 +version=6.8.14 # # '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.13 +elasticsearch.version=6.8.14 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI @@ -43,3 +43,4 @@ extended.plugins= # # 'has.native.controller': whether or not the plugin has a native controller has.native.controller=false + 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 423980f9f..4b9d5b16d 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.13 +version=6.8.14 # # '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.13 +elasticsearch.version=6.8.14 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI @@ -43,3 +43,4 @@ extended.plugins= # # 'has.native.controller': whether or not the plugin has a native controller has.native.controller=false + 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 3c97bddcc..96261ba84 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.13 +version=6.8.14 # # '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.13 +elasticsearch.version=6.8.14 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI @@ -43,3 +43,4 @@ extended.plugins= # # 'has.native.controller': whether or not the plugin has a native controller has.native.controller=false + diff --git a/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.13.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.14.jar similarity index 81% rename from src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.13.jar rename to src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.14.jar index 8f5ff8c92..764f04890 100644 Binary files a/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.13.jar and b/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.8.14.jar differ