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:20:01 UTC
svn commit: r1101742 - in /hadoop/mapreduce/branches/branch-0.22:
CHANGES.txt ivy/ivysettings.xml
Author: tomwhite
Date: Wed May 11 04:20:01 2011
New Revision: 1101742
URL: http://svn.apache.org/viewvc?rev=1101742&view=rev
Log:
Merge -r 1101740:1101741 from trunk to branch-0.22. Fixes: MAPREDUCE-2222
Modified:
hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
hadoop/mapreduce/branches/branch-0.22/ivy/ivysettings.xml
Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1101742&r1=1101741&r2=1101742&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Wed May 11 04:20:01 2011
@@ -537,6 +537,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/branches/branch-0.22/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/ivy/ivysettings.xml?rev=1101742&r1=1101741&r2=1101742&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/ivy/ivysettings.xml (original)
+++ hadoop/mapreduce/branches/branch-0.22/ivy/ivysettings.xml Wed May 11 04:20:01 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>