From a376eb5832a75d4fb840a9088b37a988582b0965 Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Tue, 5 Jul 2011 15:52:58 +0100
Subject: [PATCH] assemble the webapp in place... no need for an intermediary
 directory... don't use one for making jar files, intermediary is only used
 for generated sources

---
 war/pom.xml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/war/pom.xml b/war/pom.xml
index 66a0bca84b..90a5ec37e5 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -131,11 +131,6 @@ THE SOFTWARE.
         <!-- version specified in grandparent pom -->
         <configuration>
           <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
-          <webResources>
-            <resource>
-              <directory>${project.build.directory}/generated-resources</directory>
-            </resource>
-          </webResources>
           <!-- for putting Main-Class into war -->
           <archive>
             <manifest>
@@ -176,7 +171,7 @@ THE SOFTWARE.
               <includeArtifactIds>executable-war</includeArtifactIds>
               <includeScope>provided</includeScope>
               <includes>**/*.class</includes>
-              <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+              <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
             </configuration>
           </execution>
           <execution>
@@ -191,26 +186,26 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>remoting</artifactId>
-                  <outputDirectory>${project.build.directory}/generated-resources/WEB-INF</outputDirectory>
+                  <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF</outputDirectory>
                   <destFileName>remoting.jar</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>remoting</artifactId>
-                  <outputDirectory>${project.build.directory}/generated-resources/WEB-INF</outputDirectory>
+                  <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF</outputDirectory>
                   <destFileName>slave.jar</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>cli</artifactId>
                   <classifier>jar-with-dependencies</classifier>
-                  <outputDirectory>${project.build.directory}/generated-resources/WEB-INF</outputDirectory>
+                  <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF</outputDirectory>
                   <destFileName>jenkins-cli.jar</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.jenkins-ci</groupId>
                   <artifactId>winstone</artifactId>
-                  <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+                  <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
                   <destFileName>winstone.jar</destFileName>
                 </artifactItem>
                 <!-- bundled plugins -->
@@ -238,8 +233,11 @@ THE SOFTWARE.
                   <type>hpi</type>
                 </artifactItem>
               </artifactItems>
-              <outputDirectory>${project.build.directory}/generated-resources/WEB-INF/plugins</outputDirectory>
+              <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/plugins</outputDirectory>
               <stripVersion>true</stripVersion>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
             </configuration>
           </execution>
         </executions>
@@ -415,7 +413,7 @@ THE SOFTWARE.
                   <goal>sign</goal>
                 </goals>
                 <configuration>
-                  <archive>${project.build.directory}/${project.build.finalName}.${project.packaging}</archive>
+                  <archive>${project.build.directory}/${project.build.finalName}.war</archive>
                 </configuration>
               </execution>
             </executions>
-- 
GitLab