Author: shv
Date: Tue Sep 6 23:37:04 2011
New Revision: 1165931
URL: http://svn.apache.org/viewvc?rev=1165931&view=rev
Log:
HDFS-2315. Fix build-contrib to work with ant older than 1.8. Contributed by
Joep Rottinghuis.
Modified:
hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
hadoop/common/branches/branch-0.22/hdfs/build.xml
Modified: hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt?rev=1165931&r1=1165930&r2=1165931&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt Tue Sep 6 23:37:04 2011
@@ -613,6 +613,9 @@ Release 0.22.0 - Unreleased
HDFS-2297. ant should pass jvmargs to findbugs. (Joep Rottinghuis via shv)
+ HDFS-2315. Fix build-contrib to work with ant older than 1.8.
+ (Joep Rottinghuis via shv)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/common/branches/branch-0.22/hdfs/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/build.xml?rev=1165931&r1=1165930&r2=1165931&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/build.xml (original)
+++ hadoop/common/branches/branch-0.22/hdfs/build.xml Tue Sep 6 23:37:04 2011
@@ -379,6 +379,7 @@
<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>
@@ -745,6 +746,7 @@
<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>
@@ -765,6 +767,7 @@
<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>
@@ -1017,6 +1020,7 @@
<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>
@@ -1115,6 +1119,7 @@
distribution directory so contribs know where to install to.-->
<property name="version" value="${version}"/>
<property name="dist.dir" value="${dist.dir}"/>
+ <property name="basedir" value="${basedir}"/>
<fileset file="${contrib.dir}/build.xml"/>
</subant>
@@ -1285,7 +1290,8 @@
<!-- Using subant instead of ant as a workaround for 30569 -->
<!-- ================================================================== -->
<target name="clean-contrib">
- <subant target="clean">
+ <subant target="clean">
+ <property name="basedir" value="${basedir}"/>
<fileset file="src/contrib/build.xml"/>
</subant>
</target>
