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 el...@apache.org on 2012/08/21 01:42:53 UTC
svn commit: r1375321 - in
/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project: ./
hadoop-annotations/ hadoop-auth-examples/ hadoop-auth/ hadoop-common/
hadoop-common/src/main/docs/ hadoop-common/src/main/java/
hadoop-common/src/test/core/ ...
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-common-project/ (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-annotations/pom.xml
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth/ (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth/pom.xml
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/ (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project:r1373594
Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-annotations/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-annotations/pom.xml?rev=1375321&r1=1375320&r2=1375321&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-annotations/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-annotations/pom.xml Mon Aug 20 23:42:51 2012
@@ -34,7 +34,7 @@
<dependency>
<groupId>jdiff</groupId>
<artifactId>jdiff</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth:r1373594
Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml?rev=1375321&r1=1375320&r2=1375321&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml Mon Aug 20 23:42:51 2012
@@ -43,14 +43,19 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth/pom.xml?rev=1375321&r1=1375320&r2=1375321&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-auth/pom.xml Mon Aug 20 23:42:51 2012
@@ -38,6 +38,7 @@
<dependencies>
<dependency>
+ <!-- Used, even though 'mvn dependency:analyze' doesn't find it -->
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<scope>provided</scope>
@@ -75,12 +76,12 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:r1373594
Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1375321&r1=1375320&r2=1375321&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt Mon Aug 20 23:42:51 2012
@@ -71,6 +71,9 @@ Release 2.0.1-alpha - UNRELEASED
HADOOP-8362. Improve exception message when Configuration.set() is called with a null key or value. (Madhukara Phatak and Suresh Srinivas via harsh)
+ HADOOP-8278. Make sure components declare correct set of dependencies.
+ (tomwhite)
+
BUG FIXES
HADOOP-8372. NetUtils.normalizeHostName() incorrectly handles hostname
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1373594
Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/pom.xml?rev=1375321&r1=1375320&r2=1375321&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/pom.xml Mon Aug 20 23:42:51 2012
@@ -76,13 +76,13 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
@@ -102,16 +102,12 @@
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
+ <!-- Used, even though 'mvn dependency:analyze' doesn't find it -->
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<scope>compile</scope>
@@ -125,22 +121,22 @@
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -148,11 +144,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>compile</scope>
@@ -163,26 +154,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftplet-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-deprecated</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -193,11 +164,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<scope>compile</scope>
@@ -210,16 +176,11 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
@@ -228,11 +189,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
@@ -263,11 +219,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
</dependency>
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs:r1373594
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java:r1373594
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core:r1373594
Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java?rev=1375321&r1=1375320&r2=1375321&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java Mon Aug 20 23:42:51 2012
@@ -31,7 +31,6 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ftpserver.command.impl.STAT;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IOUtils;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY;