Author: tomwhite
Date: Thu Aug 30 10:02:31 2012
New Revision: 1378874
URL: http://svn.apache.org/viewvc?rev=1378874&view=rev
Log:
Merge -r 1378872:1378873 from trunk to branch-2. Fixes: MAPREDUCE-4608.
hadoop-mapreduce-client is missing some dependencies.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1378874&r1=1378873&r2=1378874&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu
Aug 30 10:02:31 2012
@@ -58,6 +58,9 @@ Branch-2 ( Unreleased changes )
MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov
via tucu)
+ MAPREDUCE-4608. hadoop-mapreduce-client is missing some dependencies.
+ (tucu via tomwhite)
+
Release 2.1.0-alpha - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml?rev=1378874&r1=1378873&r2=1378874&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
Thu Aug 30 10:02:31 2012
@@ -133,7 +133,31 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
