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:49 UTC
[maven-ant-plugin] 40/48: o Moved the IT verification into the
invoker controlled builds for better failure analysis
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 a5dedc8429f32785a42dcf4159dd7b411915e80e
Author: Benjamin Bentmann <be...@apache.org>
AuthorDate: Sat Apr 5 19:25:41 2008 +0000
o Moved the IT verification into the invoker controlled builds for better failure analysis
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin@645163 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 34 +++++++++++-----------------------
src/it/ear-it/goals-2.txt | 1 +
src/it/ear-it/goals.txt | 3 +++
src/it/ear-it/pom.xml | 11 +++++++++++
src/it/plugin-it/goals.txt | 3 +++
src/it/plugin-it/pom.xml | 11 +++++++++++
src/it/webapp-it/goals.txt | 3 +++
src/it/webapp-it/pom.xml | 12 +++++++++++-
8 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 913707c..581b7dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,8 +212,9 @@ under the License.
</pomIncludes>
<postBuildHookScript>verify.bsh</postBuildHookScript>
<goals>
- <!-- Install to the target local-repo -->
- <goal>install ant:ant</goal>
+ <goal>clean</goal>
+ <goal>ant:ant</goal>
+ <goal>antrun:run</goal>
</goals>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
</configuration>
@@ -225,31 +226,18 @@ under the License.
<goal>run</goal>
</goals>
</execution>
- </executions>
- </plugin>
- <!-- Verify the results by calling Ant -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
<execution>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <ant dir="${basedir}/src/it/ear-it" antfile="${basedir}/src/it/ear-it/build.xml" target="clean" />
- <ant dir="${basedir}/src/it/ear-it" antfile="${basedir}/src/it/ear-it/build.xml" target="package" />
-
- <ant dir="${basedir}/src/it/webapp-it" antfile="${basedir}/src/it/webapp-it/build.xml" target="clean" />
- <ant dir="${basedir}/src/it/webapp-it" antfile="${basedir}/src/it/webapp-it/build.xml" target="package" />
-
- <ant dir="${basedir}/src/it/plugin-it" antfile="${basedir}/src/it/plugin-it/build.xml" target="clean" />
- <ant dir="${basedir}/src/it/plugin-it" antfile="${basedir}/src/it/plugin-it/build.xml" target="package" />
- </tasks>
- </configuration>
+ <id>integration-test-phase-2</id>
+ <phase>integration-test</phase>
<goals>
<goal>run</goal>
</goals>
+ <configuration>
+ <pomIncludes>
+ <pomInclude>ear-it/pom.xml</pomInclude>
+ </pomIncludes>
+ <goalsFile>goals-2.txt</goalsFile>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/src/it/ear-it/goals-2.txt b/src/it/ear-it/goals-2.txt
new file mode 100644
index 0000000..7179f2c
--- /dev/null
+++ b/src/it/ear-it/goals-2.txt
@@ -0,0 +1 @@
+antrun:run
diff --git a/src/it/ear-it/goals.txt b/src/it/ear-it/goals.txt
new file mode 100644
index 0000000..96f7752
--- /dev/null
+++ b/src/it/ear-it/goals.txt
@@ -0,0 +1,3 @@
+clean
+install
+ant:ant
diff --git a/src/it/ear-it/pom.xml b/src/it/ear-it/pom.xml
index 0c075b4..711668a 100644
--- a/src/it/ear-it/pom.xml
+++ b/src/it/ear-it/pom.xml
@@ -84,6 +84,17 @@ under the License.
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <tasks>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="clean" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ </tasks>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
diff --git a/src/it/plugin-it/goals.txt b/src/it/plugin-it/goals.txt
new file mode 100644
index 0000000..4524f24
--- /dev/null
+++ b/src/it/plugin-it/goals.txt
@@ -0,0 +1,3 @@
+clean
+ant:ant
+antrun:run
diff --git a/src/it/plugin-it/pom.xml b/src/it/plugin-it/pom.xml
index ce955d7..f492f3c 100644
--- a/src/it/plugin-it/pom.xml
+++ b/src/it/plugin-it/pom.xml
@@ -106,6 +106,17 @@ under the License.
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <tasks>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="clean" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ </tasks>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/src/it/webapp-it/goals.txt b/src/it/webapp-it/goals.txt
new file mode 100644
index 0000000..4524f24
--- /dev/null
+++ b/src/it/webapp-it/goals.txt
@@ -0,0 +1,3 @@
+clean
+ant:ant
+antrun:run
diff --git a/src/it/webapp-it/pom.xml b/src/it/webapp-it/pom.xml
index 96e1f35..72f8589 100644
--- a/src/it/webapp-it/pom.xml
+++ b/src/it/webapp-it/pom.xml
@@ -75,7 +75,6 @@ under the License.
<build>
<finalName>ant-webapp-test</finalName>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -88,6 +87,17 @@ under the License.
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <tasks>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="clean" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ </tasks>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.