Permalink
Browse files

MAPREDUCE-767. Remove the dependence on the CLI 2.0 snapshot. Contrib…

…uted by Amar Kamat.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20@807126 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
Devaraj Das
Devaraj Das committed Aug 24, 2009
1 parent f25ee8f commit e4e740d9ff7300f1a64645a8e617dc11d7c067c4
@@ -13,7 +13,7 @@
<classpathentry kind="src" path="src/contrib/streaming/src/test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
- <classpathentry kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-cli-1.2.jar"/>
<classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
<classpathentry kind="lib" path="lib/kfs-0.2.2.jar"/>
<classpathentry kind="lib" path="lib/jsp-2.1/jsp-2.1.jar"/>
View
@@ -36,6 +36,9 @@ Release 0.20.1 - Unreleased
HDFS-438. Improve help message for space quota command. (Raghu Angadi)
+ MAPREDUCE-767. Remove the dependence on the CLI 2.0 snapshot.
+ (Amar Kamat via ddas)
+
OPTIMIZATIONS
BUG FIXES
View
@@ -80,10 +80,10 @@
<dependencies>
<!--used client side-->
-<!-- <dependency org="commons-cli"
- name="commons-cli"
- rev="${commons-cli.version}"
- conf="client->default"/> -->
+ <dependency org="commons-cli"
+ name="commons-cli"
+ rev="${commons-cli.version}"
+ conf="client->default"/>
<dependency org="checkstyle"
name="checkstyle"
View
@@ -21,7 +21,7 @@ apacheant.version=1.7.0
checkstyle.version=4.2
-commons-cli.version=2.0-SNAPSHOT
+commons-cli.version=1.2
commons-codec.version=1.3
commons-collections.version=3.1
commons-httpclient.version=3.0.1
@@ -2,7 +2,6 @@
<classpath>
<classpathentry excluding="org/apache/hadoop/eclipse/server/CopyOfHadoopServer.java" kind="src" path="src/java"/>
<classpathentry exported="true" kind="lib" path="classes" sourcepath="classes"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/hadoop-core.jar" sourcepath="/hadoop-socks/src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
@@ -24,6 +24,5 @@ Require-Bundle: org.eclipse.ui,
org.apache.commons.logging
Eclipse-LazyStart: true
Bundle-ClassPath: classes/,
- lib/commons-cli-2.0-SNAPSHOT.jar,
lib/hadoop-core.jar
Bundle-Vendor: Apache Hadoop
@@ -67,7 +67,7 @@
<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"/>
<jar
jarfile="${build.dir}/hadoop-${version}-${name}.jar"
manifest="${root}/META-INF/MANIFEST.MF">
@@ -24,6 +24,10 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="commons-cli"
+ name="commons-cli"
+ rev="${commons-cli.version}"
+ conf="common->default"/>
<dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"
Oops, something went wrong.

0 comments on commit e4e740d

Please sign in to comment.