You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ap...@apache.org on 2007/11/04 11:44:36 UTC

svn commit: r591754 - in /struts/struts2/trunk/apps: blank/LICENSE.txt blank/NOTICE.txt pom.xml

Author: apetrelli
Date: Sun Nov  4 02:44:35 2007
New Revision: 591754

URL: http://svn.apache.org/viewvc?rev=591754&view=rev
Log:
WW-2221
Configured the WAR plugin to put the LICENSE.txt and NOTICE.txt files under META-INF.
Removed redundant LICENSE.txt and NOTICE.txt in blank webapp.

Removed:
    struts/struts2/trunk/apps/blank/LICENSE.txt
    struts/struts2/trunk/apps/blank/NOTICE.txt
Modified:
    struts/struts2/trunk/apps/pom.xml

Modified: struts/struts2/trunk/apps/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=591754&r1=591753&r2=591754&view=diff
==============================================================================
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/pom.xml Sun Nov  4 02:44:35 2007
@@ -175,6 +175,23 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webResources>
+                        <resource>
+                            <directory>${basedir}/src/main/resources</directory>
+                            <targetPath>META-INF</targetPath>
+                            <includes>
+                                <include>LICENSE.txt</include>
+                                <include>NOTICE.txt</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                    <warSourceExcludes>WEB-INF/classes/LICENSE.txt,WEB-INF/classes/NOTICE.txt</warSourceExcludes>
+                </configuration>
+            </plugin>
         </plugins>
 
         <finalName>${pom.artifactId}</finalName>