svn commit: r1234227 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt build.xml ivy.xml src/contrib/gridmix/ivy.xml src/test/mapred/org/apache/hadoop/tools/rumen/

[ma...@apache.org]

Author: mahadev
Date: Sat Jan 21 01:15:24 2012
New Revision: 1234227

URL: http://svn.apache.org/viewvc?rev=1234227&view=rev
Log:
MAPREDUCE-3705. ant build fails on 0.23 branch. (Thomas Graves via mahadev)

Removed:
    hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/
Modified:
    hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/trunk/hadoop-mapreduce-project/build.xml
    hadoop/common/trunk/hadoop-mapreduce-project/ivy.xml
    hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1234227&r1=1234226&r2=1234227&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Sat Jan 21 01:15:24 2012
@@ -526,6 +526,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3549. write api documentation for web service apis for RM, NM, 
     mapreduce app master, and job history server (Thomas Graves via mahadev)
 
+    MAPREDUCE-3705. ant build fails on 0.23 branch. (Thomas Graves via 
+    mahadev)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/trunk/hadoop-mapreduce-project/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/build.xml?rev=1234227&r1=1234226&r2=1234227&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/build.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/build.xml Sat Jan 21 01:15:24 2012
@@ -575,8 +575,6 @@
      <copy file="${test.src.dir}/mapred/org/apache/hadoop/mapred/test.tar" todir="${test.cache.data}"/>
      <copy file="${test.src.dir}/mapred/org/apache/hadoop/mapred/test.tgz" todir="${test.cache.data}"/>
      <copy file="${test.src.dir}/mapred/org/apache/hadoop/mapred/test.tar.gz" todir="${test.cache.data}"/>
-     <copy file="${test.src.dir}/mapred/org/apache/hadoop/cli/testMRConf.xml" todir="${test.cache.data}"/>
-     <copy file="${test.src.dir}/mapred/org/apache/hadoop/cli/data60bytes" todir="${test.cache.data}"/>
      <copy file="${test.src.dir}/mapred/org/apache/hadoop/mapred/concat.bz2" todir="${test.concat.data}"/>
      <copy file="${test.src.dir}/mapred/org/apache/hadoop/mapred/concat.gz" todir="${test.concat.data}"/>
      <copy file="${test.src.dir}/mapred/org/apache/hadoop/mapred/testCompressThenConcat.txt.bz2" todir="${test.concat.data}"/>

Modified: hadoop/common/trunk/hadoop-mapreduce-project/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/ivy.xml?rev=1234227&r1=1234226&r2=1234227&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/ivy.xml Sat Jan 21 01:15:24 2012
@@ -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-rumen" 
+               rev="${hadoop-common.version}" conf="compile->default"/> 
    <dependency org="org.apache.hadoop" name="hadoop-archives"
                rev="${hadoop-common.version}" conf="compile->default"/>
 

Modified: hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml?rev=1234227&r1=1234226&r2=1234227&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml Sat Jan 21 01:15:24 2012
@@ -70,6 +70,8 @@
    </dependency>
    <dependency org="org.apache.hadoop" name="hadoop-archives" 
                rev="${hadoop-common.version}" conf="common->default"/> 
+   <dependency org="org.apache.hadoop" name="hadoop-rumen" 
+               rev="${hadoop-common.version}" conf="common->default"/> 
    <dependency org="commons-logging"
       name="commons-logging"
       rev="${commons-logging.version}"