Author: cutting
Date: Thu Sep 24 21:46:21 2009
New Revision: 818639
URL: http://svn.apache.org/viewvc?rev=818639&view=rev
Log:
AVRO-122. Fix so that, when multiple Ant targets are specified on the command
line that depend on Ivy, Ivy does not fail. Contributed by phunt.
Modified:
hadoop/avro/trunk/CHANGES.txt
hadoop/avro/trunk/build.xml
Modified: hadoop/avro/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/avro/trunk/CHANGES.txt?rev=818639&r1=818638&r2=818639&view=diff
==============================================================================
--- hadoop/avro/trunk/CHANGES.txt (original)
+++ hadoop/avro/trunk/CHANGES.txt Thu Sep 24 21:46:21 2009
@@ -39,6 +39,10 @@
AVRO-117. Fix memory leak in C++ JSON parser.
(Scott Banachowski via cutting)
+ AVRO-122. Fix so that, when multiple Ant targets are specified on
+ the command line that depend on ivy, ivy does not fail. (phunt
+ via cutting)
+
Avro 1.1.0 (8 September 2009)
INCOMPATIBLE CHANGES
Modified: hadoop/avro/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/avro/trunk/build.xml?rev=818639&r1=818638&r2=818639&view=diff
==============================================================================
--- hadoop/avro/trunk/build.xml (original)
+++ hadoop/avro/trunk/build.xml Thu Sep 24 21:46:21 2009
@@ -133,9 +133,11 @@
dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
</target>
- <target name="ivy-init" depends="ivy-download">
+ <target name="ivy-init" depends="ivy-download" unless="ivy.initialized">
<taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant" classpathref="java.classpath"/>
+ <!-- ensure that ivy taskdef is only run once, otw ant will error -->
+ <property name="ivy.initialized" value="true"/>
</target>
<target name="ivy-retrieve" depends="init,ivy-init">
