ZOOKEEPER-535. ivy task does not enjoy being defined twice (build error) (phunt via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@818584 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -73,6 +73,9 @@ BUGFIXES:
 
   ZOOKEEPER-533.  ant error running clean twice (phunt via mahadev)
 
+  ZOOKEEPER-535. ivy task does not enjoy being defined twice 
+  (build error) (phunt via mahadev)
+
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
   "socket reuse" and failure to close client (phunt via mahadev)

build.xml

@@ -269,9 +269,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">
@@ -1044,6 +1046,9 @@
     	</exec>
      </target>
 
+     <!-- this target runs the hudson trunk build -->
+     <target name="hudson-test-trunk" depends="docs,tar,findbugs"/>
+
      <target name="api-xml" depends="ivy-retrieve-jdiff, javadoc, write-null">
        <javadoc>
          <doclet name="jdiff.JDiff"