diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2009-03-11 13:07:00 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2009-03-11 13:07:00 +0000 |
| commit | 11edfc69181361430b0459a945f0c8c4722e7cdf (patch) | |
| tree | 1e794ec3856eb0669b60d1c5b45b988ec9335ee7 /archiva-modules | |
| parent | c5783f016ff93827bbcf8a6754ac9ead99b5f543 (diff) | |
| download | archiva-11edfc69181361430b0459a945f0c8c4722e7cdf.tar.gz archiva-11edfc69181361430b0459a945f0c8c4722e7cdf.zip | |
exclude slf4j 1.5.6 jars in WEB-INF/lib, conflicts with the version used which is 1.5.0
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@752433 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index bf6b8c33c..f22a975dc 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -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> |