2014-05-27 17:12:24 +00:00
|
|
|
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
|
2014-07-15 14:14:23 +00:00
|
|
|
index 9b267fe..0ce916d 100644
|
2014-05-27 17:12:24 +00:00
|
|
|
--- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
|
|
|
|
|
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
|
|
|
|
|
@@ -38,12 +38,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
|
|
|
|
|
|
|
|
<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>
|
2015-02-15 22:52:30 +00:00
|
|
|
+ <version>3.9.3.Final</version>
|
2014-05-27 17:12:24 +00:00
|
|
|
</dependency>
|
|
|
|
|
</dependencies>
|
|
|
|
|
</dependencyManagement>
|
|
|
|
|
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
|
2014-07-15 14:14:23 +00:00
|
|
|
index b315e2b..a9da3aa 100644
|
2014-05-27 17:12:24 +00:00
|
|
|
--- a/hadoop-project/pom.xml
|
|
|
|
|
+++ b/hadoop-project/pom.xml
|
|
|
|
|
@@ -462,7 +462,7 @@
|
|
|
|
|
<dependency>
|
|
|
|
|
<groupId>io.netty</groupId>
|
|
|
|
|
<artifactId>netty</artifactId>
|
|
|
|
|
- <version>3.6.2.Final</version>
|
2015-02-15 22:52:30 +00:00
|
|
|
+ <version>3.9.3.Final</version>
|
2014-05-27 17:12:24 +00:00
|
|
|
</dependency>
|
|
|
|
|
|
|
|
|
|
<dependency>
|
