You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2017/12/20 09:27:42 UTC
[maven-ant-plugin] 33/48: o Stabilized ITs
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-ant-plugin-2.1
in repository https://gitbox.apache.org/repos/asf/maven-ant-plugin.git
commit 92154aca1095b44662e016c911b58641ee78634e
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Mar 22 20:37:28 2008 +0000
o Stabilized ITs
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@640076 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
src/it/ear-it/pom.xml | 4 +--
src/it/encoding-it/goals.txt | 3 +-
src/it/encoding-it/pom.xml | 40 +++++++++++++---------
src/it/file-repo-it/goals.txt | 3 +-
src/it/file-repo-it/pom.xml | 34 +++++++++++-------
src/it/plugin-it/pom.xml | 4 +--
src/it/single-test-it/goals.txt | 3 +-
src/it/single-test-it/pom.xml | 36 +++++++++++--------
src/it/test-custom-selector-it/goals.txt | 3 +-
src/it/test-custom-selector-it/pom.xml | 34 +++++++++++-------
src/it/test-default-selector-it/goals.txt | 3 +-
src/it/test-default-selector-it/pom.xml | 34 +++++++++++-------
src/it/webapp-it/pom.xml | 6 ++--
.../unit/ant-compiler-config-test/pom.xml | 2 +-
src/test/resources/unit/ant-javadoc-test/pom.xml | 2 +-
src/test/resources/unit/ant-test/pom.xml | 2 +-
.../resources/unit/ant-war-config-test/pom.xml | 2 +-
18 files changed, 131 insertions(+), 86 deletions(-)
diff --git a/pom.xml b/pom.xml
index 92e4285..94e8020 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/it/ear-it/pom.xml b/src/it/ear-it/pom.xml
index 6cd907e..0c075b4 100644
--- a/src/it/ear-it/pom.xml
+++ b/src/it/ear-it/pom.xml
@@ -76,13 +76,13 @@ under the License.
<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>
diff --git a/src/it/encoding-it/goals.txt b/src/it/encoding-it/goals.txt
index 16cd63b..4524f24 100644
--- a/src/it/encoding-it/goals.txt
+++ b/src/it/encoding-it/goals.txt
@@ -1,2 +1,3 @@
+clean
ant:ant
-initialize
+antrun:run
diff --git a/src/it/encoding-it/pom.xml b/src/it/encoding-it/pom.xml
index eae8a56..5ea8cd6 100644
--- a/src/it/encoding-it/pom.xml
+++ b/src/it/encoding-it/pom.xml
@@ -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>
diff --git a/src/it/file-repo-it/goals.txt b/src/it/file-repo-it/goals.txt
index 16cd63b..4524f24 100644
--- a/src/it/file-repo-it/goals.txt
+++ b/src/it/file-repo-it/goals.txt
@@ -1,2 +1,3 @@
+clean
ant:ant
-initialize
+antrun:run
diff --git a/src/it/file-repo-it/pom.xml b/src/it/file-repo-it/pom.xml
index fe639c9..6e28ef1 100644
--- a/src/it/file-repo-it/pom.xml
+++ b/src/it/file-repo-it/pom.xml
@@ -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>
diff --git a/src/it/plugin-it/pom.xml b/src/it/plugin-it/pom.xml
index 0e2de7d..ce955d7 100644
--- a/src/it/plugin-it/pom.xml
+++ b/src/it/plugin-it/pom.xml
@@ -98,13 +98,13 @@ under the License.
<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>
diff --git a/src/it/single-test-it/goals.txt b/src/it/single-test-it/goals.txt
index 16cd63b..4524f24 100644
--- a/src/it/single-test-it/goals.txt
+++ b/src/it/single-test-it/goals.txt
@@ -1,2 +1,3 @@
+clean
ant:ant
-initialize
+antrun:run
diff --git a/src/it/single-test-it/pom.xml b/src/it/single-test-it/pom.xml
index 46eebd0..4cbfb3e 100644
--- a/src/it/single-test-it/pom.xml
+++ b/src/it/single-test-it/pom.xml
@@ -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>
diff --git a/src/it/test-custom-selector-it/goals.txt b/src/it/test-custom-selector-it/goals.txt
index 16cd63b..4524f24 100644
--- a/src/it/test-custom-selector-it/goals.txt
+++ b/src/it/test-custom-selector-it/goals.txt
@@ -1,2 +1,3 @@
+clean
ant:ant
-initialize
+antrun:run
diff --git a/src/it/test-custom-selector-it/pom.xml b/src/it/test-custom-selector-it/pom.xml
index 3597c78..deeebc4 100644
--- a/src/it/test-custom-selector-it/pom.xml
+++ b/src/it/test-custom-selector-it/pom.xml
@@ -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>
diff --git a/src/it/test-default-selector-it/goals.txt b/src/it/test-default-selector-it/goals.txt
index 16cd63b..4524f24 100644
--- a/src/it/test-default-selector-it/goals.txt
+++ b/src/it/test-default-selector-it/goals.txt
@@ -1,2 +1,3 @@
+clean
ant:ant
-initialize
+antrun:run
diff --git a/src/it/test-default-selector-it/pom.xml b/src/it/test-default-selector-it/pom.xml
index 30b173c..1d6bd32 100644
--- a/src/it/test-default-selector-it/pom.xml
+++ b/src/it/test-default-selector-it/pom.xml
@@ -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>
diff --git a/src/it/webapp-it/pom.xml b/src/it/webapp-it/pom.xml
index 4905050..96e1f35 100644
--- a/src/it/webapp-it/pom.xml
+++ b/src/it/webapp-it/pom.xml
@@ -33,7 +33,7 @@ under the License.
<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 @@ under the License.
<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>
diff --git a/src/test/resources/unit/ant-compiler-config-test/pom.xml b/src/test/resources/unit/ant-compiler-config-test/pom.xml
index 1cdc148..3f101af 100644
--- a/src/test/resources/unit/ant-compiler-config-test/pom.xml
+++ b/src/test/resources/unit/ant-compiler-config-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/resources/unit/ant-javadoc-test/pom.xml b/src/test/resources/unit/ant-javadoc-test/pom.xml
index ecf70ce..c37f71f 100644
--- a/src/test/resources/unit/ant-javadoc-test/pom.xml
+++ b/src/test/resources/unit/ant-javadoc-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/resources/unit/ant-test/pom.xml b/src/test/resources/unit/ant-test/pom.xml
index 3e33c1d..1f9adbe 100644
--- a/src/test/resources/unit/ant-test/pom.xml
+++ b/src/test/resources/unit/ant-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/resources/unit/ant-war-config-test/pom.xml b/src/test/resources/unit/ant-war-config-test/pom.xml
index ab2f4ac..e504561 100644
--- a/src/test/resources/unit/ant-war-config-test/pom.xml
+++ b/src/test/resources/unit/ant-war-config-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.