Author: tomwhite Date: Wed Aug 15 19:28:51 2012 New Revision: 1373594 URL: http://svn.apache.org/viewvc?rev=1373594&view=rev Log: Merge -r 1373573:1373574 from trunk to branch-2. Fixes: HADOOP-8278 - Make sure components declare correct set of dependencies
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/pom.xml hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth-examples/pom.xml hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/pom.xml?rev=1373594&r1=1373593&r2=1373594&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/pom.xml Wed Aug 15 19:28:51 2012 @@ -34,7 +34,7 @@ <dependency> <groupId>jdiff</groupId> <artifactId>jdiff</artifactId> - <scope>compile</scope> + <scope>provided</scope> </dependency> </dependencies> Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth-examples/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth-examples/pom.xml?rev=1373594&r1=1373593&r2=1373594&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth-examples/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth-examples/pom.xml Wed Aug 15 19:28: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/hadoop-common-project/hadoop-auth/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml?rev=1373594&r1=1373593&r2=1373594&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml Wed Aug 15 19:28: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> Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1373594&r1=1373593&r2=1373594&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Aug 15 19:28:51 2012 @@ -86,6 +86,9 @@ Release 2.0.1-alpha - UNRELEASED HADOOP-8687. Upgrade log4j to 1.2.17. (eli) + HADOOP-8278. Make sure components declare correct set of dependencies. + (tomwhite) + BUG FIXES HADOOP-8372. NetUtils.normalizeHostName() incorrectly handles hostname Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml?rev=1373594&r1=1373593&r2=1373594&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml Wed Aug 15 19:28:51 2012 @@ -72,13 +72,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> @@ -98,16 +98,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> @@ -121,22 +117,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> @@ -144,11 +140,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> @@ -159,26 +150,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> @@ -189,11 +160,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> @@ -206,16 +172,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> @@ -224,11 +185,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> @@ -259,11 +215,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> Modified: hadoop/common/branches/branch-2/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/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java?rev=1373594&r1=1373593&r2=1373594&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java Wed Aug 15 19:28: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;