diff --git a/pom.xml b/pom.xml index 3e9ceb94a..062e7754a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.6 - 7.3.2 + 7.4.1 2.9.1 2.3.0.BUILD-SNAPSHOT 4.1.39.Final diff --git a/src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java index c84aff952..400d16508 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java @@ -15,9 +15,11 @@ */ package org.springframework.data.elasticsearch.client.reactive; +import org.elasticsearch.common.io.stream.StreamOutput; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.io.IOException; import java.util.List; import org.elasticsearch.action.ActionResponse; @@ -66,4 +68,12 @@ public ClientResponse.Headers headers() { public T body(BodyExtractor extractor) { return delegate.body(extractor); } + + /* + * (non-Javadoc) + * until Elasticsearch 7.4 this empty implementation was available in the abstract base class + */ + @Override + public void writeTo(StreamOutput out) throws IOException { + } } diff --git a/src/test/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java b/src/test/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java index ef562d021..d879429db 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.List; -import org.elasticsearch.geo.utils.Geohash; +import org.elasticsearch.geometry.utils.Geohash; import org.elasticsearch.index.query.QueryBuilders; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.3.2.jar b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.4.1.jar similarity index 77% rename from src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.3.2.jar rename to src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.4.1.jar index 0cf875b2d..b63aaa003 100644 Binary files a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.3.2.jar and b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-7.4.1.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 a53ee16b9..cba78bbaa 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.3.2 +version=7.4.1 # # '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.3.2 +elasticsearch.version=7.4.1 ### 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.3.2.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.4.1.jar similarity index 86% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.3.2.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.4.1.jar index 9c5cf8299..eb0aee19f 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.3.2.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-7.4.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.3.2.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.4.1.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.3.2.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.4.1.jar index 3f43d8c6a..8400a15a6 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.3.2.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-7.4.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.3.2.jar b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.4.1.jar similarity index 78% rename from src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.3.2.jar rename to src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.4.1.jar index a38ed506b..3b872af32 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.3.2.jar and b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-7.4.1.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 667ee8ac5..8d4910dad 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.3.2 +version=7.4.1 # # '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.3.2 +elasticsearch.version=7.4.1 ### 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.3.2.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.4.1.jar similarity index 89% rename from src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.3.2.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.4.1.jar index 2e6388fee..0889a1e24 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.3.2.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-7.4.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.1.0.jar b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.2.0.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.1.0.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.2.0.jar index 104ce5388..3f93fbc86 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.1.0.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-8.2.0.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 abd217462..9c61a39de 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.3.2 +version=7.4.1 # # '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.3.2 +elasticsearch.version=7.4.1 ### 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.3.2.jar b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.4.1.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.3.2.jar rename to src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.4.1.jar index b7c961337..7043e4273 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.3.2.jar and b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-7.4.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.3.2.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.3.2.jar deleted file mode 100644 index f1e48eda0..000000000 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.3.2.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.4.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.4.1.jar new file mode 100644 index 000000000..ecfdfefff Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.4.1.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 2bc70e862..a603ccf38 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.3.2 +version=7.4.1 # # '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.3.2 +elasticsearch.version=7.4.1 ### 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-7.3.2.jar b/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-7.3.2.jar deleted file mode 100644 index 309dbf8b1..000000000 Binary files a/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-7.3.2.jar and /dev/null 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 7848f47a9..bd5a7ecea 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.3.2 +version=7.4.1 # # 'name': the plugin name name=mapper-extras @@ -35,11 +35,11 @@ classname=org.elasticsearch.index.mapper.MapperExtrasPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=7.3.2 +elasticsearch.version=7.4.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI -extended.plugins=lang-painless +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 2b668e6c9..e49908e3f 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.3.2 +version=7.4.1 # # '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.3.2 +elasticsearch.version=7.4.1 ### 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 bf3eea70d..19742f641 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.3.2 +version=7.4.1 # # '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.3.2 +elasticsearch.version=7.4.1 ### 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.3.2.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.3.2.jar deleted file mode 100644 index abadd32fa..000000000 Binary files a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.3.2.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.4.1.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.4.1.jar new file mode 100644 index 000000000..973eba005 Binary files /dev/null and b/src/test/resources/test-home-dir/modules/repository-url/repository-url-7.4.1.jar differ