roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r559522 - in /roller/trunk: apps/weblogger/build.xml tools/buildtime/ant-1.7.0/ant-junit.jar tools/buildtime/junit-anttask.jar
Date Wed, 25 Jul 2007 17:03:53 GMT
Author: snoopdave
Date: Wed Jul 25 10:03:52 2007
New Revision: 559522

URL: http://svn.apache.org/viewvc?view=rev&rev=559522
Log:
Fixing ROL-1494, Build fails on systems with different JUnit version in ant/lib

Added:
    roller/trunk/tools/buildtime/junit-anttask.jar   (with props)
Removed:
    roller/trunk/tools/buildtime/ant-1.7.0/ant-junit.jar
Modified:
    roller/trunk/apps/weblogger/build.xml

Modified: roller/trunk/apps/weblogger/build.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/build.xml?view=diff&rev=559522&r1=559521&r2=559522
==============================================================================
--- roller/trunk/apps/weblogger/build.xml (original)
+++ roller/trunk/apps/weblogger/build.xml Wed Jul 25 10:03:52 2007
@@ -47,12 +47,14 @@
     <available file="./build/webapp/WEB-INF/dbscripts/derby/createdb.sql" 
         property="dbscripts-exist" />
     
-    <!-- Ensure JUnit is defined even if not installed in Ant.
-         We need a version of JUnitTask that doesn't load junit from ant/lib.
-    <taskdef name="junit" 
-        classpath="${ro.tools}/buildtime/junit-4.1.jar"
-        classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" /> 
-    -->
+    <!-- Use Java.net JUnit-AntTask to work around problem in default Ant task,
+         see here for details: https://junit-anttask.dev.java.net/ -->
+    <taskdef name="junit2" classname="com.sun.ant.junit.JUnitTask">
+      <classpath>
+        <pathelement path="${ro.tools}/buildtime/junit-anttask.jar" />
+        <pathelement path="${ro.tools}/buildtime/junit-4.1.jar" />
+      </classpath>
+    </taskdef>
         
        
     <target name="usage" description="Print usage for key targets">

Added: roller/trunk/tools/buildtime/junit-anttask.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/buildtime/junit-anttask.jar?view=auto&rev=559522
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/buildtime/junit-anttask.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message