From 38fea39be7e4a291c1c90266910878313e5cdaf9 Mon Sep 17 00:00:00 2001
From: Mahadev Konar <mahadev@apache.org>
Date: Mon, 21 Nov 2011 20:57:03 +0000
Subject: [PATCH] MAPREDUCE-3444. trunk/0.23 builds broken (Hitesh Shah via
 mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204698 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt |  2 ++
 hadoop-mapreduce-project/build.xml   | 11 -----------
 hadoop-mapreduce-project/ivy.xml     | 11 +++++------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 87b2e261e6..2ee9c405ea 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -157,6 +157,8 @@ Release 0.23.1 - Unreleased
 
     MAPREDUCE-3447. mapreduce examples not working (mahadev)
 
+    MAPREDUCE-3444. trunk/0.23 builds broken (Hitesh Shah via mahadev)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/build.xml b/hadoop-mapreduce-project/build.xml
index 16f02a3742..a8b4618268 100644
--- a/hadoop-mapreduce-project/build.xml
+++ b/hadoop-mapreduce-project/build.xml
@@ -867,7 +867,6 @@
    <subant target="jar">
       <property name="version" value="${version}"/>
       <property name="dist.dir" value="${dist.dir}"/>
-      <fileset file="${contrib.dir}/streaming/build.xml"/>
       <fileset file="${contrib.dir}/gridmix/build.xml"/>
     </subant>
  </target>
@@ -897,12 +896,10 @@
       <sourcePath path="${mapred.src.dir}"/>
       <sourcePath path="${examples.dir}" />
       <sourcePath path="${tools.src}" />
-      <sourcePath path="${basedir}/src/contrib/streaming/src/java" />
       <sourcePath path="${basedir}/src/contrib/gridmix/src/java" />
       <class location="${basedir}/build/${final.name}.jar" />
       <class location="${basedir}/build/${examples.final.name}.jar" />
       <class location="${basedir}/build/${tools.final.name}.jar" />
-      <class location="${basedir}/build/contrib/streaming/hadoop-${version}-streaming.jar" />
       <class location="${basedir}/build/contrib/gridmix/hadoop-${version}-gridmix.jar" />
     </findbugs>
 
@@ -962,7 +959,6 @@
        <packageset dir="src/contrib/data_join/src/java"/>
        <packageset dir="src/contrib/gridmix/src/java"/>
        <packageset dir="src/contrib/index/src/java"/>
-       <packageset dir="src/contrib/streaming/src/java"/>
        <packageset dir="src/contrib/vaidya/src/java"/>
        <packageset dir="src/contrib/vertica/src/java"/>
 
@@ -987,7 +983,6 @@
        <group title="contrib: DataJoin" packages="org.apache.hadoop.contrib.utils.join*"/>
        <group title="contrib: Gridmix" packages="org.apache.hadoop.mapred.gridmix*"/>
        <group title="contrib: Index" packages="org.apache.hadoop.contrib.index*"/>
-       <group title="contrib: Streaming" packages="org.apache.hadoop.streaming*:org.apache.hadoop.typedbytes*"/>
        <group title="contrib: Vaidya" packages="org.apache.hadoop.vaidya*"/>
        <group title="contrib: Vertica" packages="org.apache.hadoop.vertica*"/>
     </javadoc>
@@ -1026,7 +1021,6 @@
        <packageset dir="src/contrib/data_join/src/java"/>
        <packageset dir="src/contrib/gridmix/src/java"/>
        <packageset dir="src/contrib/index/src/java"/>
-       <packageset dir="src/contrib/streaming/src/java"/>
        <packageset dir="src/contrib/vaidya/src/java"/>
        <packageset dir="src/contrib/vertica/src/java"/>
        <packageset dir="${tools.src}"/>
@@ -1052,7 +1046,6 @@
        <group title="contrib: DataJoin" packages="org.apache.hadoop.contrib.utils.join*"/>
        <group title="contrib: Gridmix" packages="org.apache.hadoop.mapred.gridmix*"/>
        <group title="contrib: Index" packages="org.apache.hadoop.contrib.index*"/>
-       <group title="contrib: Streaming" packages="org.apache.hadoop.streaming*:org.apache.hadoop.typedbytes*"/>
        <group title="contrib: Vaidya" packages="org.apache.hadoop.vaidya*"/>
        <group title="contrib: Vertica" packages="org.apache.hadoop.vertica*"/>
 
@@ -1792,10 +1785,6 @@
                 output="${build.dir.eclipse-contrib-classes}/raid/main" />
         <source path="${contrib.dir}/raid/src/test"
                 output="${build.dir.eclipse-contrib-classes}/raid/test" />
-        <source path="${contrib.dir}/streaming/src/java"
-                output="${build.dir.eclipse-contrib-classes}/streaming/main" />
-        <source path="${contrib.dir}/streaming/src/test"
-                output="${build.dir.eclipse-contrib-classes}/streaming/test" />
         <source path="${contrib.dir}/vaidya/src/java"
                 output="${build.dir.eclipse-contrib-classes}/vaidya/main" />
         <source path="${contrib.dir}/vertica/src/java"
diff --git a/hadoop-mapreduce-project/ivy.xml b/hadoop-mapreduce-project/ivy.xml
index f886bfa3f5..ee57f1af0e 100644
--- a/hadoop-mapreduce-project/ivy.xml
+++ b/hadoop-mapreduce-project/ivy.xml
@@ -91,15 +91,14 @@
                rev="${yarn.version}" conf="compile->default"/>
    <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
                rev="${yarn.version}" conf="compile->default"/>
+   <dependency org="org.apache.hadoop" name="hadoop-mapreduce-examples"
+               rev="${yarn.version}" conf="compile->default"/>
    <dependency org="log4j" name="log4j" rev="${log4j.version}" 
                conf="compile->master"/>
-
-   <!--
-   <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
-               rev="${yarn.version}" conf="test->default">
-     <artifact name="hadoop-yarn-common" type="jar" ext="jar" classifier="tests"/>
+   <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient"
+               rev="${yarn.version}" conf="compile->default">
+     <artifact name="hadoop-mapreduce-client-jobclient" type="tests" ext="jar" m:classifier="tests"/>
    </dependency>
-   -->
 
    <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
                conf="checkstyle->default"/>