diff --git a/pom.xml b/pom.xml index 23cf15a6f..aff0fa7dc 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 3.2.1 2.6 - 5.2.1 + 5.4.0 2.0.0.BUILD-SNAPSHOT diff --git a/src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java b/src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java index b17c748f5..717e2895a 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java @@ -22,8 +22,8 @@ import org.apache.commons.lang.StringUtils; import org.elasticsearch.client.Client; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.node.InternalSettingsPreparer; import org.elasticsearch.node.Node; -import org.elasticsearch.node.internal.InternalSettingsPreparer; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.transport.Netty4Plugin; import org.slf4j.Logger; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java b/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java index 907837b37..4a488f7b3 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java @@ -15,19 +15,14 @@ */ package org.springframework.data.elasticsearch.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; - -import lombok.Getter; -import lombok.NoArgsConstructor; - import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.Map; - +import com.fasterxml.jackson.databind.util.ArrayIterator; +import lombok.Getter; +import lombok.NoArgsConstructor; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.SearchHit; @@ -36,7 +31,6 @@ import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.search.internal.InternalSearchHitField; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -47,8 +41,9 @@ import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage; import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext; import org.springframework.data.elasticsearch.entities.Car; - -import com.fasterxml.jackson.databind.util.ArrayIterator; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; /** * @author Artur Konczak @@ -190,8 +185,8 @@ public class DefaultResultMapperTests { private Map createCarFields(String name, String model) { Map result = new HashMap<>(); - result.put("name", new InternalSearchHitField("name", Arrays.asList(name))); - result.put("model", new InternalSearchHitField("model", Arrays.asList(model))); + result.put("name", new SearchHitField("name", Arrays.asList(name))); + result.put("model", new SearchHitField("model", Arrays.asList(model))); return result; } diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-5.2.1.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-5.4.0.jar similarity index 89% rename from src/test/resources/test-home-dir/modules/lang-expression/lang-expression-5.2.1.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-5.4.0.jar index 9884824cc..ade3e7cd7 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-5.2.1.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-5.4.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-6.4.1.jar b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-6.5.0.jar similarity index 90% rename from src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-6.4.1.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-6.5.0.jar index b2b9baa99..f553e11e9 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-6.4.1.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-6.5.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 d505e56dc..6be681775 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 @@ -22,7 +22,7 @@ description=Lucene expressions integration for Elasticsearch # # 'version': plugin's version -version=5.2.1 +version=5.4.0 # # 'name': the plugin name name=lang-expression @@ -30,11 +30,15 @@ name=lang-expression # 'classname': the name of the class to load, fully-qualified. classname=org.elasticsearch.script.expression.ExpressionPlugin # -# 'java.version' version of java the code is built against +# 'java.version': version of java the code is built against # use the system property java.specification.version # version string must be a sequence of nonnegative decimal integers # separated by "."'s and may have leading zeros java.version=1.8 # -# 'elasticsearch.version' version of elasticsearch compiled against -elasticsearch.version=5.2.1 +# 'elasticsearch.version': version of elasticsearch compiled against +elasticsearch.version=5.4.0 +### optional elements for 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/lang-groovy/lang-groovy-5.2.1.jar b/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-5.2.1.jar deleted file mode 100644 index 8968d5a8f..000000000 Binary files a/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-5.2.1.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-5.4.0.jar b/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-5.4.0.jar new file mode 100644 index 000000000..85c7fd596 Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-5.4.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties index 9d6390c19..c3a5a276f 100644 --- a/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties @@ -22,7 +22,7 @@ description=Groovy scripting integration for Elasticsearch # # 'version': plugin's version -version=5.2.1 +version=5.4.0 # # 'name': the plugin name name=lang-groovy @@ -30,11 +30,15 @@ name=lang-groovy # 'classname': the name of the class to load, fully-qualified. classname=org.elasticsearch.script.groovy.GroovyPlugin # -# 'java.version' version of java the code is built against +# 'java.version': version of java the code is built against # use the system property java.specification.version # version string must be a sequence of nonnegative decimal integers # separated by "."'s and may have leading zeros java.version=1.8 # -# 'elasticsearch.version' version of elasticsearch compiled against -elasticsearch.version=5.2.1 +# 'elasticsearch.version': version of elasticsearch compiled against +elasticsearch.version=5.4.0 +### optional elements for 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/lang-groovy/plugin-security.policy b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-security.policy index f7d1eea41..13d00d6d1 100644 --- a/src/test/resources/test-home-dir/modules/lang-groovy/plugin-security.policy +++ b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-security.policy @@ -31,7 +31,7 @@ grant { // Standard set of classes permission org.elasticsearch.script.ClassPermission "<>"; - // groovy runtime + // groovy runtime (TODO: clean these up if possible) permission org.elasticsearch.script.ClassPermission "groovy.grape.GrabAnnotationTransformation"; permission org.elasticsearch.script.ClassPermission "groovy.lang.Binding"; permission org.elasticsearch.script.ClassPermission "groovy.lang.GroovyObject";