ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgl...@apache.org
Subject svn commit: r953801 - /ant/core/trunk/build.xml
Date Fri, 11 Jun 2010 18:04:17 GMT
Author: jglick
Date: Fri Jun 11 18:04:17 2010
New Revision: 953801

URL: http://svn.apache.org/viewvc?rev=953801&view=rev
Log:
Build failure on JDK 1.4.

Modified:
    ant/core/trunk/build.xml

Modified: ant/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=953801&r1=953800&r2=953801&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Fri Jun 11 18:04:17 2010
@@ -349,9 +349,16 @@
     <available property="recent.xalan2.present"
       classname="org.apache.xalan.trace.TraceListenerEx3"
       classpathref="classpath" ignoresystemclasses="true"/>
-    <available property="junit.present"
-      classname="org.junit.Test"
-      classpathref="classpath" ignoresystemclasses="true"/>
+    <condition property="junit.present">
+      <and>
+        <!-- Need JDK 5+ to compile since junit-4*.jar uses new bytecode format -->
+        <!-- (could also try to compile all but JUnit4TestMethodAdapter but you would
need to add junit-3*.jar to CP yourself) -->
+        <available classname="java.net.Proxy"/>
+        <available
+          classname="org.junit.Test"
+          classpathref="classpath" ignoresystemclasses="true"/>
+      </and>
+    </condition>
     <available property="antunit.present"
       classname="org.apache.ant.antunit.AntUnit"
       classpathref="classpath" ignoresystemclasses="true"/>



Mime
View raw message