From 3ae9ee1005d4cfa87d59ab68d02fc7173e9471be Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Wed, 14 Dec 2011 17:24:18 +0000
Subject: [PATCH] Merge -r 1214353:1214354 from trunk to branch. FIXES:
 MAPREDUCE-3557

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

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index a54d4e0595e..45b5f086dd4 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -239,6 +239,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3544. gridmix build is broken, requires hadoop-archives to be 
     added as ivy dependency. (tucu)
 
+    MAPREDUCE-3557. MR1 test fail to compile because of missing hadoop-archives 
+    dependency. (tucu)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/ivy.xml b/hadoop-mapreduce-project/ivy.xml
index ee57f1af0e0..e9b38d077eb 100644
--- a/hadoop-mapreduce-project/ivy.xml
+++ b/hadoop-mapreduce-project/ivy.xml
@@ -99,6 +99,8 @@
                rev="${yarn.version}" conf="compile->default">
      <artifact name="hadoop-mapreduce-client-jobclient" type="tests" ext="jar" m:classifier="tests"/>
    </dependency>
+   <dependency org="org.apache.hadoop" name="hadoop-archives"
+               rev="${hadoop-common.version}" conf="compile->default"/>
 
    <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
                conf="checkstyle->default"/>