diff --git a/docs/manual/OptionalTasks/junit.html b/docs/manual/OptionalTasks/junit.html index 3d6d2a4c4..9f54e833e 100644 --- a/docs/manual/OptionalTasks/junit.html +++ b/docs/manual/OptionalTasks/junit.html @@ -11,7 +11,7 @@

This task runs tests from the JUnit testing framework. The latest version of the framework can be found at http://www.junit.org. -This task has been tested with JUnit 3.0 up to JUnit 3.8.1; it won't +This task has been tested with JUnit 3.0 up to JUnit 3.8.2; it won't work with versions prior to JUnit 3.0. It also works with JUnit 4.0, including "pure" JUnit 4 tests using only annotations and no JUnit4TestAdapter.

Note: This task depends on external libraries not included diff --git a/docs/manual/tutorial-HelloWorldWithAnt.html b/docs/manual/tutorial-HelloWorldWithAnt.html index 999e86bf3..a7b1b11e3 100644 --- a/docs/manual/tutorial-HelloWorldWithAnt.html +++ b/docs/manual/tutorial-HelloWorldWithAnt.html @@ -383,7 +383,7 @@ start the application from that directory and these files will included into the

Testing the class

In this step we will introduce the usage of the JUnit [3] testframework in combination with Ant. Because Ant -has a build-in JUnit 3.8.1 you could start directly using it. Write a test class in src\HelloWorldTest.java:

+has a built-in JUnit 3.8.2 you could start directly using it. Write a test class in src\HelloWorldTest.java:

 public class HelloWorldTest extends junit.framework.TestCase {
@@ -506,4 +506,4 @@ need the HTML report just for testing, e.g. if you are fixing an error or a inte
 

Copyright © 2005-2006 The Apache Software Foundation. All rights Reserved.

- \ No newline at end of file + diff --git a/lib/libraries.properties b/lib/libraries.properties index d5ee4f409..16b3355d4 100644 --- a/lib/libraries.properties +++ b/lib/libraries.properties @@ -24,7 +24,7 @@ commons-logging.version=1.0.4 commons-logging-api.version=${commons-logging.version} jdepend.version=2.7 jruby.version=0.8.3 -junit.version=3.8.1 +junit.version=3.8.2 jsch.version=0.1.25 jython.version=2.1 log4j.version=1.2.13 diff --git a/lib/optional/README b/lib/optional/README index 4db6a4753..eed126783 100644 --- a/lib/optional/README +++ b/lib/optional/README @@ -1,3 +1,3 @@ -The file junit-3.8.1.jar is version 3.8.1 of JUnit, see the file LICENSE.junit +The file junit-3.8.2.jar is version 3.8.2 of JUnit, see the file LICENSE.junit for the terms of distribution. For more information about JUnit or the latest release, see . diff --git a/lib/optional/junit-3.8.1.jar b/lib/optional/junit-3.8.1.jar deleted file mode 100644 index 674d71e89..000000000 Binary files a/lib/optional/junit-3.8.1.jar and /dev/null differ diff --git a/lib/optional/junit-3.8.2.jar b/lib/optional/junit-3.8.2.jar new file mode 100644 index 000000000..c8f711d05 Binary files /dev/null and b/lib/optional/junit-3.8.2.jar differ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 01f117f2f..39383ded7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -303,7 +303,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR // 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. + // will help if CP has junit-3.8.2.jar:junit-4.0.jar. // In that case first C.fN will fail with CNFE and we // will avoid UnsupportedClassVersionError.