Author: eli
Date: Mon Aug 20 23:42:51 2012
New Revision: 1375321
URL: http://svn.apache.org/viewvc?rev=1375321&view=rev
Log:
HADOOP-8278. Make sure components declare correct set of dependencies.
Contributed by Tom White
Modified:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/CHANGES.txt
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/bin/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/conf/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-examples/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/c++/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/block_forensics/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/build-contrib.xml
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/build.xml
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/data_join/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/index/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/vaidya/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/examples/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/java/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/test/mapred/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
(props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/webapps/job/
(props changed)
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-examples/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1373594
Modified:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml?rev=1375321&r1=1375320&r2=1375321&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
(original)
+++
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
Mon Aug 20 23:42:51 2012
@@ -36,6 +36,14 @@
<dependencies>
<dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<version>${project.version}</version>
@@ -89,11 +97,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-hs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-hs</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/c++/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/c++:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/block_forensics/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/block_forensics:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/build-contrib.xml:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/build.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/build.xml:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/data_join/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/eclipse-plugin:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/index/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/index:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/contrib/vaidya/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/vaidya:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/examples/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/examples:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/java:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/test/mapred/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:r1373594
Propchange:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/src/webapps/job/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/webapps/job:r1373594
