[java-idp-testbed COMMIT] /trunk/pom.xml

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Jan 21 16:03:09 2014
New Revision: 120

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=120&view=rev
Log:
Fix bug where resources in src/main/resources were copied to assembly directory instead of default output directory. Resources are now copied to default output directory and assembly directory.

Modified:
    trunk/pom.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=120&r1=119&r2=120&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Jan 21 16:03:09 2014
@@ -248,10 +248,24 @@
             <!-- Copy src/main/resources to assembly directory. -->
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <includeEmptyDirs>true</includeEmptyDirs>
-                    <outputDirectory>${assembly-directory}</outputDirectory>
-                </configuration>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <includeEmptyDirs>true</includeEmptyDirs>
+                            <outputDirectory>${assembly-directory}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <!-- Copy Main.class to war build directory before war is built. -->
             <plugin>