hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nkey...@apache.org
Subject svn commit: r1525649 - in /hbase/branches/0.96: hbase-client/pom.xml hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java pom.xml
Date Mon, 23 Sep 2013 16:55:44 GMT
Author: nkeywal
Date: Mon Sep 23 16:55:44 2013
New Revision: 1525649

URL: http://svn.apache.org/r1525649
Log:
HBASE-9633  Partial reverse of HBASE-9533

Modified:
    hbase/branches/0.96/hbase-client/pom.xml
    hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
    hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
    hbase/branches/0.96/pom.xml

Modified: hbase/branches/0.96/hbase-client/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/pom.xml?rev=1525649&r1=1525648&r2=1525649&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/pom.xml (original)
+++ hbase/branches/0.96/hbase-client/pom.xml Mon Sep 23 16:55:44 2013
@@ -115,6 +115,10 @@
       <artifactId>protobuf-java</artifactId>
     </dependency>
     <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
     </dependency>

Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java?rev=1525649&r1=1525648&r2=1525649&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
(original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
Mon Sep 23 16:55:44 2013
@@ -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,

Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1525649&r1=1525648&r2=1525649&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
(original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
Mon Sep 23 16:55:44 2013
@@ -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,

Modified: hbase/branches/0.96/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/pom.xml?rev=1525649&r1=1525648&r2=1525649&view=diff
==============================================================================
--- hbase/branches/0.96/pom.xml (original)
+++ hbase/branches/0.96/pom.xml Mon Sep 23 16:55:44 2013
@@ -879,6 +879,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>
@@ -1123,9 +1124,18 @@
             <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>
         <version>${thrift.version}</version>



Mime
View raw message