diff --git a/pom.xml b/pom.xml index 1a722c91..a9a71063 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.6 - 7.6.2 + 7.7.0 2.9.1 2.4.0-SNAPSHOT 4.1.39.Final diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index 56570052..877dcd67 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -36,8 +36,9 @@ 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.2 |2.3.xfootnote:cdv[] -| Moore | 3.2.x |6.8.6 | 2.2.x +| Ockhamfootnote:cdv[Currently in development] |4.1.xfootnote:cdv[]|7.7.0 |2.3.xfootnote:cdv[] +| Neumann | 4.0.x | 7.6.2 |2.3.x +| Moore | 3.2.x |6.8.9 | 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-7.6.2.jar b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.7.0.jar similarity index 79% rename from src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.6.2.jar rename to src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.7.0.jar index 1c948e37..1d640598 100644 Binary files a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.6.2.jar and b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.7.0.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 6f7a0f23..73c64397 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.2 +version=7.7.0 # # '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.2 +elasticsearch.version=7.7.0 ### 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.2.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.7.0.jar similarity index 86% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.6.2.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.7.0.jar index 03d1fd85..49829eaa 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.6.2.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.7.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.6.2.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.7.0.jar similarity index 58% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.6.2.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.7.0.jar index 3a6c09d1..2aa562f4 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.6.2.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.7.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.6.2.jar b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.7.0.jar similarity index 67% rename from src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.6.2.jar rename to src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.7.0.jar index 84707707..99239ebe 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.6.2.jar and b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.7.0.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 775c286a..8027c72e 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.2 +version=7.7.0 # # '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.2 +elasticsearch.version=7.7.0 ### 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.2.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.6.2.jar deleted file mode 100644 index 6e8acfc3..00000000 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.6.2.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.7.0.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.7.0.jar new file mode 100644 index 00000000..a5569a7a Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.7.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.4.0.jar b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.5.1.jar similarity index 72% rename from src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.4.0.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.5.1.jar index f0a43e71..ca769760 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.4.0.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.5.1.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 615f4d45..ea4de483 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.2 +version=7.7.0 # # '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.2 +elasticsearch.version=7.7.0 ### 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.6.2.jar b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.7.0.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.6.2.jar rename to src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.7.0.jar index 6e4f6e6c..bfc3994b 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.6.2.jar and b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.7.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.6.2.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.7.0.jar similarity index 62% rename from src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.6.2.jar rename to src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.7.0.jar index 34e94744..c75bafd0 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.6.2.jar and b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.7.0.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 b5bb4c41..0d10e4fb 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.2 +version=7.7.0 # # '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.2 +elasticsearch.version=7.7.0 ### 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 14a39cb7..4a465f18 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.2 +version=7.7.0 # # '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.2 +elasticsearch.version=7.7.0 ### 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 2f51173a..f6c396bb 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.2 +version=7.7.0 # # '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.2 +elasticsearch.version=7.7.0 ### 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 cec2d76a..c795e9bf 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.2 +version=7.7.0 # # '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.2 +elasticsearch.version=7.7.0 ### 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.2.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.7.0.jar similarity index 81% rename from src/test/resources/test-home-dir/modules/repository-url/repository-url-7.6.2.jar rename to src/test/resources/test-home-dir/modules/repository-url/repository-url-7.7.0.jar index 99a221f2..f0d3452c 100644 Binary files a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.6.2.jar and b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.7.0.jar differ