Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-9633 Partial reverse of HBASE-9533 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1525648 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nkeywal 2013-09-23 16:55:09 +00:00
parent 5ebfbb9abb
commit 21796347aa
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-client/pom.xml
View File

@ -114,6 +114,10 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>

2
hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
View File

@ -262,8 +262,6 @@ 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,

2
hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
View File

@ -526,8 +526,6 @@ 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,

10
pom.xml
View File

@ -908,6 +908,7 @@
<clover.version>2.6.3</clover.version>
<jamon-runtime.version>2.3.1</jamon-runtime.version>
<jettison.version>1.3.1</jettison.version>
<netty.version>3.6.6.Final</netty.version>
<!-- Plugin Dependencies -->
<maven.assembly.version>2.4</maven.assembly.version>
<maven.antrun.version>1.6</maven.antrun.version>
@ -1152,8 +1153,17 @@
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>