Author: olamy
Date: Wed Apr 24 10:41:53 2013
New Revision: 1471362
URL: http://svn.apache.org/r1471362
Log:
log4j2 2.0-beta5
Modified:
archiva/trunk/archiva-cli/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml
archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml
archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-cli/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-cli/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-cli/pom.xml (original)
+++ archiva/trunk/archiva-cli/pom.xml Wed Apr 24 10:41:53 2013
@@ -85,12 +85,12 @@
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<scope>compile</scope>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
Wed Apr 24 10:41:53 2013
@@ -90,19 +90,19 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>${log4jVersion}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4jVersion}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<version>${log4jVersion}</version>
<scope>runtime</scope>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml Wed Apr 24
10:41:53 2013
@@ -48,7 +48,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>runtime</scope>
</dependency>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml Wed Apr
24 10:41:53 2013
@@ -83,7 +83,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>runtime</scope>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
Wed Apr 24 10:41:53 2013
@@ -184,13 +184,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
@@ -226,7 +226,7 @@
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>test</scope>
</dependency>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml Wed
Apr 24 10:41:53 2013
@@ -58,7 +58,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>compile</scope>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
Wed Apr 24 10:41:53 2013
@@ -93,7 +93,7 @@
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<scope>test</scope>
</dependency>
@@ -142,7 +142,7 @@
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Wed Apr 24 10:41:53 2013
@@ -275,13 +275,13 @@
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
@@ -293,7 +293,7 @@
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>test</scope>
</dependency>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rss/pom.xml Wed Apr 24
10:41:53 2013
@@ -63,7 +63,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>test</scope>
</dependency>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml Wed
Apr 24 10:41:53 2013
@@ -251,12 +251,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Wed
Apr 24 10:41:53 2013
@@ -130,17 +130,17 @@
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Apr 24
10:41:53 2013
@@ -706,17 +706,17 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>runtime</scope>
</dependency>
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Wed Apr 24
10:41:53 2013
@@ -200,7 +200,7 @@
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml Wed Apr
24 10:41:53 2013
@@ -62,7 +62,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>test</scope>
</dependency>
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml Wed Apr 24
10:41:53 2013
@@ -70,7 +70,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
</dependency>
<dependency>
Modified: archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml
(original)
+++ archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml Wed Apr
24 10:41:53 2013
@@ -55,7 +55,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>test</scope>
</dependency>
Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
(original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml Wed
Apr 24 10:41:53 2013
@@ -76,12 +76,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1471362&r1=1471361&r2=1471362&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Apr 24 10:41:53 2013
@@ -74,7 +74,7 @@
<redback.spring-utils.version>2.0</redback.spring-utils.version>
<redback.taskqueue.version>2.0</redback.taskqueue.version>
<slf4j.version>1.7.2</slf4j.version>
- <log4j.version>2.0-beta4</log4j.version>
+ <log4j.version>2.0-beta5</log4j.version>
<spring.version>3.2.2.RELEASE</spring.version>
@@ -1188,19 +1188,19 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>${log4j.version}</version>
<scope>runtime</scope>
