hadoop-zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r818584 - in /hadoop/zookeeper/trunk: CHANGES.txt build.xml
Date Thu, 24 Sep 2009 18:50:38 GMT
Author: mahadev
Date: Thu Sep 24 18:50:23 2009
New Revision: 818584

URL: http://svn.apache.org/viewvc?rev=818584&view=rev
Log:
ZOOKEEPER-535. ivy task does not enjoy being defined twice (build error) (phunt via mahadev)

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    hadoop/zookeeper/trunk/build.xml

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=818584&r1=818583&r2=818584&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Thu Sep 24 18:50:23 2009
@@ -73,6 +73,9 @@
 
   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)

Modified: hadoop/zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=818584&r1=818583&r2=818584&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/build.xml (original)
+++ hadoop/zookeeper/trunk/build.xml Thu Sep 24 18:50:23 2009
@@ -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"



Mime
View raw message