You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 04:47:52 UTC
svn commit: r1077165 -
/hadoop/common/branches/branch-0.20-security-patches/build.xml
Author: omalley
Date: Fri Mar 4 03:47:51 2011
New Revision: 1077165
URL: http://svn.apache.org/viewvc?rev=1077165&view=rev
Log:
commit afec7664190f29053f3a6ca4a082767bc664e153
Author: Yahoo\! <lt...@yahoo-inc.com>
Date: Fri Feb 12 09:05:10 2010 -0800
HADOOP:6382 patched from https://issues.apache.org/jira/secure/attachment/12434978/HADOOP-6382-findbugs.patch to correct 2 locations where jar file naming convention wasn't correctly changed.
Cherry Picked from 0.20.100 by ltucker
Modified:
hadoop/common/branches/branch-0.20-security-patches/build.xml
Modified: hadoop/common/branches/branch-0.20-security-patches/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/build.xml?rev=1077165&r1=1077164&r2=1077165&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/build.xml Fri Mar 4 03:47:51 2011
@@ -1001,10 +1001,10 @@
<sourcePath path="${examples.dir}" />
<sourcePath path="${tools.src}" />
<sourcePath path="${basedir}/src/contrib/streaming/src/java" />
- <class location="${basedir}/build/${final.name}-core.jar" />
- <class location="${basedir}/build/${final.name}-examples.jar" />
- <class location="${basedir}/build/${final.name}-tools.jar" />
- <class location="${basedir}/build/contrib/streaming/${final.name}-streaming.jar" />
+ <class location="${build.dir}/${core.final.name}.jar" />
+ <class location="${build.dir}/${examples.final.name}.jar" />
+ <class location="${build.dir}/${tools.final.name}.jar" />
+ <class location="${build.dir}/contrib/streaming/${streaming.final.name}.jar" />
</findbugs>
<xslt style="${findbugs.home}/src/xsl/default.xsl"
@@ -1256,7 +1256,7 @@
</copy>
<copy todir="${dist.dir}">
- <fileset file="${build.dir}/${final.name}-*.jar"/>
+ <fileset file="${build.dir}/${name}-*-${version}.jar"/>
</copy>
<copy todir="${dist.dir}/bin">
@@ -1366,7 +1366,7 @@
</copy>
<copy todir="${dist.dir}">
- <fileset file="${build.dir}/${final.name}-*.jar"/>
+ <fileset file="${build.dir}/${name}-*-${version}.jar"/>
</copy>
<copy todir="${dist.dir}/bin">