Kaynağa Gözat

Upgrade groovy dependency in lang-groovy module to version 2.4.6

Closes #16830
Yannick Welsch 9 yıl önce
ebeveyn
işleme
af918ebf2b

+ 3 - 0
core/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy

@@ -25,6 +25,9 @@ grant {
   
   // groovy IndyInterface bootstrap requires this property for indy logging
   permission java.util.PropertyPermission "groovy.indy.logging", "read";
+  // groovy requires this to enable workaround for certain JVMs (https://github.com/apache/groovy/pull/137)
+  permission java.util.PropertyPermission "java.vm.name", "read";
+  permission java.util.PropertyPermission "groovy.use.classvalue", "read";
   
   // needed by Rhino engine exception handling
   permission java.util.PropertyPermission "rhino.stack.style", "read";

+ 1 - 1
modules/lang-groovy/build.gradle

@@ -23,7 +23,7 @@ esplugin {
 }
 
 dependencies {
-  compile 'org.codehaus.groovy:groovy:2.4.4:indy'
+  compile 'org.codehaus.groovy:groovy:2.4.6:indy'
 }
 
 integTest {

+ 0 - 1
modules/lang-groovy/licenses/groovy-2.4.4-indy.jar.sha1

@@ -1 +0,0 @@
-139af316ac35534120c53f05393ce46d60d6da48

+ 1 - 0
modules/lang-groovy/licenses/groovy-2.4.6-indy.jar.sha1

@@ -0,0 +1 @@
+af78e80fab591a6dcf2d6ccb8bf34d1e888291be

+ 3 - 3
modules/lang-groovy/licenses/groovy-NOTICE.txt

@@ -1,5 +1,5 @@
-Apache Commons CLI
-Copyright 2001-2009 The Apache Software Foundation
+Apache Groovy
+Copyright 2003-2016 The Apache Software Foundation
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).