MAPREDUCE-2752. Build does not pass along properties to contrib builds. Contribured by Joep Rottinghuis.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1154805 13f79535-47bb-0310-9956-ffa450edef68

mapreduce/CHANGES.txt

@@ -590,6 +590,9 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-2127. mapreduce trunk builds are filing on hudson.
     (Bruno Mahé via eli)
 
+    MAPREDUCE-2752. Build does not pass along properties to contrib builds.
+    (Joep Rottinghuis via cos)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

mapreduce/build.xml

@@ -432,6 +432,10 @@
      <subant target="compile">
         <property name="version" value="${version}"/>
         <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 file="${contrib.dir}/build.xml"/>
      </subant>  	
   </target>
@@ -615,7 +619,7 @@
     <copy todir="${test.build.classes}">
       <fileset dir="${test.mapred.build.classes}"/>
     </copy>
-    <subant buildpath="build.xml" target="-do-jar-test"/>
+    <subant buildpath="build.xml" target="-do-jar-test" inheritAll="true"/>
     <jar jarfile="${hadoop-mapred-test-sources.jar}">
       <fileset dir="${test.src.dir}/mapred" includes="org/apache/hadoop/**/*.java" />
       <fileset dir="${test.src.dir}/unit" includes="org/apache/hadoop/**/*.java" />
@@ -737,7 +741,7 @@
             includes="**/${testcase}.java"/>
         </batchtest>
       </junit>
-      <antcall target="checkfailure"/>
+      <antcall target="checkfailure" inheritAll="true"/>
     </sequential>
   </macrodef>
 
@@ -805,6 +809,11 @@
     <subant target="test">
        <property name="version" value="${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 file="${contrib.dir}/build.xml"/>
     </subant> 
   </target>
@@ -812,13 +821,20 @@
   <target name="test-core" description="Run core, hdfs and mapred unit tests">
     <delete file="${test.build.dir}/testsfailed"/>
     <property name="continueOnFailure" value="true"/>
-    <antcall target="run-test-mapred"/>
+    <antcall target="run-test-mapred" inheritAll="true"/>
     <available file="${test.build.dir}/testsfailed" property="testsfailed"/>
     <fail if="testsfailed">Tests failed!</fail>
   </target>
 
   <target name="test" depends="jar-test, test-core" description="Run all unit tests">
     <subant target="test-contrib">
+      <property name="version" value="${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 file="${basedir}/build.xml"/>
      </subant>
   </target>
@@ -828,6 +844,13 @@
     <antcall target="test">
       <param name="test.include" value="*"/>
       <param name="test.classpath.id" value="test.cluster.classpath"/>
+      <param name="version" value="${version}"/>
+      <param name="clover.jar" value="${clover.jar}"/>
+      <param name="hadoop-common.version" value="${hadoop-common.version}"/>
+      <param name="hadoop-hdfs.version" value="${hadoop-hdfs.version}"/>
+      <param name="ivy_repo_url" value="${ivy_repo_url}"/>
+      <param name="offline" value="${offline}"/>
+      <param name="resolvers" value="${resolvers}"/>
     </antcall>
   </target>
 
@@ -865,6 +888,11 @@
    <subant target="jar">
       <property name="version" value="${version}"/>
       <property name="dist.dir" value="${dist.dir}"/>
+      <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 file="${contrib.dir}/capacity-scheduler/build.xml"/>
       <fileset file="${contrib.dir}/streaming/build.xml"/>
       <fileset file="${contrib.dir}/gridmix/build.xml"/>
@@ -938,9 +966,16 @@
     <copy file="${docs.src}/releasenotes.html" todir="${build.docs}"/>
     <style basedir="${mapred.src.dir}" destdir="${build.docs}"
            includes="mapred-default.xml" style="conf/configuration.xsl"/>
-    <antcall target="changes-to-html"/>
+    <antcall target="changes-to-html" inheritAll="true"/>
     <subant target="docs">
        <property name="build.docs" value="${build.docs}"/>
+       <property name="version" value="${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 file="${contrib.dir}/build.xml"/>
     </subant> 
   </target>
@@ -1160,6 +1195,11 @@
       distribution directory so contribs know where to install to.-->
       <property name="version" value="${version}"/>
       <property name="dist.dir" value="${dist.dir}"/>
+      <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 file="${contrib.dir}/build.xml"/>
     </subant>  	
     <subant target="package">
@@ -1167,6 +1207,11 @@
       distribution directory so contribs know where to install to.-->
       <property name="version" value="${version}"/>
       <property name="dist.dir" value="${dist.dir}"/>
+      <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 file="${contrib.dir}/build.xml"/>
     </subant>  	
 
@@ -1283,6 +1328,13 @@
       distribution directory so contribs know where to install to.-->
       <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 file="${contrib.dir}/build.xml"/>
     </subant>  	
 
@@ -1751,7 +1803,7 @@
 
   <target name="create-c++-utils-makefile" depends="check-c++-makefiles" 
                                            if="need.c++.utils.makefile">
-    <antcall target="create-c++-utils-configure"/>
+    <antcall target="create-c++-utils-configure" inheritAll="true"/>
     <mkdir dir="${build.c++.utils}"/>
     <chmod file="${c++.utils.src}/configure" perm="ugo+x"/>
     <exec executable="${c++.utils.src}/configure" dir="${build.c++.utils}"
@@ -1770,7 +1822,7 @@
 
   <target name="create-c++-pipes-makefile" depends="check-c++-makefiles" 
                                            if="need.c++.pipes.makefile">
-    <antcall target="create-c++-pipes-configure"/>
+    <antcall target="create-c++-pipes-configure" inheritAll="true"/>
     <mkdir dir="${build.c++.pipes}"/>
     <chmod file="${c++.pipes.src}/configure" perm="ugo+x"/>
     <exec executable="${c++.pipes.src}/configure" dir="${build.c++.pipes}"
@@ -1794,7 +1846,7 @@
   <target name="create-c++-examples-pipes-makefile" 
           depends="check-c++-makefiles" 
           if="need.c++.examples.pipes.makefile">
-    <antcall target="create-c++-examples-pipes-configure"/>
+    <antcall target="create-c++-examples-pipes-configure" inheritAll="true"/>
     <mkdir dir="${build.c++.examples.pipes}"/>
     <chmod file="${c++.examples.pipes.src}/configure" perm="ugo+x"/>
     <exec executable="${c++.examples.pipes.src}/configure" 
@@ -2175,7 +2227,7 @@
 
   <!-- taskcontroller targets -->
   <target name="init-task-controller-build">
-    <antcall target="create-c++-task-controller-configure"/>
+    <antcall target="create-c++-task-controller-configure" inheritAll="true"/>
     <mkdir dir="${build.c++.task-controller}" />
     <copy todir="${build.c++.task-controller}">
       <fileset dir="${c++.task-controller.src}" includes="*.c"/>

mapreduce/src/contrib/build-contrib.xml

@@ -174,7 +174,7 @@
     <!-- The below two tags  added for contrib system tests -->
     <mkdir dir="${build.test.system}"/>
     <mkdir dir="${build.system.classes}"/> 
-    <antcall target="init-contrib"/>
+    <antcall target="init-contrib" inheritAll="true"/>
   </target>
 
 
@@ -333,7 +333,7 @@
         <fileset dir="${src.test}" includes="**/${testcase}.java" excludes="system/**/*.java" />
       </batchtest>
     </junit>
-    <antcall target="checkfailure"/>
+    <antcall target="checkfailure" inheritAll="true"/>
   </target>
 
   <!-- ================================================================== -->
@@ -450,7 +450,7 @@
           <fileset dir="@{fileset.dir}" includes="**/${testcase}.java"/>
         </batchtest>
       </junit>
-      <antcall target="checkfailure"/>
+      <antcall target="checkfailure" inheritAll="true"/>
     </sequential>
   </macrodef>
 

mapreduce/src/contrib/build.xml

@@ -27,7 +27,7 @@
   <!-- Compile contribs.                                      -->
   <!-- ====================================================== -->
   <target name="compile">
-    <subant target="compile">
+    <subant target="compile" inheritAll="true">
       <fileset dir="." includes="*/build.xml"/>
     </subant>
   </target>
@@ -36,7 +36,7 @@
   <!-- Compile contrib test code.                             -->
   <!-- ====================================================== -->
   <target name="compile-test">
-    <subant target="compile-test">
+    <subant target="compile-test" inheritAll="true">
       <fileset dir="." includes="*/build.xml"/>
     </subant>
   </target>
@@ -45,7 +45,7 @@
   <!-- Package contrib jars.                                  -->
   <!-- ====================================================== -->
   <target name="package">
-    <subant target="package">
+    <subant target="package" inheritAll="true">
       <fileset dir="." includes="*/build.xml"/>
     </subant>
   </target>
@@ -57,7 +57,7 @@
       <property name="hadoop.root" location="${root}/../../../"/>
       <property name="build.contrib.dir" location="${hadoop.root}/build/contrib"/>
       <delete file="${build.contrib.dir}/testsfailed"/>
-    <subant target="test">
+    <subant target="test" inheritAll="true">
       <property name="continueOnFailure" value="true"/>
       <fileset dir="." includes="streaming/build.xml"/> 
       <fileset dir="." includes="fairscheduler/build.xml"/> 
@@ -80,12 +80,8 @@
       <property name="hadoop.root" location="${root}/../../../"/>
       <property name="build.contrib.dir" location="${hadoop.root}/build/contrib"/>
       <delete file="${build.contrib.dir}/testsfailed"/>
-      <subant target="test-system">
+      <subant target="test-system" inheritAll="true">
           <property name="continueOnFailure" value="true"/>
-          <property name="hadoop.home" value="${hadoop.home}"/>
-          <property name="hadoop.conf.dir" value="${hadoop.conf.dir}"/>
-          <property name="hadoop.conf.dir.deployed"
-               value="${hadoop.conf.dir.deployed}"/>
           <fileset dir="." includes="hdfsproxy/build.xml"/>
           <fileset dir="." includes="streaming/build.xml"/>
           <fileset dir="." includes="fairscheduler/build.xml"/>
@@ -97,7 +93,7 @@
   </target>
 
   <target name="docs">
-    <subant target="docs">
+    <subant target="docs" inheritAll="true">
       <fileset dir="." includes="capacity-scheduler/build.xml"/> 
     </subant>
   </target>