more exclusions

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@447672 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml
index 50423cb5c0cc9816d8de4a30803d0eedc39b776d..da1ca02f9db08c28a96f8081de4721c33fe3f824 100644 (file)
--- a/archiva-webapp/pom.xml
+++ b/archiva-webapp/pom.xml
@@ -235,6 +235,7 @@
             <fileset>
               <directory>${basedir}/src/main/webapp</directory>
               <includes>
+                <!-- TODO: META-INF shouldn't be required, seems to be an issue with the current war plugin -->
                 <include>META-INF</include>
                 <include>WEB-INF/classes</include>
                 <include>WEB-INF/lib</include>
@@ -253,8 +254,9 @@
         <version>2.0.1</version>
         <configuration>
           <archiveClasses>true</archiveClasses>
-          <dependentWarExcludes>WEB-INF/web.xml,WEB-INF/classes/xwork.xml</dependentWarExcludes>
+          <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml</dependentWarExcludes>
         </configuration>
+        <!-- TODO: would be good to make the jetty plugin aware of these and remove the below -->
         <executions>
           <execution>
             <phase>compile</phase>