From d15c92db595b65d5c6d1a53efcfc4b5ab5ab2e0c Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Fri, 11 Jun 2010 18:04:17 +0000
Subject: [PATCH] Build failure on JDK 1.4.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@953801 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index fb5770317..986c4b2d8 100644
--- a/build.xml
+++ b/build.xml
@@ -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"/>