Skip to content

Commit f569b03

Browse files
committed
DATAES-262 - Upgrade elasticsearch to 2.3.3
1 parent 99a401f commit f569b03

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<commonscollections>3.2.1</commonscollections>
2525
<commonslang>2.6</commonslang>
26-
<elasticsearch>2.2.0</elasticsearch>
26+
<elasticsearch>2.3.3</elasticsearch>
2727
<springdata.commons>1.13.0.BUILD-SNAPSHOT</springdata.commons>
2828

2929
</properties>
Binary file not shown.
Binary file not shown.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
description=Groovy scripting integration for Elasticsearch
3535
#
3636
# 'version': plugin's version
37-
version=2.2.0
37+
version=2.3.3
3838
#
3939
# 'name': the plugin name
4040
name=lang-groovy
@@ -68,7 +68,7 @@ java.version=1.7
6868
# elasticsearch release. This version is checked when the plugin
6969
# is loaded so Elasticsearch will refuse to start in the presence of
7070
# plugins with the incorrect elasticsearch.version.
71-
elasticsearch.version=2.2.0
71+
elasticsearch.version=2.3.3
7272
#
7373
### deprecated elements for jvm plugins :
7474
#

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@ grant {
2424
permission java.lang.RuntimePermission "getClassLoader";
2525
// needed by groovy engine
2626
permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect";
27-
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
2827
// needed by GroovyScriptEngineService to close its classloader (why?)
2928
permission java.lang.RuntimePermission "closeClassLoader";
3029
// Allow executing groovy scripts with codesource of /untrusted
3130
permission groovy.security.GroovyCodeSourcePermission "/untrusted";
3231

3332
// Standard set of classes
3433
permission org.elasticsearch.script.ClassPermission "<<STANDARD>>";
35-
// groovy runtime
34+
// groovy runtime (TODO: clean these up if possible)
3635
permission org.elasticsearch.script.ClassPermission "groovy.grape.GrabAnnotationTransformation";
3736
permission org.elasticsearch.script.ClassPermission "groovy.json.JsonOutput";
3837
permission org.elasticsearch.script.ClassPermission "groovy.lang.Binding";
@@ -49,9 +48,11 @@ grant {
4948
permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation";
5049
permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.vmplugin.v7.IndyInterface";
5150
permission org.elasticsearch.script.ClassPermission "sun.reflect.ConstructorAccessorImpl";
51+
permission org.elasticsearch.script.ClassPermission "sun.reflect.MethodAccessorImpl";
5252

5353
permission org.elasticsearch.script.ClassPermission "groovy.lang.Closure";
5454
permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.runtime.GeneratedClosure";
5555
permission org.elasticsearch.script.ClassPermission "groovy.lang.MetaClass";
5656
permission org.elasticsearch.script.ClassPermission "groovy.lang.Range";
57+
permission org.elasticsearch.script.ClassPermission "groovy.lang.Reference";
5758
};

template.mf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Import-Template:
1010
javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,
1111
org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}",
1212
com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional,
13-
org.elasticsearch.*;version="${elasticsearch:[=.=.=,2.2.0)}",
14-
org.apache.lucene.*;version="5.4.1",
13+
org.elasticsearch.*;version="${elasticsearch:[=.=.=,2.3.3)}",
14+
org.apache.lucene.*;version="5.5.0",
1515
org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}",
1616
org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
1717
org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}",

0 commit comments

Comments
 (0)