You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/03/22 21:37:30 UTC
svn commit: r640076 - in /maven/plugins/trunk/maven-ant-plugin: ./
src/it/ear-it/ src/it/encoding-it/ src/it/file-repo-it/ src/it/plugin-it/
src/it/single-test-it/ src/it/test-custom-selector-it/
src/it/test-default-selector-it/ src/it/webapp-it/ src/t...
Author: bentmann
Date: Sat Mar 22 13:37:28 2008
New Revision: 640076
URL: http://svn.apache.org/viewvc?rev=640076&view=rev
Log:
o Stabilized ITs
Modified:
maven/plugins/trunk/maven-ant-plugin/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/goals.txt
maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-compiler-config-test/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-war-config-test/pom.xml
Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/pom.xml Sat Mar 22 13:37:28 2008
@@ -120,7 +120,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml Sat Mar 22 13:37:28 2008
@@ -76,13 +76,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ant-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>@pom.version@</version>
</plugin>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.2</version>
</plugin>
</plugins>
<pluginManagement>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/goals.txt?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/goals.txt (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/goals.txt Sat Mar 22 13:37:28 2008
@@ -1,2 +1,3 @@
+clean
ant:ant
-initialize
+antrun:run
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/pom.xml Sat Mar 22 13:37:28 2008
@@ -19,24 +19,32 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>build.xml</include>
+ <include>maven-build.*</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
- <executions>
- <execution>
- <phase>initialize</phase>
- <configuration>
- <tasks>
- <!-- delete the properties file to prevent fallback, we want only stuff from the XML file -->
- <delete file="${basedir}/maven-build.properties" />
- <property name="maven.repo.local" location="${settings.localRepository}" />
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <tasks>
+ <!-- delete the properties file to prevent fallback, we want only stuff from the XML file -->
+ <delete file="${basedir}/maven-build.properties" />
+ <property name="maven.repo.local" location="${settings.localRepository}" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ </tasks>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/goals.txt?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/goals.txt (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/goals.txt Sat Mar 22 13:37:28 2008
@@ -1,2 +1,3 @@
+clean
ant:ant
-initialize
+antrun:run
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/pom.xml Sat Mar 22 13:37:28 2008
@@ -17,21 +17,29 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>build.xml</include>
+ <include>maven-build.*</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
- <executions>
- <execution>
- <phase>initialize</phase>
- <configuration>
- <tasks>
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="help" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <tasks>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="help" />
+ </tasks>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml Sat Mar 22 13:37:28 2008
@@ -98,13 +98,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ant-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>@pom.version@</version>
</plugin>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.2</version>
</plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/goals.txt Sat Mar 22 13:37:28 2008
@@ -1,2 +1,3 @@
+clean
ant:ant
-initialize
+antrun:run
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml Sat Mar 22 13:37:28 2008
@@ -18,22 +18,30 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>build.xml</include>
+ <include>maven-build.*</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
- <executions>
- <execution>
- <phase>initialize</phase>
- <configuration>
- <tasks>
- <property name="test" value="GoodTest" />
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <tasks>
+ <property name="test" value="GoodTest" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ </tasks>
+ </configuration>
<dependencies>
<dependency>
<groupId>ant</groupId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/goals.txt?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/goals.txt (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/goals.txt Sat Mar 22 13:37:28 2008
@@ -1,2 +1,3 @@
+clean
ant:ant
-initialize
+antrun:run
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml Sat Mar 22 13:37:28 2008
@@ -18,21 +18,29 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>build.xml</include>
+ <include>maven-build.*</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
- <executions>
- <execution>
- <phase>initialize</phase>
- <configuration>
- <tasks>
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <tasks>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ </tasks>
+ </configuration>
<dependencies>
<dependency>
<groupId>ant</groupId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/goals.txt?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/goals.txt (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/goals.txt Sat Mar 22 13:37:28 2008
@@ -1,2 +1,3 @@
+clean
ant:ant
-initialize
+antrun:run
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml Sat Mar 22 13:37:28 2008
@@ -18,21 +18,29 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>build.xml</include>
+ <include>maven-build.*</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
- <executions>
- <execution>
- <phase>initialize</phase>
- <configuration>
- <tasks>
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <tasks>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ </tasks>
+ </configuration>
<dependencies>
<dependency>
<groupId>ant</groupId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml Sat Mar 22 13:37:28 2008
@@ -33,7 +33,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -80,13 +80,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ant-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>@pom.version@</version>
</plugin>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.2</version>
</plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-compiler-config-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-compiler-config-test/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-compiler-config-test/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-compiler-config-test/pom.xml Sat Mar 22 13:37:28 2008
@@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/pom.xml Sat Mar 22 13:37:28 2008
@@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/pom.xml Sat Mar 22 13:37:28 2008
@@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-war-config-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-war-config-test/pom.xml?rev=640076&r1=640075&r2=640076&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-war-config-test/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-war-config-test/pom.xml Sat Mar 22 13:37:28 2008
@@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>