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/plugins/maven2-repository/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/plugins/maven2-repository/pom.xml')
| -rw-r--r-- | archiva-modules/plugins/maven2-repository/pom.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index bf1cafbb3..2747ef877 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -47,6 +47,12 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-proxy-common</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.sonatype.sisu</groupId> @@ -62,7 +68,7 @@ </dependency> <dependency> <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> + <artifactId>commons-logging</artifactId> <scope>test</scope> </dependency> <dependency> @@ -133,6 +139,10 @@ <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |