You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sh...@apache.org on 2011/09/17 01:40:11 UTC
svn commit: r1171857 - in /hadoop/common/branches/branch-0.22/hdfs:
CHANGES.txt build.xml src/contrib/build.xml
Author: shv
Date: Fri Sep 16 23:40:11 2011
New Revision: 1171857
URL: http://svn.apache.org/viewvc?rev=1171857&view=rev
Log:
HDFS-2341. Contribs not building. Contributed by Joep Rottinghuis.
Modified:
hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
hadoop/common/branches/branch-0.22/hdfs/build.xml
hadoop/common/branches/branch-0.22/hdfs/src/contrib/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=1171857&r1=1171856&r2=1171857&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt Fri Sep 16 23:40:11 2011
@@ -626,6 +626,8 @@ Release 0.22.0 - Unreleased
HDFS-2271. startJournalSpool should invoke processIOError.
(Uma Maheswara Rao G via shv)
+ HDFS-2341. Contribs not building. (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=1171857&r1=1171856&r2=1171857&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/build.xml (original)
+++ hadoop/common/branches/branch-0.22/hdfs/build.xml Fri Sep 16 23:40:11 2011
@@ -375,11 +375,12 @@
<subant target="compile">
<property name="version" value="${version}"/>
<!-- Need to pass along properties so that ivy in contrib build resolves correctly. -->
+ <property name="hadoop-version" value="${hadoop-common.version}"/>
<property name="hadoop-common.version" value="${hadoop-common.version}"/>
+ <property name="clover.jar" value="${clover.jar}"/>
<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>
@@ -746,7 +747,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>
@@ -767,7 +767,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>
@@ -1020,7 +1019,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>
@@ -1119,7 +1117,13 @@
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}"/>
+ <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>
@@ -1291,7 +1295,13 @@
<!-- ================================================================== -->
<target name="clean-contrib">
<subant target="clean">
- <property name="basedir" value="${basedir}"/>
+ <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="src/contrib/build.xml"/>
</subant>
</target>
Modified: hadoop/common/branches/branch-0.22/hdfs/src/contrib/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/src/contrib/build.xml?rev=1171857&r1=1171856&r2=1171857&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/src/contrib/build.xml (original)
+++ hadoop/common/branches/branch-0.22/hdfs/src/contrib/build.xml Fri Sep 16 23:40:11 2011
@@ -27,7 +27,14 @@
<!-- Compile contribs. -->
<!-- ====================================================== -->
<target name="compile">
- <subant target="compile" inheritAll="true">
+ <subant target="compile">
+ <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 dir="." includes="*/build.xml"/>
</subant>
</target>
@@ -37,6 +44,13 @@
<!-- ====================================================== -->
<target name="package">
<subant target="package" inheritAll="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="ivy_repo_url" value="${ivy_repo_url}"/>
+ <property name="offline" value="${offline}"/>
+ <property name="resolvers" value="${resolvers}"/>
<fileset dir="." includes="*/build.xml"/>
</subant>
</target>
@@ -47,6 +61,13 @@
<target name="test">
<!-- hdfsproxy tests failing due to HDFS-1666
<subant target="test" inheritAll="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="ivy_repo_url" value="${ivy_repo_url}"/>
+ <property name="offline" value="${offline}"/>
+ <property name="resolvers" value="${resolvers}"/>
<fileset dir="." includes="hdfsproxy/build.xml"/>
</subant>
-->
@@ -58,6 +79,13 @@
<!-- ====================================================== -->
<target name="clean">
<subant target="clean" inheritAll="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="ivy_repo_url" value="${ivy_repo_url}"/>
+ <property name="offline" value="${offline}"/>
+ <property name="resolvers" value="${resolvers}"/>
<fileset dir="." includes="*/build.xml"/>
</subant>
</target>