DATAES-262 - Upgrade elasticsearch to 2.3.3

This commit is contained in:
Artur Konczak 2016-06-14 15:51:07 +01:00
parent 99a401fdff
commit f569b0348a
7 changed files with 8 additions and 7 deletions

View File

@ -23,7 +23,7 @@
<commonscollections>3.2.1</commonscollections> <commonscollections>3.2.1</commonscollections>
<commonslang>2.6</commonslang> <commonslang>2.6</commonslang>
<elasticsearch>2.2.0</elasticsearch> <elasticsearch>2.3.3</elasticsearch>
<springdata.commons>1.13.0.BUILD-SNAPSHOT</springdata.commons> <springdata.commons>1.13.0.BUILD-SNAPSHOT</springdata.commons>
</properties> </properties>

View File

@ -34,7 +34,7 @@
description=Groovy scripting integration for Elasticsearch description=Groovy scripting integration for Elasticsearch
# #
# 'version': plugin's version # 'version': plugin's version
version=2.2.0 version=2.3.3
# #
# 'name': the plugin name # 'name': the plugin name
name=lang-groovy name=lang-groovy
@ -68,7 +68,7 @@ java.version=1.7
# elasticsearch release. This version is checked when the plugin # elasticsearch release. This version is checked when the plugin
# is loaded so Elasticsearch will refuse to start in the presence of # is loaded so Elasticsearch will refuse to start in the presence of
# plugins with the incorrect elasticsearch.version. # plugins with the incorrect elasticsearch.version.
elasticsearch.version=2.2.0 elasticsearch.version=2.3.3
# #
### deprecated elements for jvm plugins : ### deprecated elements for jvm plugins :
# #

View File

@ -24,7 +24,6 @@ grant {
permission java.lang.RuntimePermission "getClassLoader"; permission java.lang.RuntimePermission "getClassLoader";
// needed by groovy engine // needed by groovy engine
permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect"; permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect";
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
// needed by GroovyScriptEngineService to close its classloader (why?) // needed by GroovyScriptEngineService to close its classloader (why?)
permission java.lang.RuntimePermission "closeClassLoader"; permission java.lang.RuntimePermission "closeClassLoader";
// Allow executing groovy scripts with codesource of /untrusted // Allow executing groovy scripts with codesource of /untrusted
@ -32,7 +31,7 @@ grant {
// Standard set of classes // Standard set of classes
permission org.elasticsearch.script.ClassPermission "<<STANDARD>>"; permission org.elasticsearch.script.ClassPermission "<<STANDARD>>";
// groovy runtime // groovy runtime (TODO: clean these up if possible)
permission org.elasticsearch.script.ClassPermission "groovy.grape.GrabAnnotationTransformation"; permission org.elasticsearch.script.ClassPermission "groovy.grape.GrabAnnotationTransformation";
permission org.elasticsearch.script.ClassPermission "groovy.json.JsonOutput"; permission org.elasticsearch.script.ClassPermission "groovy.json.JsonOutput";
permission org.elasticsearch.script.ClassPermission "groovy.lang.Binding"; permission org.elasticsearch.script.ClassPermission "groovy.lang.Binding";
@ -49,9 +48,11 @@ grant {
permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation"; permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation";
permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.vmplugin.v7.IndyInterface"; permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.vmplugin.v7.IndyInterface";
permission org.elasticsearch.script.ClassPermission "sun.reflect.ConstructorAccessorImpl"; permission org.elasticsearch.script.ClassPermission "sun.reflect.ConstructorAccessorImpl";
permission org.elasticsearch.script.ClassPermission "sun.reflect.MethodAccessorImpl";
permission org.elasticsearch.script.ClassPermission "groovy.lang.Closure"; permission org.elasticsearch.script.ClassPermission "groovy.lang.Closure";
permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.runtime.GeneratedClosure"; permission org.elasticsearch.script.ClassPermission "org.codehaus.groovy.runtime.GeneratedClosure";
permission org.elasticsearch.script.ClassPermission "groovy.lang.MetaClass"; permission org.elasticsearch.script.ClassPermission "groovy.lang.MetaClass";
permission org.elasticsearch.script.ClassPermission "groovy.lang.Range"; permission org.elasticsearch.script.ClassPermission "groovy.lang.Range";
permission org.elasticsearch.script.ClassPermission "groovy.lang.Reference";
}; };

View File

@ -10,8 +10,8 @@ Import-Template:
javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional, javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,
org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}", org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}",
com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional, com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional,
org.elasticsearch.*;version="${elasticsearch:[=.=.=,2.2.0)}", org.elasticsearch.*;version="${elasticsearch:[=.=.=,2.3.3)}",
org.apache.lucene.*;version="5.4.1", org.apache.lucene.*;version="5.5.0",
org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}", org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}",
org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}", org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}", org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}",