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 | |
| 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
29 files changed, 416 insertions, 59 deletions
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 5c6206475..22addc40c 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -48,6 +48,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-converter</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> @@ -75,13 +85,13 @@ <artifactId>spring-beans</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>compile</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> <scope>compile</scope> </dependency> </dependencies> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml index 96381164a..935e2ef20 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml @@ -45,6 +45,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-layer</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 70175cc5e..337abd043 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -49,6 +49,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-layer</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 686319b32..b561f7225 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -44,6 +44,12 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-scheduler-indexing</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -103,6 +109,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 24095f6e6..578e92396 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -40,6 +40,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-layer</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index bca357ae3..49c1d6dd2 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -48,8 +48,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>runtime</scope> </dependency> </dependencies> diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 2cd0db978..9873046c3 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -87,8 +87,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>runtime</scope> </dependency> <dependency> diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml index e0eb5f3a7..ab26f1050 100644 --- a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml @@ -59,7 +59,7 @@ </dependency> <dependency> <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> + <artifactId>commons-logging</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 16a4e5ba3..75f22e52a 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -36,6 +36,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-layer</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -48,6 +58,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>commons-io</groupId> diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index 66660f8db..dee96f39b 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -65,6 +65,10 @@ <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -168,8 +172,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> <scope>test</scope> </dependency> @@ -204,8 +208,8 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index c8ef219a0..9c4468784 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -79,6 +79,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>maven2-repository</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index 23d87993a..e2cc4ef32 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -58,9 +58,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <scope>runtime</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>compile</scope> </dependency> </dependencies> <build> diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml index 2d3a1a2b5..e3a4a4b7f 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml @@ -64,6 +64,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.springframework</groupId> @@ -87,8 +93,8 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml index 25238293e..fc3195e1c 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml @@ -80,6 +80,16 @@ <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-layer</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index d584e4fb2..77f970c04 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -60,6 +60,12 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-scheduler-indexing</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -165,6 +171,10 @@ <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -251,8 +261,8 @@ <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> <scope>test</scope> </dependency> @@ -263,8 +273,8 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> @@ -296,6 +306,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index ec3cb4cbd..fba754aaa 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -63,8 +63,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index 6ed1f7cf3..8b114b1b7 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -135,8 +135,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml index a95fb6670..1e47e168f 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml @@ -129,6 +129,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> </exclusions> </dependency> @@ -209,6 +213,16 @@ <groupId>org.apache.archiva</groupId> <!-- FIXME: temporary coupling to plugin, should be runtime --> <artifactId>maven2-repository</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -267,6 +281,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.maven.wagon</groupId> @@ -511,6 +531,10 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> </exclusions> </dependency> @@ -522,6 +546,10 @@ <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -536,6 +564,10 @@ <groupId>ehcache</groupId> <artifactId>ehcache</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> @@ -610,13 +642,18 @@ <artifactId>redback-integrations-security</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>runtime</scope> </dependency> <dependency> diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml new file mode 100644 index 000000000..7d28f9c63 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + + +<configuration status="debug"> + <appenders> + <Console name="console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/> + </Console> + </appenders> + <loggers> + <logger name="org.apache.archiva.indexer.search.NexusRepositorySearch" level="debug"/> + + <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils" level="debug"/> + + <logger name="JPOX" level="error"/> + + + <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder" level="error"/> + + + <logger name="org.apache.archiva.admin.repository.managed" level="debug"/> + + + <!-- apache httpclient debug content transfer--> + <!-- + <logger name="org.apache.http.wire"> + <level value="debug"/> + </logger> + --> + <logger name="org.apache.http.headers" level="debug"/> + + + <logger name="org.springframework" level="info"/> + + + <logger name="org.codehaus.plexus" level="info"/> + + + <logger name="org.codehaus.redback" level="info"/> + + + <logger name="org.apache.cxf" level="info"/> + + <logger name="org.quartz" level="info"/> + + <logger name="org.apache.archiva.indexer.merger" level="debug"/> + + <root level="info"> + <appender-ref ref="console"/> + </root> + </loggers> +</configuration> + + diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml index 5366a91f2..815f00741 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml @@ -107,13 +107,13 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> </dependency> </dependencies> 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> diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index f1ba0a44b..8003245d3 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -64,10 +64,22 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-layer</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <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> @@ -80,6 +92,12 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-webdav</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>joda-time</groupId> @@ -193,6 +211,12 @@ <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-admin-default</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> 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> diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml index 026551815..93fcfcbab 100644 --- a/archiva-modules/plugins/metadata-store-file/pom.xml +++ b/archiva-modules/plugins/metadata-store-file/pom.xml @@ -62,8 +62,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml index 5e0950e0f..ac07043de 100644 --- a/archiva-modules/plugins/metadata-store-jcr/pom.xml +++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml @@ -67,6 +67,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/archiva-modules/plugins/npanday-support/pom.xml b/archiva-modules/plugins/npanday-support/pom.xml index c7e46ec70..3492c0ed8 100644 --- a/archiva-modules/plugins/npanday-support/pom.xml +++ b/archiva-modules/plugins/npanday-support/pom.xml @@ -32,6 +32,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>maven2-repository</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml index eee8231ed..4c32130a3 100644 --- a/archiva-modules/plugins/repository-statistics/pom.xml +++ b/archiva-modules/plugins/repository-statistics/pom.xml @@ -36,6 +36,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>maven2-repository</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -56,14 +66,20 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index e1b188e43..8a8adb65f 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -46,6 +46,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>maven2-repository</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -66,8 +76,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> <scope>test</scope> </dependency> <dependency> @@ -74,6 +74,7 @@ <redback.spring-utils.version>2.0-SNAPSHOT</redback.spring-utils.version> <redback.taskqueue.version>2.0-SNAPSHOT</redback.taskqueue.version> <slf4j.version>1.7.0</slf4j.version> + <log4j.version>2.0-alpha2</log4j.version> <spring.version>3.1.2.RELEASE</spring.version> @@ -702,11 +703,6 @@ <version>1.1.2</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - </dependency> - <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-lucene-consumers</artifactId> <version>${project.version}</version> @@ -1157,12 +1153,6 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> <version>${slf4j.version}</version> <scope>runtime</scope> @@ -1179,6 +1169,44 @@ <version>${slf4j.version}</version> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>slf4j-impl</artifactId> + <version>${log4j.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>${log4j.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> + <version>${log4j.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>taglibs</groupId> <artifactId>standard</artifactId> @@ -1500,7 +1528,6 @@ <exclude>org.codehaus.plexus:plexus-quartz</exclude> <exclude>org.codehaus.plexus:plexus-spring</exclude> <exclude>org.codehaus.redback:plexus-spring</exclude> - <exclude>commons-logging:commons-logging</exclude> <exclude>org.slf4j:jcl104-over-slf4j</exclude> <exclude>velocity:velocity-dep</exclude> <exclude>velocity:velocity</exclude> @@ -1522,6 +1549,15 @@ <exclude>org.codehaus.plexus.registry:plexus-registry-api</exclude> <exclude>org.codehaus.plexus.registry:plexus-registry-commons</exclude> <exclude>org.codehaus.plexus:plexus-taskqueue</exclude> + + + <exclude>commons-logging:commons-logging-api</exclude> + <exclude>log4j:log4j</exclude> + <exclude>org.slf4j:jcl-over-slf4j</exclude> + <exclude>org.slf4j:slf4j-log4j12</exclude> + + <!-- TODO org.sonatype.sisu:sisu-guava --> + </excludes> </bannedDependencies> </rules> |