Repository: hadoop Updated Branches: refs/heads/branch-2 7b9f7eaf5 -> d6f7d2292
HADOOP-12415. Add io.netty dependency to hadoop-nfs and to hadoop-hdfs, needed to build Bigtop successfuly, see BIGTOP-2049 Signed-off-by: Konstantin Boudnik <c...@boudnik.org> (cherry picked from commit b4c6b511e705230dfe4580288addacb81f5c5c5f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d6f7d229 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d6f7d229 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d6f7d229 Branch: refs/heads/branch-2 Commit: d6f7d22929d556783fd682227d86d5bf9aba7275 Parents: 7b9f7ea Author: Tom Zeng <tom.z.z...@gmail.com> Authored: Mon Sep 21 09:32:25 2015 -0700 Committer: Konstantin Boudnik <c...@boudnik.org> Committed: Tue Nov 24 18:39:01 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-nfs/pom.xml | 5 +++++ hadoop-hdfs-project/hadoop-hdfs/pom.xml | 5 +++++ 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d6f7d229/hadoop-common-project/hadoop-nfs/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-nfs/pom.xml b/hadoop-common-project/hadoop-nfs/pom.xml index f101669..932c23e 100644 --- a/hadoop-common-project/hadoop-nfs/pom.xml +++ b/hadoop-common-project/hadoop-nfs/pom.xml @@ -82,6 +82,11 @@ <scope>runtime</scope> </dependency> <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + <scope>compile</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/d6f7d229/hadoop-hdfs-project/hadoop-hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index 0d1856b..b4c3c7e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -175,6 +175,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> </dependency> <dependency> <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> <scope>compile</scope> </dependency>