This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
commit 81aee9ec90a14f35c54acb54299e2e23a2749423
Merge: 362f5f0 4ae9d1c
Author: Stefan Bodewig <stefan.bode...@innoq.com>
AuthorDate: Tue Oct 13 19:32:05 2020 +0200
Merge branch '1.9.x'
lib/libraries.properties | 2 +-
manual/tutorial-HelloWorldWithAnt.html | 2 +-
src/etc/poms/ant-junit/pom.xml | 2 +-
src/etc/poms/ant-junit4/pom.xml | 2 +-
src/etc/poms/ant-testutil/pom.xml | 2 +-
src/etc/poms/pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --cc lib/libraries.properties
index ae1a727,0bf5f19..7964e69
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@@ -53,17 -53,16 +53,17 @@@ jakarta-regexp.version=1.
# Later versions of Tomcat provide a jspc task
jasper-compiler.version=4.1.36
jasper-runtime.version=${jasper-compiler.version}
-# Later versions are built with Java 7
-javax.mail.version=1.5.6
jdepend.version=2.9.1
-# Later versions are built with Java 7
jruby.version=1.6.8
- junit.version=4.13
+ junit.version=4.13.1
-# Later versions are built with Java 6
-rhino.version=1.7R5
+rhino.version=1.7.11
+junit-platform-launcher.version=1.2.0
+# Only used for internal tests in Ant project
+junit-vintage-engine.version=5.2.0
+# Only used for internal tests in Ant project
+junit-jupiter-engine.version=5.2.0
jsch.version=0.1.55
-jython.version=2.5.3
+jython.version=2.7.0
# log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2
repo
log4j.version=1.2.14
oro.version=2.0.8
diff --cc manual/tutorial-HelloWorldWithAnt.html
index 6e4d396,babd9b4..e45efbf
--- a/manual/tutorial-HelloWorldWithAnt.html
+++ b/manual/tutorial-HelloWorldWithAnt.html
@@@ -354,30 -383,24 +354,30 @@@ the configuration file, too. So we chan
<b><fileset dir="${src.dir}" excludes="**/*.java"/></b>
<b></copy></b>
</target>
- ...
-</pre>
+ ...</pre>
-<p>This copies all resources (as long as they haven't the suffix ".java") to
the build directory, so we could
+<p>This copies all resources (as long as they haven't the suffix
<samp>.java</samp>) to the build directory, so we could
start the application from that directory and these files will included into
the jar.</p>
+<h2 id="junit">Testing the class</h2>
+<p>In this step we will introduce the usage of the JUnit [3] test framework
in combination with Ant. Because Ant has a
- built-in JUnit 4.13 you could start directly using it. Write a test class
++built-in JUnit 4.13.1 you could start directly using it. Write a test class
+in <samp>src\oata\HelloWorldTest.java</samp>:</p>
+
+<pre>
+package oata;
+
+import org.junit.Test;
-<a name="junit">
-<h2>Testing the class</h2>
-<p>In this step we will introduce the usage of the JUnit [3] testframework in
combination with Ant. Because Ant
-has a built-in JUnit 3.8.2 you could start directly using it. Write a test
class in <tt>src\HelloWorldTest.java</tt>: </p>
+import static org.junit.Assert.fail;
-<pre class="code">
-public class HelloWorldTest extends junit.framework.TestCase {
+public class HelloWorldTest {
+ @Test
public void testNothing() {
}
-
+
+ @Test
public void testWillAlwaysFail() {
fail("An error message");
}
diff --cc src/etc/poms/ant-junit/pom.xml
index 10270f1,748b1ea..5f19c60
--- a/src/etc/poms/ant-junit/pom.xml
+++ b/src/etc/poms/ant-junit/pom.xml
@@@ -45,21 -45,9 +45,21 @@@ xsi:schemaLocation="http://maven.apache
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
+ <version>4.13.1</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.12.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --cc src/etc/poms/pom.xml
index 2a12d38,ce7f765..ee07451
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@@ -111,13 -108,7 +111,13 @@@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
- <version>3.8.2</version>
++ <version>4.13.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>1.3</version>
<scope>test</scope>
</dependency>
</dependencies>
