HDFS-2211. Build does not pass along properties to contrib builds. Contributed by Joep Rottinghuis.

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

hdfs/CHANGES.txt

@@ -600,6 +600,9 @@ Release 0.22.0 - Unreleased
     HDFS-2189. Add guava-r09 dependency to ivy/hadoop-hdfs-template.xml
     (Plamen Jeliazkov & Joep Rottinghuis via shv)
 
+    HDFS-2211. Build does not pass along properties to contrib builds (Joep
+    Rottinghuis via cos)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

hdfs/build.xml

@@ -371,6 +371,11 @@
   <target name="compile-contrib" depends="compile-core,compile-c++-libhdfs">
      <subant target="compile">
         <property name="version" value="${version}"/>
+        <!-- Need to pass along properties so that ivy in contrib build resolves correctly. -->
+        <property name="hadoop-common.version" value="${hadoop-common.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>
@@ -733,6 +738,10 @@
        <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="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>
@@ -749,6 +758,10 @@
 
   <target name="test" depends="test-c++-libhdfs, jar-test, test-core" description="Run all unit tests">
     <subant target="test-contrib">
+      <property name="hadoop-common.version" value="${hadoop-common.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>
@@ -997,6 +1010,10 @@
       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="ivy_repo_url" value="${ivy_repo_url}"/>
+      <property name="offline" value="${offline}"/>
+      <property name="resolvers" value="${resolvers}"/>
       <fileset file="${contrib.dir}/build.xml"/>
     </subant>  	
 

hdfs/src/contrib/build-contrib.xml

@@ -120,7 +120,7 @@
     <mkdir dir="${build.test}"/>
     <mkdir dir="${build.examples}"/>
     <mkdir dir="${hadoop.log.dir}"/>
-    <antcall target="init-contrib"/>
+    <antcall target="init-contrib" inheritAll="true"/>
   </target>
 
 

hdfs/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 @@
   <!-- Package contrib jars.                                  -->
   <!-- ====================================================== -->
   <target name="package">
-    <subant target="package">
+    <subant target="package" inheritAll="true">
       <fileset dir="." includes="*/build.xml"/>
     </subant>
   </target>
@@ -46,7 +46,7 @@
   <!-- ====================================================== -->
   <target name="test">
     <!-- hdfsproxy tests failing due to HDFS-1666
-    <subant target="test">
+    <subant target="test" inheritAll="true">
       <fileset dir="." includes="hdfsproxy/build.xml"/>
     </subant>
       -->
@@ -57,7 +57,7 @@
   <!-- Clean all the contribs.                              -->
   <!-- ====================================================== -->
   <target name="clean">
-    <subant target="clean">
+    <subant target="clean" inheritAll="true">
       <fileset dir="." includes="*/build.xml"/>
     </subant>
   </target>