You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2011/05/11 05:57:46 UTC
svn commit: r1101735 - in /hadoop/common/trunk: CHANGES.txt ivy/ivysettings.xml

Author: tomwhite
Date: Wed May 11 03:57:46 2011
New Revision: 1101735

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

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

Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1101735&r1=1101734&r2=1101735&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Wed May 11 03:57:46 2011
@@ -658,6 +658,9 @@ Release 0.22.0 - Unreleased
     HADOOP-7245. FsConfig should use constants in CommonConfigurationKeys.
     (tomwhite via eli)
 
+    HADOOP-7068. Ivy resolve force mode should be turned off by default.
+    (Luke Lu via tomwhite)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/common/trunk/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/ivy/ivysettings.xml?rev=1101735&r1=1101734&r2=1101735&view=diff
==============================================================================
--- hadoop/common/trunk/ivy/ivysettings.xml (original)
+++ hadoop/common/trunk/ivy/ivysettings.xml Wed May 11 03:57:46 2011
@@ -20,20 +20,20 @@
 
   <property name="maven2.pattern" value="[organisation]/[module]/[revision]/[module]-[revision]"/>
   <property name="repo.dir" value="${user.home}/.m2/repository"/>
-  <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
       <!-- pull in the local repository -->
  <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/> 
 
  <property name="resolvers" value="default" override="false"/>
+  <property name="force-resolve" value="false" override="false"/>
  <settings defaultResolver="${resolvers}"/>
 
  <resolvers>
    <!--ibiblio resolvers-->
     <ibiblio name="maven2" root="${repo.maven.org}" m2compatible="true"/>
 
-    <filesystem name="fs" m2compatible="true" force="true">
-       <artifact pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].[ext]"/>
-       <ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
+    <filesystem name="fs" m2compatible="true" force="${force-resolve}">
+       <artifact pattern="${repo.dir}/${maven2.pattern}.[ext]"/>
+       <ivy pattern="${repo.dir}/${maven2.pattern}.pom"/>
     </filesystem>
 
     <chain name="default" dual="true">