From 481f93a6aa7e33f8da83bd89c1b2297093879236 Mon Sep 17 00:00:00 2001
From: Mahadev Konar <mahadev@apache.org>
Date: Wed, 31 Aug 2011 05:51:58 +0000
Subject: [PATCH] MAPREDUCE-2916. Ivy build for MRv1 fails with bad
 organization for common daemon. (mahadev) - merge r1163490 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163491 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt         | 3 +++
 hadoop-mapreduce-project/ivy/ivysettings.xml | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index e7bb1dae618..87602414a79 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -1173,6 +1173,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-2897. Javadoc for ClientRMProtocol protocol and related records. 
     (acmurthy)
 
+   MAPREDUCE-2916. Ivy build for MRv1 fails with bad organization for 
+   common daemon. (mahadev)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/ivy/ivysettings.xml b/hadoop-mapreduce-project/ivy/ivysettings.xml
index 7631ec9226c..ae606a221b5 100644
--- a/hadoop-mapreduce-project/ivy/ivysettings.xml
+++ b/hadoop-mapreduce-project/ivy/ivysettings.xml
@@ -39,11 +39,11 @@
   <settings defaultResolver="${resolvers}"/>
 
   <resolvers>
-    <ibiblio name="maven2" root="${repo.maven.org}" pattern="${maven2.pattern.ext}" m2compatible="true"/>
+    <ibiblio name="maven2" root="${repo.maven.org}" pattern="${maven2.pattern.ext}" m2compatible="true"  checkconsistency="false"/>
     <ibiblio name="apache-snapshot" root="${snapshot.apache.org}" m2compatible="true"
-        checkmodified="true" changingPattern=".*SNAPSHOT"/>
+        checkmodified="true" changingPattern=".*SNAPSHOT" checkconsistency="false"/>
 
-    <filesystem name="fs" m2compatible="true" force="${force-resolve}">
+    <filesystem name="fs" m2compatible="true" checkconsistency="false" force="${force-resolve}">
        <artifact pattern="${repo.dir}/${maven2.pattern.ext}"/>
        <ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
     </filesystem>