[lucene-solr] branch branch_8x updated: Backport of Java 11 change (LUCENE-8738): Add missing dependency for Maven build

[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 3881b6d  Backport of Java 11 change (LUCENE-8738): Add missing dependency for Maven build
3881b6d is described below

commit 3881b6df623bdce551d5c8befd366982c855c964
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Sat Apr 20 00:54:13 2019 +0200

    Backport of Java 11 change (LUCENE-8738): Add missing dependency for Maven build
---
 lucene/common-build.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 5eab776..ca9e0b4 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -2397,8 +2397,12 @@ ${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">
-    <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-ant" revision="2.5.6"
-      inline="true" conf="default" type="jar" transitive="true" pathid="groovy.classpath"/>
+    <property name="groovy.version" value="2.5.6"/>
+    <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>
     <taskdef name="groovy"
       classname="org.codehaus.groovy.ant.Groovy"
       classpathref="groovy.classpath"/>
@@ -2475,7 +2479,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
 
   <target name="resolve-markdown" unless="markdown.loaded" depends="resolve-groovy">
     <property name="flexmark.version" value="0.16.1"/>
-    <ivy:cachepath transitive="true" pathid="markdown.classpath">
+    <ivy:cachepath transitive="true" resolveId="flexmark" pathid="markdown.classpath">
       <ivy:dependency org="com.vladsch.flexmark" name="flexmark" rev="${flexmark.version}" conf="default" />
       <ivy:dependency org="com.vladsch.flexmark" name="flexmark-ext-autolink" rev="${flexmark.version}" conf="default" />
       <ivy:dependency org="com.vladsch.flexmark" name="flexmark-ext-abbreviation" rev="${flexmark.version}" conf="default" />