You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2011/05/11 06:18:38 UTC

svn commit: r1101741 - in /hadoop/mapreduce/trunk: CHANGES.txt ivy/ivysettings.xml

Author: tomwhite
Date: Wed May 11 04:18:38 2011
New Revision: 1101741

URL: http://svn.apache.org/viewvc?rev=1101741&view=rev
Log:
MAPREDUCE-2222. Ivy resolve force mode should be turned off by default. Contributed by Luke Lu.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/ivy/ivysettings.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1101741&r1=1101740&r2=1101741&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Wed May 11 04:18:38 2011
@@ -710,6 +710,9 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-2472. Extra whitespace in mapred.child.java.opts breaks JVM
     initialization. (Aaron T. Myers via todd)
 
+    MAPREDUCE-2222. Ivy resolve force mode should be turned off by default.
+    (Luke Lu via tomwhite)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

Modified: hadoop/mapreduce/trunk/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/ivysettings.xml?rev=1101741&r1=1101740&r2=1101741&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/ivy/ivysettings.xml (original)
+++ hadoop/mapreduce/trunk/ivy/ivysettings.xml Wed May 11 04:18:38 2011
@@ -35,6 +35,7 @@
   <property name="repo.dir" value="${user.home}/.m2/repository"/>
   <property name="maven2.pattern.ext"  value="${maven2.pattern}.[ext]"/>
   <property name="resolvers" value="default" override="false"/>
+  <property name="force-resolve" value="false" override="false"/>
   <settings defaultResolver="${resolvers}"/>
 
   <resolvers>
@@ -42,7 +43,7 @@
     <ibiblio name="apache-snapshot" root="${snapshot.apache.org}" m2compatible="true"
         checkmodified="true" changingPattern=".*SNAPSHOT"/>
 
-    <filesystem name="fs" m2compatible="true" force="true">
+    <filesystem name="fs" m2compatible="true" force="${force-resolve}">
        <artifact pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].[ext]"/>
        <ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
     </filesystem>