Author: shv
Date: Fri Sep 16 23:22:22 2011
New Revision: 1171853
URL: http://svn.apache.org/viewvc?rev=1171853&view=rev
Log:
MAPREDUCE-3025. Contribs not building. Contributed by Joep Rottinghuis.
Modified:
hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
hadoop/common/branches/branch-0.22/mapreduce/build.xml
hadoop/common/branches/branch-0.22/mapreduce/src/contrib/build.xml
Modified: hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt?rev=1171853&r1=1171852&r2=1171853&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt Fri Sep 16
23:22:22 2011
@@ -606,6 +606,8 @@ Release 0.22.0 - Unreleased
MAPREDUCE-2991. queueinfo.jsp fails to show queue status for Capacity
scheduler if queue names contain special symbols. (Priyo Mustafi via shv)
+ MAPREDUCE-3025. Contribs not building. (Joep Rottinghuis via shv)
+
Release 0.21.1 - Unreleased
NEW FEATURES
Modified: hadoop/common/branches/branch-0.22/mapreduce/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/build.xml?rev=1171853&r1=1171852&r2=1171853&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/build.xml (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/build.xml Fri Sep 16 23:22:22
2011
@@ -422,7 +422,6 @@
<property name="ivy_repo_url" value="${ivy_repo_url}"/>
<property name="offline" value="${offline}"/>
<property name="resolvers" value="${resolvers}"/>
- <property name="basedir" value="${basedir}"/>
<fileset file="${contrib.dir}/build.xml"/>
</subant>
</target>
@@ -799,7 +798,6 @@
<property name="ivy_repo_url" value="${ivy_repo_url}"/>
<property name="offline" value="${offline}"/>
<property name="resolvers" value="${resolvers}"/>
- <property name="basedir" value="${basedir}"/>
<fileset file="${contrib.dir}/build.xml"/>
</subant>
</target>
@@ -821,7 +819,6 @@
<property name="ivy_repo_url" value="${ivy_repo_url}"/>
<property name="offline" value="${offline}"/>
<property name="resolvers" value="${resolvers}"/>
- <property name="basedir" value="${basedir}"/>
<fileset file="${basedir}/build.xml"/>
</subant>
</target>
@@ -880,7 +877,6 @@
<property name="ivy_repo_url" value="${ivy_repo_url}"/>
<property name="offline" value="${offline}"/>
<property name="resolvers" value="${resolvers}"/>
- <property name="basedir" value="${basedir}"/>
<fileset file="${contrib.dir}/capacity-scheduler/build.xml"/>
<fileset file="${contrib.dir}/streaming/build.xml"/>
<fileset file="${contrib.dir}/gridmix/build.xml"/>
@@ -964,7 +960,6 @@
<property name="ivy_repo_url" value="${ivy_repo_url}"/>
<property name="offline" value="${offline}"/>
<property name="resolvers" value="${resolvers}"/>
- <property name="basedir" value="${basedir}"/>
<fileset file="${contrib.dir}/build.xml"/>
</subant>
</target>
@@ -1189,7 +1184,6 @@
<property name="ivy_repo_url" value="${ivy_repo_url}"/>
<property name="offline" value="${offline}"/>
<property name="resolvers" value="${resolvers}"/>
- <property name="basedir" value="${basedir}"/>
<fileset file="${contrib.dir}/build.xml"/>
</subant>
<subant target="package">
@@ -1202,7 +1196,6 @@
<property name="ivy_repo_url" value="${ivy_repo_url}"/>
<property name="offline" value="${offline}"/>
<property name="resolvers" value="${resolvers}"/>
- <property name="basedir" value="${basedir}"/>
<fileset file="${contrib.dir}/build.xml"/>
</subant>
@@ -1323,7 +1316,6 @@
<property name="ivy_repo_url" value="${ivy_repo_url}"/>
<property name="offline" value="${offline}"/>
<property name="resolvers" value="${resolvers}"/>
- <property name="basedir" value="${basedir}"/>
<fileset file="${contrib.dir}/build.xml"/>
</subant>
Modified: hadoop/common/branches/branch-0.22/mapreduce/src/contrib/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/src/contrib/build.xml?rev=1171853&r1=1171852&r2=1171853&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/src/contrib/build.xml
(original)
+++ hadoop/common/branches/branch-0.22/mapreduce/src/contrib/build.xml Fri Sep
16 23:22:22 2011
@@ -27,7 +27,16 @@
<!-- Compile contribs. -->
<!-- ====================================================== -->
<target name="compile">
- <subant target="compile" inheritAll="true">
+ <subant target="compile">
+ <property name="version" value="${version}"/>
+ <property name="dist.dir" value="${dist.dir}"/>
+ <property name="hadoop-version" value="${hadoop-common.version}"/>
+ <property name="clover.jar" value="${clover.jar}"/>
+ <property name="hadoop-common.version" value="${hadoop-common.version}"/>
+ <property name="hadoop-hdfs.version" value="${hadoop-hdfs.version}"/>
+ <property name="ivy_repo_url" value="${ivy_repo_url}"/>
+ <property name="offline" value="${offline}"/>
+ <property name="resolvers" value="${resolvers}"/>
<fileset dir="." includes="*/build.xml"/>
</subant>
</target>
@@ -36,7 +45,16 @@
<!-- Compile contrib test code. -->
<!-- ====================================================== -->
<target name="compile-test">
- <subant target="compile-test" inheritAll="true">
+ <subant target="compile-test">
+ <property name="version" value="${version}"/>
+ <property name="dist.dir" value="${dist.dir}"/>
+ <property name="hadoop-version" value="${hadoop-common.version}"/>
+ <property name="clover.jar" value="${clover.jar}"/>
+ <property name="hadoop-common.version" value="${hadoop-common.version}"/>
+ <property name="hadoop-hdfs.version" value="${hadoop-hdfs.version}"/>
+ <property name="ivy_repo_url" value="${ivy_repo_url}"/>
+ <property name="offline" value="${offline}"/>
+ <property name="resolvers" value="${resolvers}"/>
<fileset dir="." includes="*/build.xml"/>
</subant>
</target>
@@ -45,7 +63,16 @@
<!-- Package contrib jars. -->
<!-- ====================================================== -->
<target name="package">
- <subant target="package" inheritAll="true">
+ <subant target="package">
+ <property name="version" value="${version}"/>
+ <property name="dist.dir" value="${dist.dir}"/>
+ <property name="hadoop-version" value="${hadoop-common.version}"/>
+ <property name="clover.jar" value="${clover.jar}"/>
+ <property name="hadoop-common.version" value="${hadoop-common.version}"/>
+ <property name="hadoop-hdfs.version" value="${hadoop-hdfs.version}"/>
+ <property name="ivy_repo_url" value="${ivy_repo_url}"/>
+ <property name="offline" value="${offline}"/>
+ <property name="resolvers" value="${resolvers}"/>
<fileset dir="." includes="*/build.xml"/>
</subant>
</target>
@@ -81,19 +108,36 @@
<property name="build.contrib.dir"
location="${hadoop.root}/build/contrib"/>
<delete file="${build.contrib.dir}/testsfailed"/>
<subant target="test-system" inheritAll="true">
- <property name="continueOnFailure" value="true"/>
- <fileset dir="." includes="hdfsproxy/build.xml"/>
- <fileset dir="." includes="streaming/build.xml"/>
- <fileset dir="." includes="fairscheduler/build.xml"/>
- <fileset dir="." includes="capacity-scheduler/build.xml"/>
- <fileset dir="." includes="gridmix/build.xml"/>
+ <property name="continueOnFailure" value="true"/>
+ <property name="version" value="${version}"/>
+ <property name="hadoop-version" value="${hadoop-common.version}"/>
+ <property name="clover.jar" value="${clover.jar}"/>
+ <property name="hadoop-common.version"
value="${hadoop-common.version}"/>
+ <property name="hadoop-hdfs.version" value="${hadoop-hdfs.version}"/>
+ <property name="ivy_repo_url" value="${ivy_repo_url}"/>
+ <property name="offline" value="${offline}"/>
+ <property name="resolvers" value="${resolvers}"/>
+ <fileset dir="." includes="hdfsproxy/build.xml"/>
+ <fileset dir="." includes="streaming/build.xml"/>
+ <fileset dir="." includes="fairscheduler/build.xml"/>
+ <fileset dir="." includes="capacity-scheduler/build.xml"/>
+ <fileset dir="." includes="gridmix/build.xml"/>
</subant>
<available file="${build.contrib.dir}/testsfailed"
property="testsfailed"/>
<fail if="testsfailed">Tests failed!</fail>
</target>
<target name="docs">
- <subant target="docs" inheritAll="true">
+ <subant target="docs">
+ <property name="version" value="${version}"/>
+ <property name="dist.dir" value="${dist.dir}"/>
+ <property name="hadoop-version" value="${hadoop-common.version}"/>
+ <property name="clover.jar" value="${clover.jar}"/>
+ <property name="hadoop-common.version" value="${hadoop-common.version}"/>
+ <property name="hadoop-hdfs.version" value="${hadoop-hdfs.version}"/>
+ <property name="ivy_repo_url" value="${ivy_repo_url}"/>
+ <property name="offline" value="${offline}"/>
+ <property name="resolvers" value="${resolvers}"/>
<fileset dir="." includes="capacity-scheduler/build.xml"/>
</subant>
</target>
@@ -103,6 +147,15 @@
<!-- ====================================================== -->
<target name="clean">
<subant target="clean">
+ <property name="version" value="${version}"/>
+ <property name="dist.dir" value="${dist.dir}"/>
+ <property name="hadoop-version" value="${hadoop-common.version}"/>
+ <property name="clover.jar" value="${clover.jar}"/>
+ <property name="hadoop-common.version" value="${hadoop-common.version}"/>
+ <property name="hadoop-hdfs.version" value="${hadoop-hdfs.version}"/>
+ <property name="ivy_repo_url" value="${ivy_repo_url}"/>
+ <property name="offline" value="${offline}"/>
+ <property name="resolvers" value="${resolvers}"/>
<fileset dir="." includes="*/build.xml"/>
</subant>
</target>
