Author: tucu
Date: Mon Sep 16 11:31:47 2013
New Revision: 1523598
URL: http://svn.apache.org/r1523598
Log:
HADOOP-9961. versions of a few transitive dependencies diverged between hadoop
subprojects. (rvs via tucu)
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml?rev=1523598&r1=1523597&r2=1523598&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
Mon Sep 16 11:31:47 2013
@@ -49,7 +49,6 @@ http://maven.apache.org/xsd/maven-4.0.0.
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.6.2.Final</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml?rev=1523598&r1=1523597&r2=1523598&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
Mon Sep 16 11:31:47 2013
@@ -36,8 +36,26 @@ http://maven.apache.org/xsd/maven-4.0.0.
<hadoop.common.build.dir>${basedir}/../../../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <!-- This is a really old version of netty, that gets privatized
+ via shading and hence it is not managed via a parent pom -->
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.2.4.Final</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>compile</scope>
