You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2011/02/10 08:45:51 UTC
svn commit: r1069255 - in /hadoop/mapreduce/trunk: CHANGES.txt build.xml
Author: todd
Date: Thu Feb 10 07:45:51 2011
New Revision: 1069255
URL: http://svn.apache.org/viewvc?rev=1069255&view=rev
Log:
MAPREDUCE-2315. javadoc is failing in nightly build. Contributed by Todd Lipcon
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/build.xml
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1069255&r1=1069254&r2=1069255&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Thu Feb 10 07:45:51 2011
@@ -556,6 +556,8 @@ Release 0.22.0 - Unreleased
MAPREDUCE-2285. MiniMRCluster does not start after ant test-patch
(todd)
+ MAPREDUCE-2315. javadoc is failing in nightly build (todd)
+
Release 0.21.1 - Unreleased
NEW FEATURES
Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=1069255&r1=1069254&r2=1069255&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Thu Feb 10 07:45:51 2011
@@ -1054,14 +1054,14 @@
<group title="contrib: Index" packages="org.apache.hadoop.contrib.index*"/>
<group title="contrib: Streaming" packages="org.apache.hadoop.streaming*:org.apache.hadoop.typedbytes*"/>
<doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsStandardDoclet"
- path="${common.ivy.lib.dir}/hadoop-common-${version}.jar"/>
+ path="${common.ivy.lib.dir}/hadoop-common-${hadoop-common.version}.jar"/>
</javadoc>
</target>
<target name="api-xml" depends="ivy-retrieve-jdiff,javadoc,write-null">
<javadoc maxmemory="${javadoc.maxmemory}">
<doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet"
- path="${common.ivy.lib.dir}/hadoop-common-${version}.jar:${jdiff.jar}:${xerces.jar}">
+ path="${common.ivy.lib.dir}/hadoop-common-${hadoop-common.version}.jar:${jdiff.jar}:${xerces.jar}">
<param name="-apidir" value="${jdiff.xml.dir}"/>
<param name="-apiname" value="hadoop-mapred ${version}"/>
<param name="${jdiff.stability}"/>
@@ -1089,7 +1089,7 @@
sourceFiles="${jdiff.home}/Null.java"
maxmemory="${javadoc.maxmemory}">
<doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet"
- path="${common.ivy.lib.dir}/hadoop-common-${version}.jar:${jdiff.jar}:${xerces.jar}">
+ path="${common.ivy.lib.dir}/hadoop-common-${hadoop-common.version}.jar:${jdiff.jar}:${xerces.jar}">
<param name="-oldapi" value="hadoop-mapred ${jdiff.stable}"/>
<param name="-newapi" value="hadoop-mapred ${version}"/>
<param name="-oldapidir" value="${jdiff.xml.dir}"/>
@@ -1318,8 +1318,8 @@
<include name="${examples.final.name}.jar"/>
</fileset>
</copy>
- <copy tofile="${system-test-build-dir}/${final.name}/lib/hadoop-common-${version}.jar"
- file="${system-test-build-dir}/ivy/lib/${ant.project.name}/system/hadoop-common-${herriot.suffix}-${version}.jar"
+ <copy tofile="${system-test-build-dir}/${final.name}/lib/hadoop-common-${hadoop-common.version}.jar"
+ file="${system-test-build-dir}/ivy/lib/${ant.project.name}/system/hadoop-common-${herriot.suffix}-${hadoop-common.version}.jar"
overwrite="true"/>
<copy tofile="${system-test-build-dir}/${final.name}/lib/hadoop-hdfs-${version}.jar"
file="${system-test-build-dir}/ivy/lib/${ant.project.name}/system/hadoop-hdfs-${herriot.suffix}-${version}.jar"