HADOOP-7259. Contrib modules should include the build.properties from

the enclosing hadoop directory. (omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1126801 13f79535-47bb-0310-9956-ffa450edef68

Author: omalley

CHANGES.txt

@@ -127,6 +127,9 @@ Trunk (unreleased changes)
 
     MAPREDUCE-2459. Cache HAR filesystem metadata. (Mac Yang via mahadev)
 
+    HADOOP-7259. Contrib modules should include the build.properties from
+    the enclosing hadoop directory. (omalley)
+
   OPTIMIZATIONS
 
     MAPREDUCE-2026. Make JobTracker.getJobCounters() and

src/contrib/build-contrib.xml

@@ -25,13 +25,14 @@
 
   <property name="name" value="${ant.project.name}"/>
   <property name="root" value="${basedir}"/>
+  <property name="hadoop.root" location="${root}/../../../"/>
 
   <!-- Load all the default properties, and any the user wants    -->
   <!-- to contribute (without having to type -D or edit this file -->
   <property file="${user.home}/${name}.build.properties" />
   <property file="${root}/build.properties" />
+  <property file="${hadoop.root}/build.properties" />
 
-  <property name="hadoop.root" location="${root}/../../../"/>
   <property name="src.dir"  location="${root}/src/java"/>
   <property name="src.test" location="${root}/src/test"/>
   <property name="src.test.data" location="${root}/src/test/data"/>