You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/06/22 20:46:29 UTC
svn commit: r787349 - in /maven/components/branches/maven-2.2.0-RC:
apache-maven/pom.xml maven-core/pom.xml pom.xml
Author: jdcasey
Date: Mon Jun 22 18:46:29 2009
New Revision: 787349
URL: http://svn.apache.org/viewvc?rev=787349&view=rev
Log:
[MNG-4207][MNG-4210] Change to using slf4j instead of commons-logging+log4j, which results in a cleaner configuration on the Maven side with less fuss.
Modified:
maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml
maven/components/branches/maven-2.2.0-RC/maven-core/pom.xml
maven/components/branches/maven-2.2.0-RC/pom.xml
Modified: maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml?rev=787349&r1=787348&r2=787349&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml Mon Jun 22 18:46:29 2009
@@ -78,9 +78,6 @@
<relocation>
<pattern>org.apache.jackrabbit</pattern>
</relocation>
- <relocation>
- <pattern>org.slf4j</pattern>
- </relocation>
<!-- For http/webdav wagons -->
<relocation>
@@ -90,7 +87,7 @@
<pattern>org.apache.commons.logging</pattern>
</relocation>
<relocation>
- <pattern>org.apache.log4j</pattern>
+ <pattern>org.slf4j</pattern>
</relocation>
<!-- For maven-artifact-manager -->
Modified: maven/components/branches/maven-2.2.0-RC/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/pom.xml?rev=787349&r1=787348&r2=787349&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-core/pom.xml Mon Jun 22 18:46:29 2009
@@ -47,15 +47,32 @@
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: maven/components/branches/maven-2.2.0-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/pom.xml?rev=787349&r1=787348&r2=787349&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/pom.xml Mon Jun 22 18:46:29 2009
@@ -273,8 +273,8 @@
</modules>
<properties>
- <mavenVersion>2.2.0</mavenVersion>
- <wagonVersion>1.0-beta-6-SNAPSHOT</wagonVersion>
+ <mavenVersion>2.2.0-RC4-SNAPSHOT</mavenVersion>
+ <wagonVersion>1.0-beta-6</wagonVersion>
<doxiaVersion>1.1</doxiaVersion>
</properties>
@@ -456,9 +456,14 @@
<version>${wagonVersion}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>