svn commit: r1378396 - /lucene/dev/trunk/lucene/queryparser/build.xml

[us...@apache.org]

Author: uschindler
Date: Wed Aug 29 00:16:55 2012
New Revision: 1378396

URL: http://svn.apache.org/viewvc?rev=1378396&view=rev
Log:
LUCENE-4336: Finally I found a solution with IVY patterns. Sorry for repeated commits.

Modified:
    lucene/dev/trunk/lucene/queryparser/build.xml

Modified: lucene/dev/trunk/lucene/queryparser/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/build.xml?rev=1378396&r1=1378395&r2=1378396&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/build.xml (original)
+++ lucene/dev/trunk/lucene/queryparser/build.xml Wed Aug 29 00:16:55 2012
@@ -123,16 +123,11 @@ import org.apache.lucene.queryparser.fle
                              byline="true"/>
   </target>
 
-  <target name="resolve-javacc">
-    <!-- setup a "fake" JavaCC distribution folder in ${build.dir} to make javacc task happy: -->
-    <mkdir dir="${build.dir}/javacc/bin/lib" />
-    <ivy:cachefileset xmlns:ivy="antlib:org.apache.ivy.ant" organisation="net.java.dev.javacc" module="javacc" revision="5.0"
-      inline="true" conf="default" transitive="false" type="jar" setid="javacc.files"/>
-    <copy todir="${build.dir}/javacc/bin/lib">
-      <fileset refid="javacc.files"/>
-      <!-- file must be named: javacc.jar, otherwise task will not find it... -->
-      <mergemapper to="javacc.jar"/>
-    </copy>
+  <target name="resolve-javacc" xmlns:ivy="antlib:org.apache.ivy.ant">
+    <!-- setup a "fake" JavaCC distribution folder in ${build.dir} to make JavaCC ANT task happy: -->
+    <ivy:retrieve organisation="net.java.dev.javacc" module="javacc" revision="5.0"
+      inline="true" conf="default" transitive="false" type="jar" sync="true"
+      pattern="${build.dir}/javacc/bin/lib/[artifact].[ext]"/>
   </target>
 
   <macrodef name="invoke-javacc">