diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index db706c8..fb2a835 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -127,10 +127,6 @@ jackson-mapper-asl - io.netty - netty - - log4j log4j test diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 7ca73ac..aa71a26 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -332,10 +332,6 @@ - io.netty - netty - - com.yammer.metrics metrics-core diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java index 4cdb7fc..ff61683 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java @@ -258,6 +258,9 @@ public class TableMapReduceUtil { org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addDependencyJars( job, org.apache.zookeeper.ZooKeeper.class, + // This is ugly. Our zk3.4.5 depends on the org.jboss.netty, not hadoops io.netty + // so need to load it up explicitly while on 3.4.5 zk + org.jboss.netty.channel.ChannelFactory.class, com.google.common.base.Function.class, com.google.protobuf.Message.class, job.getMapOutputKeyClass(), diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index 4481095..b96301e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -526,6 +526,9 @@ public class TableMapReduceUtil { org.apache.hadoop.hbase.CompatibilityFactory.class, // hbase-hadoop-compat // pull necessary dependencies org.apache.zookeeper.ZooKeeper.class, + // This is ugly. Our zk3.4.5 depends on the org.jboss.netty, not hadoops io.netty + // so need to load it up explicitly while on 3.4.5 zk + org.jboss.netty.channel.ChannelFactory.class, com.google.protobuf.Message.class, com.google.common.collect.Lists.class, org.cloudera.htrace.Trace.class, diff --git a/pom.xml b/pom.xml index cfc5dac..058310d 100644 --- a/pom.xml +++ b/pom.xml @@ -357,10 +357,6 @@ https://repository.apache.org/content/repositories/orgapachehadoop-099/ - cloudbees netty - http://repository-netty.forge.cloudbees.com/snapshot/ - - apache release https://repository.apache.org/content/repositories/releases/ @@ -881,7 +877,6 @@ 2.6.3 2.3.1 1.3.1 - 3.6.6.Final 2.4 1.6 @@ -1010,11 +1005,6 @@ - io.netty - netty - ${netty.version} - - org.codehaus.jettison jettison ${jettison.version} @@ -1096,10 +1086,6 @@ jline - org.jboss.netty - netty - - com.sun.jmx jmxri @@ -1608,13 +1594,6 @@ org.apache.hadoop hadoop-client ${hadoop-two.version} - - - - org.jboss.netty - netty - - org.apache.hadoop @@ -1627,13 +1606,6 @@ org.apache.hadoop hadoop-minicluster ${hadoop-two.version} - - - - org.jboss.netty - netty - -