[java-identity-provider COMMIT] /trunk/idp-distribution/pom.xml

[noreply at shibboleth.net]

Author: tzeller
Date: Sun May 18 16:44:55 2014
New Revision: 5953

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5953&view=rev
Log:
Muck with idp-distribution phases in order for Jenkins to build the assembly properly.

Modified:
    trunk/idp-distribution/pom.xml

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=5953&r1=5952&r2=5953&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Sun May 18 16:44:55 2014
@@ -46,12 +46,12 @@
                         </goals>
                         <configuration>
                             <includeEmptyDirs>true</includeEmptyDirs>
+                             <outputDirectory>${assembly-directory}</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>${basedir}/src/main/resources</directory>
                                 </resource>
                             </resources>
-                            <outputDirectory>${assembly-directory}</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -62,9 +62,7 @@
                     <!-- Copy war to assembly directory. -->
                     <execution>
                         <id>copy-idp-war</id>
-                        <phase>
-                            package
-                        </phase>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -85,7 +83,7 @@
                     <!-- Unpack idp-conf to assembly directory. -->
                     <execution>
                         <id>unpack-idp-conf</id>
-                        <phase>package</phase>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
@@ -105,7 +103,7 @@
                     <!-- Copy Jetty DTA plugin to jetty-base/lib/ext directory. -->
                     <execution>
                         <id>copy-jetty-dta-ssl</id>
-                        <phase>package</phase>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -131,7 +129,7 @@
                 <version>1.7</version>
                 <executions>
                     <execution>
-                        <phase>package</phase>
+                        <phase>process-resources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>