big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-3444. trunk/0.23 builds broken (Hitesh Shah via mahadev)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204698 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mahadev Konar 2011-11-21 20:57:03 +00:00
parent 6ee82eefa8
commit 38fea39be7
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -157,6 +157,8 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3447. mapreduce examples not working (mahadev) 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 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

11
hadoop-mapreduce-project/build.xml
View File

@ -867,7 +867,6 @@
<subant target="jar"> <subant target="jar">
<property name="version" value="${version}"/> <property name="version" value="${version}"/>
<property name="dist.dir" value="${dist.dir}"/> <property name="dist.dir" value="${dist.dir}"/>
<fileset file="${contrib.dir}/streaming/build.xml"/>
<fileset file="${contrib.dir}/gridmix/build.xml"/> <fileset file="${contrib.dir}/gridmix/build.xml"/>
</subant> </subant>
</target> </target>
@ -897,12 +896,10 @@
<sourcePath path="${mapred.src.dir}"/> <sourcePath path="${mapred.src.dir}"/>
<sourcePath path="${examples.dir}" /> <sourcePath path="${examples.dir}" />
<sourcePath path="${tools.src}" /> <sourcePath path="${tools.src}" />
<sourcePath path="${basedir}/src/contrib/streaming/src/java" />
<sourcePath path="${basedir}/src/contrib/gridmix/src/java" /> <sourcePath path="${basedir}/src/contrib/gridmix/src/java" />
<class location="${basedir}/build/${final.name}.jar" /> <class location="${basedir}/build/${final.name}.jar" />
<class location="${basedir}/build/${examples.final.name}.jar" /> <class location="${basedir}/build/${examples.final.name}.jar" />
<class location="${basedir}/build/${tools.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" /> <class location="${basedir}/build/contrib/gridmix/hadoop-${version}-gridmix.jar" />
</findbugs> </findbugs>
@ -962,7 +959,6 @@
<packageset dir="src/contrib/data_join/src/java"/> <packageset dir="src/contrib/data_join/src/java"/>
<packageset dir="src/contrib/gridmix/src/java"/> <packageset dir="src/contrib/gridmix/src/java"/>
<packageset dir="src/contrib/index/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/vaidya/src/java"/>
<packageset dir="src/contrib/vertica/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: DataJoin" packages="org.apache.hadoop.contrib.utils.join*"/>
<group title="contrib: Gridmix" packages="org.apache.hadoop.mapred.gridmix*"/> <group title="contrib: Gridmix" packages="org.apache.hadoop.mapred.gridmix*"/>
<group title="contrib: Index" packages="org.apache.hadoop.contrib.index*"/> <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: Vaidya" packages="org.apache.hadoop.vaidya*"/>
<group title="contrib: Vertica" packages="org.apache.hadoop.vertica*"/> <group title="contrib: Vertica" packages="org.apache.hadoop.vertica*"/>
</javadoc> </javadoc>
@ -1026,7 +1021,6 @@
<packageset dir="src/contrib/data_join/src/java"/> <packageset dir="src/contrib/data_join/src/java"/>
<packageset dir="src/contrib/gridmix/src/java"/> <packageset dir="src/contrib/gridmix/src/java"/>
<packageset dir="src/contrib/index/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/vaidya/src/java"/>
<packageset dir="src/contrib/vertica/src/java"/> <packageset dir="src/contrib/vertica/src/java"/>
<packageset dir="${tools.src}"/> <packageset dir="${tools.src}"/>
@ -1052,7 +1046,6 @@
<group title="contrib: DataJoin" packages="org.apache.hadoop.contrib.utils.join*"/> <group title="contrib: DataJoin" packages="org.apache.hadoop.contrib.utils.join*"/>
<group title="contrib: Gridmix" packages="org.apache.hadoop.mapred.gridmix*"/> <group title="contrib: Gridmix" packages="org.apache.hadoop.mapred.gridmix*"/>
<group title="contrib: Index" packages="org.apache.hadoop.contrib.index*"/> <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: Vaidya" packages="org.apache.hadoop.vaidya*"/>
<group title="contrib: Vertica" packages="org.apache.hadoop.vertica*"/> <group title="contrib: Vertica" packages="org.apache.hadoop.vertica*"/>
@ -1792,10 +1785,6 @@
output="${build.dir.eclipse-contrib-classes}/raid/main" /> output="${build.dir.eclipse-contrib-classes}/raid/main" />
<source path="${contrib.dir}/raid/src/test" <source path="${contrib.dir}/raid/src/test"
output="${build.dir.eclipse-contrib-classes}/raid/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" <source path="${contrib.dir}/vaidya/src/java"
output="${build.dir.eclipse-contrib-classes}/vaidya/main" /> output="${build.dir.eclipse-contrib-classes}/vaidya/main" />
<source path="${contrib.dir}/vertica/src/java" <source path="${contrib.dir}/vertica/src/java"

11
hadoop-mapreduce-project/ivy.xml
View File

@ -91,15 +91,14 @@
rev="${yarn.version}" conf="compile->default"/> rev="${yarn.version}" conf="compile->default"/>
<dependency org="org.apache.hadoop" name="hadoop-yarn-common" <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
rev="${yarn.version}" conf="compile->default"/> 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}" <dependency org="log4j" name="log4j" rev="${log4j.version}"
conf="compile->master"/> conf="compile->master"/>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient"
<!-- rev="${yarn.version}" conf="compile->default">
<dependency org="org.apache.hadoop" name="hadoop-yarn-common" <artifact name="hadoop-mapreduce-client-jobclient" type="tests" ext="jar" m:classifier="tests"/>
rev="${yarn.version}" conf="test->default">
<artifact name="hadoop-yarn-common" type="jar" ext="jar" classifier="tests"/>
</dependency> </dependency>
-->
<dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}" <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
conf="checkstyle->default"/> conf="checkstyle->default"/>