Adjust packaging, get more tests running in Surefire

src/etc/poms/ant-apache-bsf/pom.xml

@@ -56,8 +56,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <includes>
-            <include>org/apache/tools/ant/util/Script*</include>
-            <include>org/apache/tools/ant/util/optional/Script*</include>
+            <include>org/apache/tools/ant/util/ScriptRunner.java</include>
+            <include>org/apache/tools/ant/util/optional/ScriptRunner.java</include>
           </includes>
         </configuration>
       </plugin>

src/etc/poms/ant-apache-xalan2/pom.xml

@@ -51,29 +51,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
   </dependencies>
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>create-timestamp-file</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <mkdir dir="${project.build.outputDirectory}"/>
-                <copy todir="${project.build.outputDirectory}/org/apache/tools/ant/taskdefs/optional/junit/xsl">
-                  <fileset dir="${project.build.sourceDirectory}/../etc">
-                    <include name="junit-frames.xsl"/>
-                    <include name="junit-noframes.xsl"/>
-                  </fileset>
-                </copy>              
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -81,11 +58,46 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</include>
           </includes>
+          <testIncludes>
+            <include>org/apache/tools/ant/taskdefs/optional/TraXLiaison*</include>
+          </testIncludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <basedir>../../../..</basedir>
+          <workingDirectory>../../../..</workingDirectory>
+          <systemProperties>
+            <property>
+              <name>ant.test.basedir.ignore</name>
+              <value>true</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+          <encoding>ISO-8859-1</encoding>
         </configuration>
       </plugin>
     </plugins>
+    <testResources>
+      <testResource>
+        <directory>../../../../src/etc/testcases</directory>
+        <includes>
+          <include>taskdefs/optional/xalan*</include>
+          <include>taskdefs/optional/xsltliaison*</include>
+        </includes>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
-    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>

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

@@ -61,6 +61,15 @@
                     </includes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*JUnit4*</include>
+                    </includes>
+                </configuration>
+            </plugin>
         </plugins>
         <sourceDirectory>../../../../src/main</sourceDirectory>
         <testSourceDirectory>../../../../src/testcases</testSourceDirectory>

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

@@ -57,7 +57,9 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <includes>
-            <include>org/apache/tools/ant/BuildFileTest*</include>
+            <include>org/apache/tools/ant/AntAssert*</include>
+            <include>org/apache/tools/ant/BuildFile*</include>
+            <include>org/apache/tools/ant/FileUtilities*</include>
             <include>org/apache/tools/ant/util/regexp/RegexpMatcherTest*</include>
             <include>org/apache/tools/ant/util/regexp/RegexpTest*</include>
             <include>org/apache/tools/ant/taskdefs/optional/AbstractXSLTLiaisonTest*</include>

src/etc/poms/ant/pom.xml

@@ -139,6 +139,8 @@
             <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/sound/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/splash/</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/ssh/</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/xz/</exclude>
             <exclude>org/apache/tools/ant/types/optional/image/</exclude>
@@ -160,22 +162,23 @@
             <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <!-- obsolete -->
             <exclude>org/apache/tools/ant/taskdefs/AbstractCvs*</exclude>
-            <!-- investigate -->
-            <exclude>org/apache/tools/ant/taskdefs/Ant*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/Available*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/ExecuteJava*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/ExecuteWatchdog*</exclude>
+            <!-- ERROR: failed to create task2 -->
+            <exclude>org/apache/tools/ant/taskdefs/Antlib*</exclude>
+            <!-- ERROR: "default value" when javac cannot cross-compile to Java 5 -->
             <exclude>org/apache/tools/ant/taskdefs/Javac*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/email/EmailTask*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/TraXLiaison*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/XmlValidateCatalog*</exclude>
             <!-- see XsltTest -->
             <exclude>org/apache/tools/ant/taskdefs/StyleTest*</exclude>
+            <!-- ERROR: Unexpected recipients -->
+            <exclude>org/apache/tools/ant/taskdefs/email/EmailTask*</exclude>
             <!-- antlr -->
             <exclude>org/apache/tools/ant/taskdefs/optional/ANTLR*</exclude>
             <!-- obsolete -->
             <exclude>org/apache/tools/ant/taskdefs/optional/Jspc*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/Pvcs*</exclude>
+            <!-- xalan: workaround for diferent resource encoding -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/TraXLiaison*</exclude>
+            <!-- ERROR: UnknownHostException: chemical -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/XmlValidateCatalog*</exclude>
             <!-- image/imageio -->
             <exclude>org/apache/tools/ant/taskdefs/optional/image/</exclude>
             <!-- jdepend -->
@@ -186,23 +189,29 @@
             <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/</exclude>
             <!-- net -->
             <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
+            <!-- swing -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/splash/</exclude>
             <!-- jsch -->
             <exclude>org/apache/tools/ant/taskdefs/optional/ssh/</exclude>
             <!-- dependent on junit -->
             <exclude>org/apache/tools/ant/types/Assertions*</exclude>
             <!-- bcel -->
             <exclude>org/apache/tools/ant/types/optional/depend/ClassFileSet*</exclude>
+            <!-- dependent on ANT_HOME containing full distribution with bin and lib -->
+            <exclude>org/apache/tools/ant/types/selectors/ModifiedSelector*</exclude>
+            <!-- ERROR: defaults.properties are in both compile and test file tree -->
+            <exclude>org/apache/tools/ant/util/ClasspathUtils*</exclude>
+            <exclude>org/apache/tools/ant/util/LoaderUtils*</exclude>
             <!-- oro -->
             <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
             <!-- regexp -->
             <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
-            <!-- investigate -->
-            <exclude>org/apache/tools/ant/types/CommandlineJava*</exclude>
-            <exclude>org/apache/tools/ant/types/selectors/ModifiedSelector*</exclude>
-            <exclude>org/apache/tools/ant/util/ClasspathUtils*</exclude>
-            <exclude>org/apache/tools/ant/util/LoaderUtils*</exclude>
+            <!-- dependent on IncludeTest.class: checks presence -->
             <exclude>org/apache/tools/ant/AntClassLoaderDelegation*</exclude>
+            <!-- ERROR:  More pseudo attributes are expected (encoding="UTF-8");
+             failure mode is JRE-dependent (see to do for failures in IDE) -->
             <exclude>org/apache/tools/ant/Include*</exclude>
+            <!-- dependent on JUnit 5 -->
             <exclude>org/example/junitlauncher/</exclude>
           </testExcludes>
         </configuration>
@@ -220,11 +229,11 @@
             </property>
             <property>
               <name>build.tests</name>
-              <value>../../../../target/ant/testcases</value>
+              <value>target/build/testcases</value>
             </property>
             <property>
               <name>build.tests.value</name>
-              <value>../../../../target/ant/testcases</value>
+              <value>${project.basedir}/target/build/testcases</value>
             </property>
             <property>
               <name>offline</name>
@@ -265,7 +274,7 @@
         </includes>
       </resource>
       <resource>
-        <directory>../../../../docs</directory>
+        <directory>../../../../manual</directory>
         <filtering>false</filtering>
         <includes>
           <include>images/ant_logo_large.gif</include>
@@ -287,8 +296,9 @@
     </testResources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
-    <outputDirectory>../../../../target/ant/classes</outputDirectory>
-    <testOutputDirectory>../../../../target/ant/testcases</testOutputDirectory>
-    <directory>../../../../target/ant</directory>
+    <!-- directory name hardcoded in AntTest -->
+    <outputDirectory>../../../../target/build/classes</outputDirectory>
+    <testOutputDirectory>../../../../target/build/testcases</testOutputDirectory>
+    <directory>../../../../target/build</directory>
   </build>
 </project>