diff options
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp/pom.xml')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index af049d723..71a0bff85 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -242,6 +242,8 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging-api</artifactId> <version>1.1</version> + <!-- provided by jcl-over-slf4j, don't want this in the webapp --> + <scope>provided</scope> </dependency> <dependency> <groupId>com.atlassian.xmlrpc</groupId> @@ -325,7 +327,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,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> + <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> </configuration> <!-- TODO: would be good to make the jetty plugin aware of these and remove the below --> <executions> |