polished ITs
git-svn-id: https://svn.apache.org/repos/asf/maven/ant-tasks/trunk@965039 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/it/ant-run-plugin-with-ant-1.8.0/build.xml b/src/it/ant-run-plugin-with-ant-1.8.0/build.xml
index 26dd6ca..39dcebf 100644
--- a/src/it/ant-run-plugin-with-ant-1.8.0/build.xml
+++ b/src/it/ant-run-plugin-with-ant-1.8.0/build.xml
@@ -8,18 +8,19 @@
classpathref="maven-ant-tasks.classpath"/>
</target>
-
<target name="test" depends="initTaskDefs">
<artifact:localRepository id="local.repository" path="${basedir}/target/local-repo" layout="default"/>
<artifact:pom file="pom.xml" id="mypom"/>
- <mkdir dir="target"/>
+
+ <mkdir dir="target"/>
<touch file="target/${mypom.build.finalName}"/>
-
+
<artifact:dependencies fileSetId="mydeps" pomRefId="mypom"/>
- <copy todir="target">
+
+ <copy todir="target">
<fileset refid="mydeps"/>
</copy>
</target>
-
+
</project>
\ No newline at end of file
diff --git a/src/it/ant-run-plugin-with-ant-1.8.0/invoker.properties b/src/it/ant-run-plugin-with-ant-1.8.0/invoker.properties
new file mode 100644
index 0000000..b5a9d80
--- /dev/null
+++ b/src/it/ant-run-plugin-with-ant-1.8.0/invoker.properties
@@ -0,0 +1 @@
+invoker.goals = validate
diff --git a/src/it/ant-run-plugin-with-ant-1.8.0/pom.xml b/src/it/ant-run-plugin-with-ant-1.8.0/pom.xml
index 2dbe541..7089d3d 100755
--- a/src/it/ant-run-plugin-with-ant-1.8.0/pom.xml
+++ b/src/it/ant-run-plugin-with-ant-1.8.0/pom.xml
@@ -5,17 +5,26 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>it.ant-tasks</groupId>
- <artifactId>ant-run</artifactId>
+ <artifactId>ant-1.8-run</artifactId>
<packaging>pom</packaging>
<name>ant-run</name>
<version>0.10-SNAPSHOT</version>
<description>
- Try to call the ant tasks through the ant run plugin.
+ Try to call the ant tasks through the ant run plugin with Ant 1.8.0.
</description>
+ <dependencies><!-- dependencies to be downloaded by ant tasks -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
<build>
<finalName>testfile</finalName>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -49,15 +58,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
-
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
- </dependencies>
</project>
diff --git a/src/it/ant-run-plugin-with-ant-1.8.0/verify.bsh b/src/it/ant-run-plugin-with-ant-1.8.0/verify.bsh
index ff0e4b3..d96268b 100644
--- a/src/it/ant-run-plugin-with-ant-1.8.0/verify.bsh
+++ b/src/it/ant-run-plugin-with-ant-1.8.0/verify.bsh
@@ -4,22 +4,22 @@
try
{
- File outputFolder = new File( basedir, "target/" );
-
+ File outputFolder = new File( basedir, "target" );
+
File testFile = new File( outputFolder, "testfile");
if ( !testFile.isFile() )
{
System.err.println( "Could not find generated file: " + testFile );
return false;
}
-
+
File depFile = new File( outputFolder, "org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar");
if ( !depFile.isFile() )
{
System.err.println( "Could not find copied dependency file: " + depFile );
return false;
}
-
+
}
catch( Throwable t )
{
diff --git a/src/it/ant-tasks-in-ant-run-plugin/build.xml b/src/it/ant-tasks-in-ant-run-plugin/build.xml
index 26dd6ca..4a93e04 100644
--- a/src/it/ant-tasks-in-ant-run-plugin/build.xml
+++ b/src/it/ant-tasks-in-ant-run-plugin/build.xml
@@ -8,18 +8,20 @@
classpathref="maven-ant-tasks.classpath"/>
</target>
-
+
<target name="test" depends="initTaskDefs">
<artifact:localRepository id="local.repository" path="${basedir}/target/local-repo" layout="default"/>
<artifact:pom file="pom.xml" id="mypom"/>
- <mkdir dir="target"/>
+
+ <mkdir dir="target"/>
<touch file="target/${mypom.build.finalName}"/>
-
+
<artifact:dependencies fileSetId="mydeps" pomRefId="mypom"/>
- <copy todir="target">
+
+ <copy todir="target">
<fileset refid="mydeps"/>
</copy>
</target>
-
+
</project>
\ No newline at end of file
diff --git a/src/it/ant-tasks-in-ant-run-plugin/pom.xml b/src/it/ant-tasks-in-ant-run-plugin/pom.xml
index da396c1..5268abf 100755
--- a/src/it/ant-tasks-in-ant-run-plugin/pom.xml
+++ b/src/it/ant-tasks-in-ant-run-plugin/pom.xml
@@ -14,13 +14,22 @@
Try to call the ant tasks through the ant run plugin.
</description>
+ <dependencies><!-- dependencies to be downloaded by ant tasks -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+
<build>
<finalName>testfile</finalName>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3</version><!-- uses Ant 1.7.1 by default -->
<executions>
<execution>
<id>run</id>
@@ -36,15 +45,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
-
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
- </dependencies>
</project>
diff --git a/src/it/ant-tasks-in-ant-run-plugin/verify.bsh b/src/it/ant-tasks-in-ant-run-plugin/verify.bsh
index ff0e4b3..d96268b 100644
--- a/src/it/ant-tasks-in-ant-run-plugin/verify.bsh
+++ b/src/it/ant-tasks-in-ant-run-plugin/verify.bsh
@@ -4,22 +4,22 @@
try
{
- File outputFolder = new File( basedir, "target/" );
-
+ File outputFolder = new File( basedir, "target" );
+
File testFile = new File( outputFolder, "testfile");
if ( !testFile.isFile() )
{
System.err.println( "Could not find generated file: " + testFile );
return false;
}
-
+
File depFile = new File( outputFolder, "org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar");
if ( !depFile.isFile() )
{
System.err.println( "Could not find copied dependency file: " + depFile );
return false;
}
-
+
}
catch( Throwable t )
{
