diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 5330b17768c..17d2d6713c6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -470,6 +470,9 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9935. set junit dependency to test scope. (André Kelpe via cnauroth)
+ HADOOP-9961. versions of a few transitive dependencies diverged between hadoop
+ subprojects. (rvs via tucu)
+
Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 6f7fa0f0259..7b11971f458 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -250,7 +250,6 @@
org.apache.commons
commons-compress
- 1.4
diff --git a/hadoop-common-project/hadoop-nfs/pom.xml b/hadoop-common-project/hadoop-nfs/pom.xml
index 468c84d9ebc..9e903b2fa0f 100644
--- a/hadoop-common-project/hadoop-nfs/pom.xml
+++ b/hadoop-common-project/hadoop-nfs/pom.xml
@@ -86,13 +86,11 @@
io.netty
netty
- 3.6.2.Final
compile
com.google.guava
guava
- 11.0.2
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
index 9577fe180f7..7b0c31ecdb3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
@@ -49,7 +49,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
io.netty
netty
- 3.6.2.Final
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 537dee79c4d..253dba85e25 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
@@ -36,7 +36,25 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
${basedir}/../../../../../hadoop-common-project/hadoop-common/target
+
+
+
+
+ org.jboss.netty
+ netty
+ 3.2.4.Final
+
+
+
+
+
+ org.jboss.netty
+ netty
+ compile
+
+
commons-logging
commons-logging
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index fd09dcfe225..0e1fab3c308 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -318,6 +318,11 @@
commons-math
2.1
+
+ org.apache.commons
+ commons-compress
+ 1.4.1
+
xmlenc
xmlenc
@@ -360,6 +365,23 @@
6.1.26
+
+ org.glassfish
+ javax.servlet
+ 3.1
+
+
+
+ org.codehaus.plexus
+ plexus-utils
+ 2.0.5
+
+
+ org.codehaus.plexus
+ plexus-component-annotations
+ 1.5.5
+
+
asm
asm
@@ -420,7 +442,7 @@
io.netty
netty
- 3.5.11.Final
+ 3.6.2.Final
@@ -666,6 +688,10 @@
com.sun.jmx
jmxri
+
+ org.jboss.netty
+ netty
+
@@ -674,6 +700,12 @@
3.4.2
test-jar
test
+
+
+ org.jboss.netty
+ netty
+
+
org.apache.bookkeeper
@@ -708,7 +740,7 @@
org.apache.maven.plugins
maven-dependency-plugin
- 2.1
+ 2.2
org.codehaus.mojo
diff --git a/pom.xml b/pom.xml
index 31ccff8b8cc..dff990e24bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,10 +105,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.4
+
org.apache.maven.plugins
maven-enforcer-plugin
- 1.0
+ 1.3.1
@@ -224,7 +229,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
org.apache.maven.plugins
maven-dependency-plugin
- [2.1,)
+ [2.4,)
copy-dependencies
build-classpath