diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
index 2994fb596e..dd4b4ef35e 100644
--- a/hadoop-common-project/hadoop-annotations/pom.xml
+++ b/hadoop-common-project/hadoop-annotations/pom.xml
@@ -34,7 +34,7 @@
jdiff
jdiff
- compile
+ provided
diff --git a/hadoop-common-project/hadoop-auth-examples/pom.xml b/hadoop-common-project/hadoop-auth-examples/pom.xml
index 74364c75de..ce3ae9dc2e 100644
--- a/hadoop-common-project/hadoop-auth-examples/pom.xml
+++ b/hadoop-common-project/hadoop-auth-examples/pom.xml
@@ -42,15 +42,20 @@
hadoop-auth
compile
+
+ org.slf4j
+ slf4j-api
+ compile
+
log4j
log4j
- compile
+ runtime
org.slf4j
slf4j-log4j12
- compile
+ runtime
diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml
index 4e4bb8be4e..752682ca7c 100644
--- a/hadoop-common-project/hadoop-auth/pom.xml
+++ b/hadoop-common-project/hadoop-auth/pom.xml
@@ -38,6 +38,7 @@
+
org.apache.hadoop
hadoop-annotations
provided
@@ -75,12 +76,12 @@
log4j
log4j
- compile
+ runtime
org.slf4j
slf4j-log4j12
- compile
+ runtime
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 305f152885..6ff4c8e979 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -289,6 +289,9 @@ Branch-2 ( Unreleased changes )
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
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 640f72b410..d1714b1a9f 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -74,13 +74,13 @@
compile
- commons-net
- commons-net
+ commons-io
+ commons-io
compile
- commons-io
- commons-io
+ commons-net
+ commons-net
compile
@@ -98,17 +98,13 @@
jetty-util
compile
-
- asm
- asm
- compile
-
com.sun.jersey
jersey-core
compile
+
com.sun.jersey
jersey-json
compile
@@ -121,33 +117,28 @@
tomcat
jasper-compiler
- compile
+ runtime
tomcat
jasper-runtime
- compile
+ runtime
javax.servlet.jsp
jsp-api
- compile
+ runtime
commons-el
commons-el
- compile
+ runtime
commons-logging
commons-logging
compile
-
- commons-logging
- commons-logging-api
- compile
-
log4j
log4j
@@ -158,26 +149,6 @@
jets3t
compile
-
- org.apache.mina
- mina-core
- test
-
-
- org.apache.ftpserver
- ftplet-api
- test
-
-
- org.apache.ftpserver
- ftpserver-core
- test
-
-
- org.apache.ftpserver
- ftpserver-deprecated
- test
-
junit
junit
@@ -188,11 +159,6 @@
commons-lang
compile
-
- commons-collections
- commons-collections
- compile
-
commons-configuration
commons-configuration
@@ -206,16 +172,11 @@
org.slf4j
slf4j-log4j12
- compile
+ runtime
- org.eclipse.jdt
- core
- compile
-
-
- oro
- oro
+ org.codehaus.jackson
+ jackson-core-asl
compile
@@ -223,11 +184,6 @@
jackson-mapper-asl
compile
-
- org.aspectj
- aspectjrt
- compile
-
org.mockito
mockito-all
@@ -258,11 +214,6 @@
hadoop-auth
compile
-
- com.googlecode.json-simple
- json-simple
- compile
-
com.jcraft
jsch
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java
index 75eb9e69ee..dcb5871761 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java
@@ -32,7 +32,6 @@
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.fs.shell.CommandFactory;
import org.apache.hadoop.fs.shell.FsCommand;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index a3838b8efa..661f5ef1ee 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -60,8 +60,13 @@
org.apache.hadoop
- hadoop-annotations
- provided
+ hadoop-auth
+ compile
+
+
+ com.sun.jersey
+ jersey-core
+ compile
com.sun.jersey
@@ -74,18 +79,8 @@
provided
- javax.servlet.jsp
- jsp-api
- provided
-
-
- commons-codec
- commons-codec
- compile
-
-
- org.jdom
- jdom
+ com.google.guava
+ guava
compile
@@ -93,6 +88,11 @@
json-simple
compile
+
+ org.mortbay.jetty
+ jetty
+ test
+
org.apache.hadoop
hadoop-common
@@ -248,7 +248,7 @@
org.slf4j
slf4j-log4j12
- compile
+ runtime
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 1c53fdb532..781d691e59 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -39,18 +39,13 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
- org.aspectj
- aspectjtools
- test
-
-
- org.aspectj
- aspectjrt
- test
+ org.apache.hadoop
+ hadoop-annotations
+ provided
org.apache.hadoop
- hadoop-annotations
+ hadoop-auth
provided
@@ -64,6 +59,58 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
test
test-jar
+
+ org.apache.zookeeper
+ zookeeper
+ 3.4.2
+ test-jar
+ test
+
+
+ com.google.guava
+ guava
+ compile
+
+
+ org.mortbay.jetty
+ jetty
+ compile
+
+
+ org.mortbay.jetty
+ jetty-util
+ compile
+
+
+ com.sun.jersey
+ jersey-core
+ compile
+
+
+ com.sun.jersey
+ jersey-server
+ compile
+
+
+ commons-cli
+ commons-cli
+ compile
+
+
+ commons-codec
+ commons-codec
+ compile
+
+
+ commons-io
+ commons-io
+ compile
+
+
+ commons-lang
+ commons-lang
+ compile
+
commons-logging
commons-logging
@@ -74,6 +121,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
commons-daemon
compile
+
+ javax.servlet.jsp
+ jsp-api
+ compile
+
log4j
log4j
@@ -85,8 +137,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
compile
- org.apache.avro
- avro
+ javax.servlet
+ servlet-api
compile
@@ -99,28 +151,30 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
mockito-all
test
-
- org.apache.ant
- ant
- provided
-
-
- org.apache.zookeeper
- zookeeper
- 3.4.2
- provided
-
org.slf4j
slf4j-log4j12
provided
- org.apache.zookeeper
- zookeeper
- 3.4.2
- test-jar
- test
+ org.codehaus.jackson
+ jackson-core-asl
+ compile
+
+
+ org.codehaus.jackson
+ jackson-mapper-asl
+ compile
+
+
+ tomcat
+ jasper-runtime
+ compile
+
+
+ xmlenc
+ xmlenc
+ compile
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
index 94ce6bc0eb..33d6019c6b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
@@ -37,9 +37,9 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
- org.apache.hadoop
- hadoop-annotations
- provided
+ commons-logging
+ commons-logging
+ compile
org.apache.hadoop
@@ -68,6 +68,16 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
bookkeeper-server
compile
+
+ org.apache.zookeeper
+ zookeeper
+ compile
+
+
+ com.google.guava
+ guava
+ compile
+
junit
junit
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
index d9ac54ed0e..06af8a9f1f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
@@ -49,12 +49,14 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.ChecksumException;
import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.fs.permission.PermissionStatus;
@@ -71,7 +73,6 @@
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Time;
import org.apache.log4j.Level;
-import org.aspectj.util.FileUtil;
import org.junit.Test;
import org.mockito.Mockito;
@@ -620,14 +621,14 @@ private void testCrashRecovery(int numTransactions) throws Exception {
LOG.info("Copying data directory aside to a hot backup");
File backupDir = new File(dfsDir.getParentFile(), "dfs.backup-while-running");
- FileUtil.copyDir(dfsDir, backupDir);;
+ FileUtils.copyDirectory(dfsDir, backupDir);
LOG.info("Shutting down cluster #1");
cluster.shutdown();
cluster = null;
// Now restore the backup
- FileUtil.deleteContents(dfsDir);
+ FileUtil.fullyDeleteContents(dfsDir);
backupDir.renameTo(dfsDir);
// Directory layout looks like:
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestAtomicFileOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestAtomicFileOutputStream.java
index 9549356a7b..ebbb4e2270 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestAtomicFileOutputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestAtomicFileOutputStream.java
@@ -28,8 +28,8 @@
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdfs.DFSTestUtil;
-import org.aspectj.util.FileUtil;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +50,7 @@ public class TestAtomicFileOutputStream {
@Before
public void cleanupTestDir() throws IOException {
assertTrue(TEST_DIR.exists() || TEST_DIR.mkdirs());
- FileUtil.deleteContents(TEST_DIR);
+ FileUtil.fullyDeleteContents(TEST_DIR);
}
/**
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
index 4593ba0855..cd9161b742 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
@@ -35,6 +35,14 @@
+
+ commons-cli
+ commons-cli
+
+
+ commons-logging
+ commons-logging
+
org.apache.hadoop
hadoop-mapreduce-client-jobclient
@@ -85,11 +93,6 @@
test-jar
test
-
- org.apache.hadoop
- hadoop-mapreduce-client-hs
- provided
-
org.apache.hadoop
hadoop-mapreduce-client-hs
diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
index e5f3a01112..d6db3815b0 100644
--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
@@ -124,6 +124,10 @@
com.sun.jersey
jersey-server
+
+ com.sun.jersey
+ jersey-json
+
com.sun.jersey.contribs
jersey-guice
diff --git a/pom.xml b/pom.xml
index b7ff1aa747..30f680ff6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,6 +365,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.4
+
+
+
+ analyze-report
+
+
+
+