@@ -62,11 +62,23 @@ | |||||
<includes> | <includes> | ||||
<include>org/apache/tools/ant/taskdefs/optional/ANTLR*</include> | <include>org/apache/tools/ant/taskdefs/optional/ANTLR*</include> | ||||
</includes> | </includes> | ||||
<testIncludes> | |||||
<include>org/apache/tools/ant/taskdefs/optional/ANTLR*</include> | |||||
</testIncludes> | |||||
</configuration> | |||||
</plugin> | |||||
<plugin> | |||||
<groupId>org.apache.maven.plugins</groupId> | |||||
<artifactId>maven-surefire-plugin</artifactId> | |||||
<configuration> | |||||
<basedir>../../../..</basedir> | |||||
<workingDirectory>../../../..</workingDirectory> | |||||
<skipTests>true</skipTests> | |||||
</configuration> | </configuration> | ||||
</plugin> | </plugin> | ||||
</plugins> | </plugins> | ||||
<sourceDirectory>../../../../src/main</sourceDirectory> | <sourceDirectory>../../../../src/main</sourceDirectory> | ||||
<testSourceDirectory>../../../../src/testcases</testSourceDirectory> | |||||
<testSourceDirectory>../../../../src/tests/junit</testSourceDirectory> | |||||
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | ||||
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | ||||
<directory>../../../../target/${project.artifactId}</directory> | <directory>../../../../target/${project.artifactId}</directory> | ||||
@@ -57,11 +57,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma | |||||
<includes> | <includes> | ||||
<include>org/apache/tools/ant/util/regexp/JakartaRegexp*</include> | <include>org/apache/tools/ant/util/regexp/JakartaRegexp*</include> | ||||
</includes> | </includes> | ||||
<testIncludes> | |||||
<include>org/apache/tools/ant/util/regexp/JakartaRegexp*</include> | |||||
</testIncludes> | |||||
</configuration> | </configuration> | ||||
</plugin> | </plugin> | ||||
</plugins> | </plugins> | ||||
<sourceDirectory>../../../../src/main</sourceDirectory> | <sourceDirectory>../../../../src/main</sourceDirectory> | ||||
<testSourceDirectory>../../../../src/testcases</testSourceDirectory> | |||||
<testSourceDirectory>../../../../src/tests/junit</testSourceDirectory> | |||||
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | ||||
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | ||||
<directory>../../../../target/${project.artifactId}</directory> | <directory>../../../../target/${project.artifactId}</directory> | ||||
@@ -65,9 +65,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma | |||||
</testIncludes> | </testIncludes> | ||||
</configuration> | </configuration> | ||||
</plugin> | </plugin> | ||||
<plugin> | |||||
<groupId>org.apache.maven.plugins</groupId> | |||||
<artifactId>maven-surefire-plugin</artifactId> | |||||
<configuration> | |||||
<basedir>../../../..</basedir> | |||||
<workingDirectory>../../../..</workingDirectory> | |||||
<skipTests>true</skipTests> | |||||
</configuration> | |||||
</plugin> | |||||
</plugins> | </plugins> | ||||
<sourceDirectory>../../../../src/main</sourceDirectory> | <sourceDirectory>../../../../src/main</sourceDirectory> | ||||
<testSourceDirectory>../../../../src/testcases</testSourceDirectory> | |||||
<testSourceDirectory>../../../../src/tests/junit</testSourceDirectory> | |||||
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | ||||
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | ||||
<directory>../../../../target/${project.artifactId}</directory> | <directory>../../../../target/${project.artifactId}</directory> | ||||
@@ -54,11 +54,23 @@ | |||||
<include>org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java</include> | <include>org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java</include> | ||||
<include>org/apache/tools/ant/types/optional/imageio/*</include> | <include>org/apache/tools/ant/types/optional/imageio/*</include> | ||||
</includes> | </includes> | ||||
<testIncludes> | |||||
<include>org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java</include> | |||||
</testIncludes> | |||||
</configuration> | |||||
</plugin> | |||||
<plugin> | |||||
<groupId>org.apache.maven.plugins</groupId> | |||||
<artifactId>maven-surefire-plugin</artifactId> | |||||
<configuration> | |||||
<basedir>../../../..</basedir> | |||||
<workingDirectory>../../../..</workingDirectory> | |||||
<skipTests>true</skipTests> | |||||
</configuration> | </configuration> | ||||
</plugin> | </plugin> | ||||
</plugins> | </plugins> | ||||
<sourceDirectory>../../../../src/main</sourceDirectory> | <sourceDirectory>../../../../src/main</sourceDirectory> | ||||
<testSourceDirectory>../../../../src/testcases</testSourceDirectory> | |||||
<testSourceDirectory>../../../../src/tests/junit</testSourceDirectory> | |||||
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | ||||
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | ||||
<directory>../../../../target/${project.artifactId}</directory> | <directory>../../../../target/${project.artifactId}</directory> | ||||
@@ -57,11 +57,11 @@ | |||||
</dependencies> | </dependencies> | ||||
<!-- Central has javax.media:jai-core:1.1.3 but only com.sun.media:jai-codec:1.1.2_01 --> | <!-- Central has javax.media:jai-core:1.1.3 but only com.sun.media:jai-codec:1.1.2_01 --> | ||||
<repositories> | <repositories> | ||||
<repository> | |||||
<id>jboss</id> | |||||
<name>JBoss</name> | |||||
<url>https://repository.jboss.org/nexus/content/groups/public/</url> | |||||
</repository> | |||||
<repository> | |||||
<id>jboss</id> | |||||
<name>JBoss</name> | |||||
<url>https://repository.jboss.org/nexus/content/groups/public/</url> | |||||
</repository> | |||||
</repositories> | </repositories> | ||||
<build> | <build> | ||||
<plugins> | <plugins> | ||||
@@ -73,11 +73,22 @@ | |||||
<include>org/apache/tools/ant/taskdefs/optional/image/Image.java</include> | <include>org/apache/tools/ant/taskdefs/optional/image/Image.java</include> | ||||
<include>org/apache/tools/ant/types/optional/image/*</include> | <include>org/apache/tools/ant/types/optional/image/*</include> | ||||
</includes> | </includes> | ||||
<testIncludes> | |||||
<include>org/apache/tools/ant/taskdefs/optional/image/ImageTest.java</include> | |||||
</testIncludes> | |||||
</configuration> | |||||
</plugin> | |||||
<plugin> | |||||
<groupId>org.apache.maven.plugins</groupId> | |||||
<artifactId>maven-surefire-plugin</artifactId> | |||||
<configuration> | |||||
<basedir>../../../..</basedir> | |||||
<workingDirectory>../../../..</workingDirectory> | |||||
</configuration> | </configuration> | ||||
</plugin> | </plugin> | ||||
</plugins> | </plugins> | ||||
<sourceDirectory>../../../../src/main</sourceDirectory> | <sourceDirectory>../../../../src/main</sourceDirectory> | ||||
<testSourceDirectory>../../../../src/testcases</testSourceDirectory> | |||||
<testSourceDirectory>../../../../src/tests/junit</testSourceDirectory> | |||||
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | ||||
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | ||||
<directory>../../../../target/${project.artifactId}</directory> | <directory>../../../../target/${project.artifactId}</directory> | ||||
@@ -60,11 +60,23 @@ | |||||
<includes> | <includes> | ||||
<include>org/apache/tools/ant/taskdefs/optional/jdepend/*</include> | <include>org/apache/tools/ant/taskdefs/optional/jdepend/*</include> | ||||
</includes> | </includes> | ||||
<testIncludes> | |||||
<include>org/apache/tools/ant/taskdefs/optional/jdepend/*</include> | |||||
</testIncludes> | |||||
</configuration> | |||||
</plugin> | |||||
<plugin> | |||||
<groupId>org.apache.maven.plugins</groupId> | |||||
<artifactId>maven-surefire-plugin</artifactId> | |||||
<configuration> | |||||
<basedir>../../../..</basedir> | |||||
<workingDirectory>../../../..</workingDirectory> | |||||
<skipTests>true</skipTests> | |||||
</configuration> | </configuration> | ||||
</plugin> | </plugin> | ||||
</plugins> | </plugins> | ||||
<sourceDirectory>../../../../src/main</sourceDirectory> | <sourceDirectory>../../../../src/main</sourceDirectory> | ||||
<testSourceDirectory>../../../../src/testcases</testSourceDirectory> | |||||
<testSourceDirectory>../../../../src/tests/junit</testSourceDirectory> | |||||
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | ||||
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | ||||
<directory>../../../../target/${project.artifactId}</directory> | <directory>../../../../target/${project.artifactId}</directory> | ||||
@@ -64,9 +64,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma | |||||
</testIncludes> | </testIncludes> | ||||
</configuration> | </configuration> | ||||
</plugin> | </plugin> | ||||
<plugin> | |||||
<groupId>org.apache.maven.plugins</groupId> | |||||
<artifactId>maven-surefire-plugin</artifactId> | |||||
<configuration> | |||||
<basedir>../../../..</basedir> | |||||
<workingDirectory>../../../..</workingDirectory> | |||||
<systemProperties> | |||||
<property> | |||||
<name>scp.tmp</name> | |||||
<value>${java.io.tmpdir}</value> | |||||
</property> | |||||
</systemProperties> | |||||
</configuration> | |||||
</plugin> | |||||
</plugins> | </plugins> | ||||
<sourceDirectory>../../../../src/main</sourceDirectory> | <sourceDirectory>../../../../src/main</sourceDirectory> | ||||
<testSourceDirectory>../../../../src/testcases</testSourceDirectory> | |||||
<testSourceDirectory>../../../../src/tests/junit</testSourceDirectory> | |||||
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | ||||
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | ||||
<directory>../../../../target/${project.artifactId}</directory> | <directory>../../../../target/${project.artifactId}</directory> | ||||
@@ -92,9 +92,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma | |||||
</testIncludes> | </testIncludes> | ||||
</configuration> | </configuration> | ||||
</plugin> | </plugin> | ||||
<plugin> | |||||
<groupId>org.apache.maven.plugins</groupId> | |||||
<artifactId>maven-surefire-plugin</artifactId> | |||||
<configuration> | |||||
<basedir>../../../..</basedir> | |||||
<workingDirectory>../../../..</workingDirectory> | |||||
<skipTests>true</skipTests> | |||||
</configuration> | |||||
</plugin> | |||||
</plugins> | </plugins> | ||||
<sourceDirectory>../../../../src/main</sourceDirectory> | <sourceDirectory>../../../../src/main</sourceDirectory> | ||||
<testSourceDirectory>../../../../src/testcases</testSourceDirectory> | |||||
<testSourceDirectory>../../../../src/tests/junit</testSourceDirectory> | |||||
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> | ||||
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> | ||||
<directory>../../../../target/${project.artifactId}</directory> | <directory>../../../../target/${project.artifactId}</directory> | ||||
@@ -75,6 +75,15 @@ | |||||
</testIncludes> | </testIncludes> | ||||
</configuration> | </configuration> | ||||
</plugin> | </plugin> | ||||
<plugin> | |||||
<groupId>org.apache.maven.plugins</groupId> | |||||
<artifactId>maven-surefire-plugin</artifactId> | |||||
<configuration> | |||||
<basedir>../../../..</basedir> | |||||
<workingDirectory>../../../..</workingDirectory> | |||||
<skipTests>true</skipTests> | |||||
</configuration> | |||||
</plugin> | |||||
</plugins> | </plugins> | ||||
<sourceDirectory>../../../../src/main</sourceDirectory> | <sourceDirectory>../../../../src/main</sourceDirectory> | ||||
<testSourceDirectory>../../../../src/tests/junit</testSourceDirectory> | <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory> | ||||
@@ -161,6 +161,8 @@ | |||||
<artifactId>maven-surefire-plugin</artifactId> | <artifactId>maven-surefire-plugin</artifactId> | ||||
<configuration> | <configuration> | ||||
<basedir>../../../..</basedir> | <basedir>../../../..</basedir> | ||||
<workingDirectory>../../../..</workingDirectory> | |||||
<skipTests>true</skipTests> | |||||
<systemProperties> | <systemProperties> | ||||
<property> | <property> | ||||
<name>ant.home</name> | <name>ant.home</name> | ||||
@@ -39,6 +39,7 @@ import org.junit.Test; | |||||
import static org.junit.Assert.assertFalse; | import static org.junit.Assert.assertFalse; | ||||
import static org.junit.Assert.assertNotNull; | import static org.junit.Assert.assertNotNull; | ||||
import static org.junit.Assert.assertTrue; | import static org.junit.Assert.assertTrue; | ||||
import static org.junit.Assume.assumeNotNull; | |||||
/** | /** | ||||
* This is a unit test for the Scp task in Ant. It must be | * This is a unit test for the Scp task in Ant. It must be | ||||
@@ -82,6 +83,7 @@ public class ScpTest { | |||||
@Test | @Test | ||||
public void testSingleFileUploadAndDownload() throws IOException { | public void testSingleFileUploadAndDownload() throws IOException { | ||||
assumeNotNull("system property scp.host must be set", sshHostUri); | |||||
assertNotNull("system property scp.tmp must be set", tempDir); | assertNotNull("system property scp.tmp must be set", tempDir); | ||||
File uploadFile = createTemporaryFile(); | File uploadFile = createTemporaryFile(); | ||||
@@ -107,6 +109,7 @@ public class ScpTest { | |||||
@Test | @Test | ||||
public void testMultiUploadAndDownload() throws IOException { | public void testMultiUploadAndDownload() throws IOException { | ||||
assumeNotNull("system property scp.host must be set", sshHostUri); | |||||
assertNotNull("system property scp.tmp must be set", tempDir); | assertNotNull("system property scp.tmp must be set", tempDir); | ||||
List<File> uploadList = new ArrayList<>(); | List<File> uploadList = new ArrayList<>(); | ||||
for (int i = 0; i < 5; i++) { | for (int i = 0; i < 5; i++) { | ||||
@@ -143,6 +146,7 @@ public class ScpTest { | |||||
@Test | @Test | ||||
public void testMultiResourceCollectionUpload() throws IOException { | public void testMultiResourceCollectionUpload() throws IOException { | ||||
assumeNotNull("system property scp.host must be set", sshHostUri); | |||||
assertNotNull("system property scp.tmp must be set", tempDir); | assertNotNull("system property scp.tmp must be set", tempDir); | ||||
List<File> uploadList = new ArrayList<>(); | List<File> uploadList = new ArrayList<>(); | ||||
for (int i = 0; i < 5; i++) { | for (int i = 0; i < 5; i++) { | ||||