From 6af0308fda0e6e1a3e6f86abfb9f5c3a2a188ae1 Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Mon, 4 Jul 2011 17:13:19 +0100
Subject: [PATCH] use build-helper to attach the war-for-test

---
 war/pom.xml | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/war/pom.xml b/war/pom.xml
index 94eedb969c..7cd0e8979f 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -159,23 +159,33 @@ THE SOFTWARE.
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
-        <artifactId>maven-antrun-extended-plugin</artifactId>
-        <!-- version specified in grandparent pom -->
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>package</id>
+            <!-- deploy the war as a jar, so that the tests can pull this into the classpath -->
+            <id>deploy-war-for-test</id>
             <phase>package</phase>
             <goals>
-              <goal>run</goal>
+              <goal>attach-artifact</goal>
             </goals>
             <configuration>
-              <tasks>
-                <!-- deploy the war as a jar, so that the tests can pull this into the classpath -->
-                <attachArtifact file="target/jenkins.war" classifier="war-for-test" type="jar" />
-              </tasks>
+              <artifacts>
+                <artifact>
+                  <file>${basedir}/target/${project.build.finalName}.war</file>
+                  <type>jar</type>
+                  <classifier>war-for-test</classifier>
+                </artifact>
+              </artifacts>
             </configuration>
           </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
+        <artifactId>maven-antrun-extended-plugin</artifactId>
+        <!-- version specified in grandparent pom -->
+        <executions>
           <execution>
             <id>resgen</id>
             <phase>generate-resources</phase>
-- 
GitLab