You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2009/03/11 14:07:01 UTC
svn commit: r752433 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
Author: oching
Date: Wed Mar 11 13:07:00 2009
New Revision: 752433
URL: http://svn.apache.org/viewvc?rev=752433&view=rev
Log:
exclude slf4j 1.5.6 jars in WEB-INF/lib, conflicts with the version used which is 1.5.0
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=752433&r1=752432&r2=752433&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Mar 11 13:07:00 2009
@@ -319,7 +319,7 @@
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>
- <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</warSourceExcludes>
+ <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 -->
<executions>