From edf7953c4683529f535f813d26573fcf108a1cc9 Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Mon, 4 Jul 2011 22:12:52 +0100
Subject: [PATCH] use build-helper and dependency-unpack for some of the antrun
 stuff

Conflicts:

	war/pom.xml
---
 war/pom.xml | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/war/pom.xml b/war/pom.xml
index 7cd0e8979f..39c352e4fb 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -48,6 +48,13 @@ THE SOFTWARE.
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.jenkins-ci</groupId>
+      <artifactId>executable-war</artifactId>
+      <version>1.20</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
@@ -148,6 +155,7 @@ THE SOFTWARE.
         <!-- version specified in grandparent pom -->
         <executions>
           <execution>
+            <id>list-dependencies</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>list</goal>
@@ -156,6 +164,21 @@ THE SOFTWARE.
               <outputFile>${basedir}/target/classes/dependencies.txt</outputFile>
             </configuration>
           </execution>
+          <execution>
+            <!-- put executable war header -->
+            <id>executable-war-header</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.jenkins-ci</includeGroupIds>
+              <includeArtifactIds>executable-war</includeArtifactIds>
+              <includeScope>provided</includeScope>
+              <includes>**/*.class</includes>
+              <outputDirectory>target/generated-resources</outputDirectory>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -197,14 +220,6 @@ THE SOFTWARE.
               <tasks>
                 <mkdir dir="target/generated-resources" />
 
-                <!-- put executable war header -->
-                <resolveArtifact groupId="org.jenkins-ci" artifactId="executable-war" version="1.22" type="jar" property="executable-war.jar" />
-                <unjar src="${executable-war.jar}" dest="target/generated-resources">
-                  <patternset>
-                    <include name="**/*.class" />
-                  </patternset>
-                </unjar>
-
                 <!-- dependencies that goes to unusual locations -->
                 <resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/remoting.jar" />
                 <resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/slave.jar" />
-- 
GitLab