[lucene-solr] branch branch_8x updated: Revert previous change to use separate Groovy artifacts: Use groovy-all again (bugs in ivy)

[us...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

uschindler pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new 7eb59f2  Revert previous change to use separate Groovy artifacts: Use groovy-all again (bugs in ivy)
7eb59f2 is described below

commit 7eb59f2ae0d7bdcbca6df5560fa1b59c17ea4624
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Sat Apr 20 10:51:05 2019 +0200

    Revert previous change to use separate Groovy artifacts: Use groovy-all again (bugs in ivy)
---
 lucene/common-build.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index b085cf8..e4b8587 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -2397,12 +2397,8 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
 
   <!-- GROOVY scripting engine for ANT tasks -->
   <target name="resolve-groovy" unless="groovy.loaded" depends="ivy-availability-check,ivy-configure">
-    <property name="groovy.version" value="2.4.16"/>
-    <ivy:cachepath transitive="true" resolveId="groovy" pathid="groovy.classpath">
-      <ivy:dependency org="org.codehaus.groovy" name="groovy" rev="${groovy.version}" conf="default" />
-      <ivy:dependency org="org.codehaus.groovy" name="groovy-ant" rev="${groovy.version}" conf="default" />
-      <ivy:dependency org="org.codehaus.groovy" name="groovy-xml" rev="${groovy.version}" conf="default" />
-    </ivy:cachepath>
+    <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.4.16"
+      inline="true" conf="default" type="jar" transitive="true" pathid="groovy.classpath"/>
     <taskdef name="groovy"
       classname="org.codehaus.groovy.ant.Groovy"
       classpathref="groovy.classpath"/>