commit b64b82dfef8aff7035f92331a93f9c663406a5a7

Author: Luke Lu <llu@yahoo-inc.com>
Date:   Fri Dec 17 14:21:04 2010 -0800

    HADOOP-7068 Fix ivy resolve force mode


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/yahoo-merge@1079155 13f79535-47bb-0310-9956-ffa450edef68

ivy/ivysettings.xml

@@ -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"/> 
+  <!-- pull in the local repository -->
+  <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
 
- <property name="resolvers" value="default" override="false"/>
- <settings defaultResolver="${resolvers}"/>
+  <property name="resolvers" value="default" override="false"/>
+  <property name="force-resolve" value="false" override="false"/>
+  <settings defaultResolver="${resolvers}"/>
 
- <resolvers>
-   <!--ibiblio 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">