svn commit: r786709 - in /maven/components/branches/maven-2.2.0-RC: apache-maven/src/bin/m2.conf pom.xml

[jd...@apache.org]

Author: jdcasey
Date: Fri Jun 19 23:02:20 2009
New Revision: 786709

URL: http://svn.apache.org/viewvc?rev=786709&view=rev
Log:
[MNG-4213][MNG-4210] Adding a log4j.properties file to the distribution to configure some minimal logging that can be tuned by users, and fixing problems with preemptive authentication in the httpclient-based http wagon. This requires the release of wagon now.

Modified:
    maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf
    maven/components/branches/maven-2.2.0-RC/pom.xml

Modified: maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf?rev=786709&r1=786708&r2=786709&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf (original)
+++ maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf Fri Jun 19 23:02:20 2009
@@ -3,4 +3,5 @@
 set maven.home default ${user.home}/m2
 
 [plexus.core]
+load ${maven.home}/conf/log4j.properties
 load ${maven.home}/lib/*.jar

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=786709&r1=786708&r2=786709&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/pom.xml Fri Jun 19 23:02:20 2009
@@ -274,7 +274,7 @@
 
   <properties>
     <mavenVersion>2.2.0</mavenVersion>
-    <wagonVersion>1.0-beta-5</wagonVersion>
+    <wagonVersion>1.0-beta-5-SNAPSHOT</wagonVersion>
     <doxiaVersion>1.1</doxiaVersion>
   </properties>