Author: gkesavan
Date: Fri May 29 12:36:59 2009
New Revision: 779944
URL: http://svn.apache.org/viewvc?rev=779944&view=rev
Log:
HADOOP-5940. Fix trunk eclipse-plugin build fails while trying to copy
commons-cli jar from the lib dir. Contributed by Giridharan Kesavan
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/eclipse-plugin/build.xml
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=779944&r1=779943&r2=779944&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri May 29 12:36:59 2009
@@ -725,6 +725,9 @@
HADOOP-5805. problem using top level s3 buckets as input/output
directories.
(Ian Nowland via tomwhite)
+
+ HADOOP-5940. trunk eclipse-plugin build fails while trying to copy
+ commons-cli jar from the lib dir (Giridharan Kesavan via gkesavan)
Release 0.20.1 - Unreleased
Modified: hadoop/core/trunk/src/contrib/eclipse-plugin/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/eclipse-plugin/build.xml?rev=779944&r1=779943&r2=779944&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/eclipse-plugin/build.xml (original)
+++ hadoop/core/trunk/src/contrib/eclipse-plugin/build.xml Fri May 29 12:36:59
2009
@@ -67,7 +67,8 @@
<target name="jar" depends="compile" unless="skip.contrib">
<mkdir dir="${build.dir}/lib"/>
<copy file="${hadoop.root}/build/hadoop-${version}-core.jar"
tofile="${build.dir}/lib/hadoop-core.jar" verbose="true"/>
- <copy file="${hadoop.root}/lib/commons-cli-2.0-SNAPSHOT.jar"
todir="${build.dir}/lib" verbose="true"/>
+ <copy
file="${hadoop.root}/build/ivy/lib/Hadoop/common/commons-cli-${commons-cli.version}.jar"
todir="${build.dir}/lib" verbose="true"/>
+ <copy
file="${hadoop.root}/build/ivy/lib/Hadoop/common/commons-cli-${commons-cli2.version}.jar"
todir="${build.dir}/lib" verbose="true"/>
<jar
jarfile="${build.dir}/hadoop-${version}-${name}.jar"
manifest="${root}/META-INF/MANIFEST.MF">
