You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2019/04/19 22:52:11 UTC
[lucene-solr] branch master updated: LUCENE-8738: Add missing
dependency for Maven build
This is an automated email from the ASF dual-hosted git repository.
uschindler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 77e1bec LUCENE-8738: Add missing dependency for Maven build
77e1bec is described below
commit 77e1bec7dcc4641457dc161ddf5c55d73c85fb78
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Sat Apr 20 00:51:55 2019 +0200
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 53ecf41..14f590e 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -2311,8 +2311,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"/>
@@ -2389,7 +2393,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" />