diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-09-09 15:37:27 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-09-09 15:37:27 +0000 |
| commit | b3f857bd37d08caf3fa2de5b26ff8d5a32401829 (patch) | |
| tree | 4821e8d4c08eb46feba0f58f76a5ca4d72e1a4c3 /archiva-modules/archiva-web/archiva-webapp/pom.xml | |
| parent | 57b6bb091a33f095f951d1ee558c81234c54eb14 (diff) | |
| download | archiva-b3f857bd37d08caf3fa2de5b26ff8d5a32401829.tar.gz archiva-b3f857bd37d08caf3fa2de5b26ff8d5a32401829.zip | |
[MRM-1660] use log4j 2.x done for testing webapp js
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1382517 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp/pom.xml')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index cce6e90d1..e255b5fcc 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -111,6 +111,12 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-proxy</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -312,8 +318,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> <scope>runtime</scope> </dependency> <dependency> @@ -555,6 +561,12 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-webdav</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -662,10 +674,8 @@ </dependency> <dependency> <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> + <artifactId>commons-logging</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -740,6 +750,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -774,6 +788,12 @@ <groupId>org.apache.archiva</groupId> <!-- FIXME: temporary coupling to plugin, should be runtime --> <artifactId>maven2-repository</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.mockito</groupId> @@ -794,6 +814,10 @@ <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -808,6 +832,10 @@ <groupId>ehcache</groupId> <artifactId>ehcache</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |