Author: bodewig
Date: Sun Mar 24 06:49:42 2013
New Revision: 1460264
URL: http://svn.apache.org/r1460264
Log:
No reason to have ant-junit4.jar anymore.
Removed:
ant/core/trunk/src/etc/poms/ant-junit4/
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/build.xml
ant/core/trunk/src/etc/poms/ant-junit/pom.xml
ant/core/trunk/src/etc/poms/pom.xml
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1460264&r1=1460263&r2=1460264&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sun Mar 24 06:49:42 2013
@@ -4,6 +4,9 @@ Changes from Ant 1.9.0 TO current
Changes that could break older environments:
-------------------------------------------
+* the optional ant-junit4.jar has been merged into ant-junit.jar
+ as Ant now requires JUnit4.
+
Fixed bugs:
-----------
Modified: ant/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=1460264&r1=1460263&r2=1460264&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Sun Mar 24 06:49:42 2013
@@ -186,16 +186,7 @@
</selector>
<selector id="needs.junit">
- <and>
- <filename name="${optional.package}/junit/"/>
- <not>
- <filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/>
- </not>
- </and>
- </selector>
-
- <selector id="needs.junit4">
- <filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/>
+ <filename name="${optional.package}/junit/"/>
</selector>
<selector id="needs.apache-regexp">
@@ -304,7 +295,6 @@
<selector refid="needs.jmf"/>
<selector refid="needs.jsch"/>
<selector refid="needs.junit"/>
- <selector refid="needs.junit4"/>
<selector refid="needs.netrexx"/>
<selector refid="needs.swing"/>
<selector refid="ant.launcher"/>
@@ -378,9 +368,6 @@
classname="org.apache.xalan.trace.TraceListenerEx3"
classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
<available property="junit.present"
- classname="junit.framework.TestCase"
- classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
- <available property="junit4.present"
classname="org.junit.Test"
classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
<available property="antunit.present"
@@ -561,8 +548,7 @@
<selector refid="not.in.kaffe" if="kaffe"/>
<selector refid="needs.apache-resolver"
unless="apache.resolver.present"/>
- <selector refid="needs.junit" unless="junit.present"/> <!-- XXX
should perhaps use -source 1.4? -->
- <selector refid="needs.junit4" unless="junit4.present"/>
+ <selector refid="needs.junit" unless="junit.present"/>
<selector refid="needs.apache-regexp"
unless="apache.regexp.present"/>
<selector refid="needs.apache-oro" unless="apache.oro.present"/>
@@ -735,7 +721,6 @@
<optional-jar dep="apache-resolver"/>
<optional-jar dep="junit"/>
- <optional-jar dep="junit4"/>
<optional-jar dep="apache-regexp"/>
<optional-jar dep="apache-oro"/>
<optional-jar dep="apache-bcel"/>
@@ -828,7 +813,6 @@
<optional-src-jar dep="apache-resolver"/>
<optional-src-jar dep="junit"/>
- <optional-src-jar dep="junit4"/>
<optional-src-jar dep="apache-regexp"/>
<optional-src-jar dep="apache-oro"/>
<optional-src-jar dep="apache-bcel"/>
Modified: ant/core/trunk/src/etc/poms/ant-junit/pom.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/poms/ant-junit/pom.xml?rev=1460264&r1=1460263&r2=1460264&view=diff
==============================================================================
--- ant/core/trunk/src/etc/poms/ant-junit/pom.xml (original)
+++ ant/core/trunk/src/etc/poms/ant-junit/pom.xml Sun Mar 24 06:49:42 2013
@@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.11</version>
<scope>compile</scope>
</dependency>
</dependencies>
@@ -82,9 +82,6 @@ xsi:schemaLocation="http://maven.apache.
<includes>
<include>org/apache/tools/ant/taskdefs/optional/junit/*</include>
</includes>
- <excludes>
-
<exclude>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</exclude>
- </excludes>
<testIncludes>
<include>org/apache/tools/ant/taskdefs/optional/junit/</include>
</testIncludes>
Modified: ant/core/trunk/src/etc/poms/pom.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/poms/pom.xml?rev=1460264&r1=1460263&r2=1460264&view=diff
==============================================================================
--- ant/core/trunk/src/etc/poms/pom.xml (original)
+++ ant/core/trunk/src/etc/poms/pom.xml Sun Mar 24 06:49:42 2013
@@ -97,7 +97,6 @@ xsi:schemaLocation="http://maven.apache.
<module>ant-jmf</module>
<module>ant-jsch</module>
<module>ant-junit</module>
- <module>ant-junit4</module>
<module>ant-launcher</module>
<module>ant-netrexx</module>
<module>ant-swing</module>
@@ -107,7 +106,7 @@ xsi:schemaLocation="http://maven.apache.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
