Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 58211 invoked from network); 1 Mar 2006 19:13:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Mar 2006 19:13:41 -0000 Received: (qmail 84479 invoked by uid 500); 1 Mar 2006 19:14:26 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 84441 invoked by uid 500); 1 Mar 2006 19:14:26 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 84423 invoked by uid 500); 1 Mar 2006 19:14:26 -0000 Received: (qmail 84420 invoked by uid 99); 1 Mar 2006 19:14:25 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Mar 2006 11:14:25 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 01 Mar 2006 11:14:25 -0800 Received: (qmail 57991 invoked by uid 65534); 1 Mar 2006 19:13:17 -0000 Message-ID: <20060301191317.57989.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r382127 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java Date: Wed, 01 Mar 2006 19:13:17 -0000 To: ant-cvs@apache.org From: jglick@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jglick Date: Wed Mar 1 11:13:16 2006 New Revision: 382127 URL: http://svn.apache.org/viewcvs?rev=382127&view=rev Log: Tweak: in case junit-3.8.1.jar and junit-4.0.jar are on CP but in that order, and running JDK 1.4-, at least run JUnit 3.x tests. Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java?rev=382127&r1=382126&r2=382127&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java Wed Mar 1 11:13:16 2006 @@ -266,8 +266,12 @@ try { Class junit4TestAdapterClass = null; - // Note that checking for JDK 5 directly won't work; under JDK 4, this will already have failed. + // Check for JDK 5 first. Will *not* help on JDK 1.4 if only junit-4.0.jar in + // CP because in that case linkage of whole task will already have + // failed! But will help if CP has junit-3.8.1.jar:junit-4.0.jar. + // In that case first C.fN will fail with CNFE and we will avoid UnsupportedClassVersionError. try { + Class.forName("java.lang.annotation.Annotation"); if (loader == null) { junit4TestAdapterClass = Class.forName("junit.framework.JUnit4TestAdapter"); } else { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org