Skip to content

Commit f1eb8a5

Browse files
committed
DATAES-285 - bump elasticsearch version to 5.4.0
1 parent 65317ab commit f1eb8a5

File tree

10 files changed

+27
-24
lines changed

10 files changed

+27
-24
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<properties>
2020
<commonscollections>3.2.1</commonscollections>
2121
<commonslang>2.6</commonslang>
22-
<elasticsearch>5.2.1</elasticsearch>
22+
<elasticsearch>5.4.0</elasticsearch>
2323
<springdata.commons>2.0.0.BUILD-SNAPSHOT</springdata.commons>
2424
</properties>
2525

src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.elasticsearch.client.Client;
2323
import org.elasticsearch.client.node.NodeClient;
2424
import org.elasticsearch.common.settings.Settings;
25+
import org.elasticsearch.node.InternalSettingsPreparer;
2526
import org.elasticsearch.node.Node;
26-
import org.elasticsearch.node.internal.InternalSettingsPreparer;
2727
import org.elasticsearch.plugins.Plugin;
2828
import org.elasticsearch.transport.Netty4Plugin;
2929
import org.slf4j.Logger;

src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,14 @@
1515
*/
1616
package org.springframework.data.elasticsearch.core;
1717

18-
import static org.hamcrest.Matchers.*;
19-
import static org.junit.Assert.*;
20-
import static org.mockito.Mockito.*;
21-
22-
import lombok.Getter;
23-
import lombok.NoArgsConstructor;
24-
2518
import java.util.Arrays;
2619
import java.util.Collections;
2720
import java.util.HashMap;
2821
import java.util.Iterator;
2922
import java.util.Map;
30-
23+
import com.fasterxml.jackson.databind.util.ArrayIterator;
24+
import lombok.Getter;
25+
import lombok.NoArgsConstructor;
3126
import org.elasticsearch.action.get.GetResponse;
3227
import org.elasticsearch.action.search.SearchResponse;
3328
import org.elasticsearch.search.SearchHit;
@@ -36,7 +31,6 @@
3631
import org.elasticsearch.search.aggregations.Aggregation;
3732
import org.elasticsearch.search.aggregations.Aggregations;
3833
import org.elasticsearch.search.aggregations.bucket.terms.Terms;
39-
import org.elasticsearch.search.internal.InternalSearchHitField;
4034
import org.junit.Before;
4135
import org.junit.Test;
4236
import org.mockito.Mock;
@@ -47,8 +41,9 @@
4741
import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
4842
import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
4943
import org.springframework.data.elasticsearch.entities.Car;
50-
51-
import com.fasterxml.jackson.databind.util.ArrayIterator;
44+
import static org.hamcrest.Matchers.*;
45+
import static org.junit.Assert.*;
46+
import static org.mockito.Mockito.*;
5247

5348
/**
5449
* @author Artur Konczak
@@ -190,8 +185,8 @@ private String createJsonCar(String name, String model) {
190185

191186
private Map<String, SearchHitField> createCarFields(String name, String model) {
192187
Map<String, SearchHitField> result = new HashMap<>();
193-
result.put("name", new InternalSearchHitField("name", Arrays.<Object>asList(name)));
194-
result.put("model", new InternalSearchHitField("model", Arrays.<Object>asList(model)));
188+
result.put("name", new SearchHitField("name", Arrays.asList(name)));
189+
result.put("model", new SearchHitField("model", Arrays.asList(model)));
195190
return result;
196191
}
197192

src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,23 @@
2222
description=Lucene expressions integration for Elasticsearch
2323
#
2424
# 'version': plugin's version
25-
version=5.2.1
25+
version=5.4.0
2626
#
2727
# 'name': the plugin name
2828
name=lang-expression
2929
#
3030
# 'classname': the name of the class to load, fully-qualified.
3131
classname=org.elasticsearch.script.expression.ExpressionPlugin
3232
#
33-
# 'java.version' version of java the code is built against
33+
# 'java.version': version of java the code is built against
3434
# use the system property java.specification.version
3535
# version string must be a sequence of nonnegative decimal integers
3636
# separated by "."'s and may have leading zeros
3737
java.version=1.8
3838
#
39-
# 'elasticsearch.version' version of elasticsearch compiled against
40-
elasticsearch.version=5.2.1
39+
# 'elasticsearch.version': version of elasticsearch compiled against
40+
elasticsearch.version=5.4.0
41+
### optional elements for plugins:
42+
#
43+
# 'has.native.controller': whether or not the plugin has a native controller
44+
has.native.controller=false
Binary file not shown.
Binary file not shown.

src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,23 @@
2222
description=Groovy scripting integration for Elasticsearch
2323
#
2424
# 'version': plugin's version
25-
version=5.2.1
25+
version=5.4.0
2626
#
2727
# 'name': the plugin name
2828
name=lang-groovy
2929
#
3030
# 'classname': the name of the class to load, fully-qualified.
3131
classname=org.elasticsearch.script.groovy.GroovyPlugin
3232
#
33-
# 'java.version' version of java the code is built against
33+
# 'java.version': version of java the code is built against
3434
# use the system property java.specification.version
3535
# version string must be a sequence of nonnegative decimal integers
3636
# separated by "."'s and may have leading zeros
3737
java.version=1.8
3838
#
39-
# 'elasticsearch.version' version of elasticsearch compiled against
40-
elasticsearch.version=5.2.1
39+
# 'elasticsearch.version': version of elasticsearch compiled against
40+
elasticsearch.version=5.4.0
41+
### optional elements for plugins:
42+
#
43+
# 'has.native.controller': whether or not the plugin has a native controller
44+
has.native.controller=false

src/test/resources/test-home-dir/modules/lang-groovy/plugin-security.policy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ grant {
3131

3232
// Standard set of classes
3333
permission org.elasticsearch.script.ClassPermission "<<STANDARD>>";
34-
// groovy runtime
34+
// groovy runtime (TODO: clean these up if possible)
3535
permission org.elasticsearch.script.ClassPermission "groovy.grape.GrabAnnotationTransformation";
3636
permission org.elasticsearch.script.ClassPermission "groovy.lang.Binding";
3737
permission org.elasticsearch.script.ClassPermission "groovy.lang.GroovyObject";

0 commit comments

Comments
 (0)