DATAES-677 - Update to Elasticsearch 7.4.1.

Original PR: #337
This commit is contained in:
Peter-Josef Meisch 2019-10-27 12:23:42 +01:00 committed by GitHub
parent a438b38f05
commit c50af32fc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 27 additions and 17 deletions

View File

@ -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>

View File

@ -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 @@ class RawActionResponse extends ActionResponse {
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 {
}
}

View File

@ -27,7 +27,7 @@ import lombok.Setter;
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;

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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