Re-introduce JUnit3/JUnit4 split

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1471115 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -186,7 +186,22 @@
   </selector>
 
   <selector id="needs.junit">
-    <filename name="${optional.package}/junit/"/>
+    <and>
+      <filename name="${optional.package}/junit/"/>
+      <not>
+          <or>
+            <filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/>
+            <filename name="${optional.package}/junit/CustomJUnit4TestAdapterCache*" />
+          </or>
+      </not>
+    </and>
+  </selector>
+
+  <selector id="needs.junit4">
+      <or>
+         <filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/>
+         <filename name="${optional.package}/junit/CustomJUnit4TestAdapterCache*" />
+      </or>
   </selector>
 
   <selector id="needs.apache-regexp">
@@ -295,6 +310,7 @@
         <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"/>
@@ -368,6 +384,9 @@
       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"
@@ -548,7 +567,8 @@
             <selector refid="not.in.kaffe" if="kaffe"/>
 
             <selector refid="needs.apache-resolver" unless="apache.resolver.present"/>
-            <selector refid="needs.junit" unless="junit.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.apache-regexp"
               unless="apache.regexp.present"/>
             <selector refid="needs.apache-oro" unless="apache.oro.present"/>
@@ -721,6 +741,7 @@
 
     <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"/>
@@ -813,6 +834,7 @@
 
     <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"/>

src/etc/poms/ant-junit/pom.xml

@@ -82,6 +82,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/junit/*</include>
           </includes>
+          <excludes>
+              <exclude>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</exclude>
+              <exclude>org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache*</exclude>
+          </excludes>
           <testIncludes>
             <include>org/apache/tools/ant/taskdefs/optional/junit/</include>
           </testIncludes>

src/etc/poms/ant-junit4/pom.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!--
+  This POM has been created manually by the Ant Development Team.
+  Please contact us if you are not satisfied with the data contained in this POM.
+  URL : http://ant.apache.org
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant-parent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>1.9.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <url>http://ant.apache.org/</url>
+    <groupId>org.apache.ant</groupId>
+    <artifactId>ant-junit4</artifactId>
+    <version>1.9.1-SNAPSHOT</version>
+    <name>Apache Ant + JUnit 4</name>
+    <description>contains JUnit 4.x support</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.9.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</include>
+                        <include>org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache*</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+        <sourceDirectory>../../../../src/main</sourceDirectory>
+        <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+        <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
+        <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
+        <directory>../../../../target/${project.artifactId}</directory>
+    </build>
+</project>

src/etc/poms/pom.xml

@@ -97,6 +97,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <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>
@@ -106,7 +107,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
      <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>3.8.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>