Author: jdumay
Date: Fri Mar 13 05:09:28 2009
New Revision: 753117
URL: http://svn.apache.org/viewvc?rev=753117&view=rev
Log:
MRM-1139 - war:inplace blindly copies everything (including WEB-INF/lib/**)
into the archiva-webapp.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=753117&r1=753116&r2=753117&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Fri Mar 13
05:09:28 2009
@@ -318,7 +318,7 @@
<!-- Some versions of maven-war-plugin (snapshots) have this
incorrectly defaulted to true.
Specifically setting this to false to avoid accidental jar file
creation. -->
<archiveClasses>false</archiveClasses>
-
<dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml</dependentWarExcludes>
+
<dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/**</dependentWarExcludes>
<warSourceExcludes>WEB-INF/lib/xalan-*.jar,WEB-INF/lib/velocity-dep-*.jar,WEB-INF/lib/xml-apis-*.jar,WEB-INF/lib/wstx-asl-*.jar,WEB-INF/lib/stax-utils-*.jar,WEB-INF/lib/xercesImpl-*.jar,WEB-INF/lib/slf4j-api-1.5.6.jar,WEB-INF/lib/slf4j-log4j12-1.5.6.jar</warSourceExcludes>
</configuration>
<!-- TODO: would be good to make the jetty plugin aware of these and
remove the below -->