maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r645163 - in /maven/plugins/trunk/maven-ant-plugin: pom.xml src/it/ear-it/goals-2.txt src/it/ear-it/goals.txt src/it/ear-it/pom.xml src/it/plugin-it/goals.txt src/it/plugin-it/pom.xml src/it/webapp-it/goals.txt src/it/webapp-it/pom.xml
Date Sat, 05 Apr 2008 19:25:45 GMT
Author: bentmann
Date: Sat Apr  5 12:25:41 2008
New Revision: 645163

URL: http://svn.apache.org/viewvc?rev=645163&view=rev
Log:
o Moved the IT verification into the invoker controlled builds for better failure analysis

Added:
    maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals-2.txt   (with props)
    maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals.txt   (with props)
    maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/goals.txt   (with props)
    maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/goals.txt   (with props)
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/plugin-it/pom.xml
    maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/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=645163&r1=645162&r2=645163&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/pom.xml Sat Apr  5 12:25:41 2008
@@ -212,8 +212,9 @@
               </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 @@
                   <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>

Added: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals-2.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals-2.txt?rev=645163&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals-2.txt (added)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals-2.txt Sat Apr  5 12:25:41 2008
@@ -0,0 +1 @@
+antrun:run

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals-2.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals-2.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals.txt?rev=645163&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals.txt (added)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals.txt Sat Apr  5 12:25:41 2008
@@ -0,0 +1,3 @@
+clean
+install
+ant:ant

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

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=645163&r1=645162&r2=645163&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 Apr  5 12:25:41 2008
@@ -84,6 +84,17 @@
         <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>

Added: maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/goals.txt?rev=645163&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/goals.txt (added)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/goals.txt Sat Apr  5 12:25:41 2008
@@ -0,0 +1,3 @@
+clean
+ant:ant
+antrun:run

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

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=645163&r1=645162&r2=645163&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 Apr  5 12:25:41 2008
@@ -106,6 +106,17 @@
         <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>
 

Added: maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/goals.txt?rev=645163&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/goals.txt (added)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/goals.txt Sat Apr  5 12:25:41 2008
@@ -0,0 +1,3 @@
+clean
+ant:ant
+antrun:run

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

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=645163&r1=645162&r2=645163&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 Apr  5 12:25:41 2008
@@ -75,7 +75,6 @@
 
   <build>
     <finalName>ant-webapp-test</finalName>
-
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -87,6 +86,17 @@
         <groupId>org.apache.maven.plugins</groupId>
         <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>



Mime
View raw message