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/17 23:40:27 UTC

svn commit: r785820 - in /maven/components/branches/maven-2.2.0-RC: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-compat/ maven-core-it-runner/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven...

Author: jdcasey
Date: Wed Jun 17 21:40:26 2009
New Revision: 785820

URL: http://svn.apache.org/viewvc?rev=785820&view=rev
Log:
[MNG-4207] Include log4j, shaded into the distro, to prevent classloading problems when a plugin uses log4j.

Modified:
    maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-artifact-manager/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-artifact-test/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-artifact/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-core-it-runner/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-core/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-error-diagnostics/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-model/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-monitor/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-plugin-api/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-plugin-descriptor/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-plugin-parameter-documenter/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-plugin-registry/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-profile/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-project/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-reporting/maven-reporting-api/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-reporting/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-repository-metadata/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-script/maven-script-ant/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-script/maven-script-beanshell/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-script/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-settings/pom.xml
    maven/components/branches/maven-2.2.0-RC/maven-toolchain/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=785820&r1=785819&r2=785820&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 Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>apache-maven</artifactId>
@@ -89,6 +89,9 @@
                 <relocation>
                   <pattern>org.apache.commons.logging</pattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.apache.log4j</pattern>
+                </relocation>
 
                 <!-- For maven-artifact-manager -->
                 <relocation>

Modified: maven/components/branches/maven-2.2.0-RC/maven-artifact-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-artifact-manager/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-artifact-manager/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-artifact-manager/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-artifact-manager</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-artifact-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-artifact-test/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-artifact-test/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-artifact-test/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-artifact-test</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-artifact/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-artifact/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-artifact/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-artifact</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-compat</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-core-it-runner/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core-it-runner/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-core-it-runner/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-core-it-runner/pom.xml Wed Jun 17 21:40:26 2009
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven</groupId>
-  <version>2.2.0-RC2-SNAPSHOT</version>
+  <version>2.2.0-RC4-SNAPSHOT</version>
   <artifactId>maven-core-it-runner</artifactId>
 
   <name>Integration Test Executor</name>

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=785820&r1=785819&r2=785820&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 Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-core</artifactId>
@@ -54,6 +54,11 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
     </dependency>

Modified: maven/components/branches/maven-2.2.0-RC/maven-error-diagnostics/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-error-diagnostics/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-error-diagnostics/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-error-diagnostics/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-error-diagnostics</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-model/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-model/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-model/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-model</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-monitor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-monitor/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-monitor/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-monitor/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-monitor</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-plugin-api/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-plugin-api/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-plugin-api/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-api</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-plugin-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-plugin-descriptor/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-plugin-descriptor/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-plugin-descriptor/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-descriptor</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-plugin-parameter-documenter/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-plugin-parameter-documenter/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-plugin-parameter-documenter/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-plugin-parameter-documenter/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-parameter-documenter</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-plugin-registry/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-plugin-registry/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-plugin-registry/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-plugin-registry/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-registry</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-profile/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-profile/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-profile/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-profile</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-project/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-project/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-project/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-project</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-reporting/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-reporting/maven-reporting-api/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-reporting/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-reporting/maven-reporting-api/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.reporting</groupId>
     <artifactId>maven-reporting</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-reporting-api</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-reporting/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-reporting/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-reporting/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.maven.reporting</groupId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-repository-metadata/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-repository-metadata/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-repository-metadata/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-repository-metadata/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-repository-metadata</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-script/maven-script-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-script/maven-script-ant/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-script/maven-script-ant/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-script/maven-script-ant/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-script</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-script-ant</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-script/maven-script-beanshell/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-script/maven-script-beanshell/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-script/maven-script-beanshell/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-script/maven-script-beanshell/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-script</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-script-beanshell</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-script/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-script/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-script/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-script/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-script</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-settings/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-settings/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-settings/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-settings/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-settings</artifactId>

Modified: maven/components/branches/maven-2.2.0-RC/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-toolchain/pom.xml?rev=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-toolchain/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-toolchain/pom.xml Wed Jun 17 21:40:26 2009
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>2.2.0-RC5-SNAPSHOT</version>
+    <version>2.2.0-RC4-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-toolchain</artifactId>

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=785820&r1=785819&r2=785820&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/pom.xml Wed Jun 17 21:40:26 2009
@@ -28,7 +28,7 @@
   </parent>
 
   <artifactId>maven</artifactId>
-  <version>2.2.0-RC5-SNAPSHOT</version>
+  <version>2.2.0-RC4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Maven</name>
@@ -273,7 +273,7 @@
   </modules>
 
   <properties>
-    <mavenVersion>2.2.0</mavenVersion>
+    <mavenVersion>2.2.0-RC4-SNAPSHOT</mavenVersion>
     <wagonVersion>1.0-beta-5</wagonVersion>
     <doxiaVersion>1.1</doxiaVersion>
   </properties>
@@ -456,6 +456,11 @@
         <version>${wagonVersion}</version>
       </dependency>
       <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.14</version>
+      </dependency>
+      <dependency>
         <groupId>backport-util-concurrent</groupId>
         <artifactId>backport-util-concurrent</artifactId>
         <version>3.1</version>