geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1044136 - /geronimo/server/trunk/testsuite/pom.xml
Date Thu, 09 Dec 2010 21:27:45 GMT
Author: djencks
Date: Thu Dec  9 21:27:44 2010
New Revision: 1044136

URL: http://svn.apache.org/viewvc?rev=1044136&view=rev
Log:
Make maven 3 compatible, see http://docs.codehaus.org/display/MAVENUSER/FAQs-1#FAQs-1-HowdoImergealistofconfigurationitemsinaparentPOMwiththoseinachildPOM%3F

Modified:
    geronimo/server/trunk/testsuite/pom.xml

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=1044136&r1=1044135&r2=1044136&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Thu Dec  9 21:27:44 2010
@@ -132,13 +132,18 @@
                     <artifactId>maven-war-plugin</artifactId>
                     <configuration>
                         <webXml>${project.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                        <webResources>
+                        <webResources combine.self="override">
                             <resource>
                                 <directory>${project.basedir}/src/main/webapp</directory>
                                 <filtering>true</filtering>
                             </resource>
                             <resource>
                                 <directory>${project.build.outputDirectory}</directory>
+                                <includes>
+                                    <include>META-INF/LICENSE*</include>
+                                    <include>META-INF/NOTICE*</include>
+                                    <include>META-INF/DISCLAIMER*</include>
+                                </includes>
                             </resource>
                         </webResources>
                     </configuration>



Mime
View raw message