ZOOKEEPER-637. Trunk build is failing - second patch (breed via fpj)

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

CHANGES.txt

@@ -191,6 +191,8 @@ BUGFIXES:
   cause problems in leader election if data gets corrupted. (mahadev)
 
   ZOOKEEPER-637. Trunk build is failing (fpj via breed)
+  
+  ZOOKEEPER-637. Trunk build is failing - second patch (breed via fpj)
 
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to

build.xml

@@ -275,12 +275,14 @@
            dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
     </target>
 
-    <target name="ivy-init" depends="ivy-download" unless="ivy.initialized">
+    <target name="ivy-taskdef" 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 -->
-      <!-- we need to make sure ivy:settings is run. the initialized flag seems to break it -->
-      <!-- <property name="ivy.initialized" value="true"/> -->
+      <property name="ivy.initialized" value="true"/> 
+    </target>
+
+    <target name="ivy-init" depends="ivy-download,ivy-taskdef">
       <ivy:settings id="${ant.project.name}" file="${ivysettings.xml}"/>
     </target>