Skip to content

DATAES-677 - Update to Elasticsearch 7.4.1. #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2019
Merged

DATAES-677 - Update to Elasticsearch 7.4.1. #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<properties>
<commonslang>2.6</commonslang>
<elasticsearch>7.3.2</elasticsearch>
<elasticsearch>7.4.1</elasticsearch>
<log4j>2.9.1</log4j>
<springdata.commons>2.3.0.BUILD-SNAPSHOT</springdata.commons>
<netty>4.1.39.Final</netty>
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -66,4 +68,12 @@ public ClientResponse.Headers headers() {
public <T> T body(BodyExtractor<T, ? super ClientHttpResponse> 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 {
}
}
2 changes: 1 addition & 1 deletion ...t/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file renamed ...analysis-common/analysis-common-7.3.2.jar → ...analysis-common/analysis-common-7.4.1.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Binary file renamed ...st-common/elasticsearch-dissect-7.3.2.jar → ...st-common/elasticsearch-dissect-7.4.1.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ngest-common/elasticsearch-grok-7.3.2.jar → ...ngest-common/elasticsearch-grok-7.4.1.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...les/ingest-common/ingest-common-7.3.2.jar → ...les/ingest-common/ingest-common-7.4.1.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Binary file renamed ...lang-expression/lang-expression-7.3.2.jar → ...lang-expression/lang-expression-7.4.1.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...g-expression/lucene-expressions-8.1.0.jar → ...g-expression/lucene-expressions-8.2.0.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Binary file renamed ...icsearch-scripting-painless-spi-7.3.2.jar → ...icsearch-scripting-painless-spi-7.4.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.3.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added src/test/resources/test-home-dir/modules/lang-painless/lang-painless-7.4.1.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Binary file removed src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-7.3.2.jar
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Binary file removed src/test/resources/test-home-dir/modules/repository-url/repository-url-7.3.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added src/test/resources/test-home-dir/modules/repository-url/repository-url-7.4.1.jar
View file
Open in desktop
Binary file not shown.