Author: mahadev
Date: Mon Nov 21 20:58:43 2011
New Revision: 1204700
URL: http://svn.apache.org/viewvc?rev=1204700&view=rev
Log:
MAPREDUCE-3444. trunk/0.23 builds broken (Hitesh Shah via mahadev) - Merging
r1204698 from trunk
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/build.xml
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1204700&r1=1204699&r2=1204700&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Mon
Nov 21 20:58:43 2011
@@ -108,6 +108,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
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/build.xml?rev=1204700&r1=1204699&r2=1204700&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/build.xml
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/build.xml Mon
Nov 21 20:58:43 2011
@@ -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"
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml?rev=1204700&r1=1204699&r2=1204700&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml Mon Nov
21 20:58:43 2011
@@ -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"/>
