You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/09/20 05:39:57 UTC
svn commit: r1524894 - in /hbase/trunk: ./ hbase-client/ hbase-server/
hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/
hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/
Author: stack
Date: Fri Sep 20 03:39:56 2013
New Revision: 1524894
URL: http://svn.apache.org/r1524894
Log:
HBASE-9533 List of dependency jars for MR jobs is hard-coded and does not include netty, breaking MRv1 jobs
Modified:
hbase/trunk/hbase-client/pom.xml
hbase/trunk/hbase-server/pom.xml
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
hbase/trunk/pom.xml
Modified: hbase/trunk/hbase-client/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/pom.xml?rev=1524894&r1=1524893&r2=1524894&view=diff
==============================================================================
--- hbase/trunk/hbase-client/pom.xml (original)
+++ hbase/trunk/hbase-client/pom.xml Fri Sep 20 03:39:56 2013
@@ -127,10 +127,6 @@
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: hbase/trunk/hbase-server/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/pom.xml?rev=1524894&r1=1524893&r2=1524894&view=diff
==============================================================================
--- hbase/trunk/hbase-server/pom.xml (original)
+++ hbase/trunk/hbase-server/pom.xml Fri Sep 20 03:39:56 2013
@@ -332,10 +332,6 @@
</dependency>
<!-- General dependencies -->
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </dependency>
- <dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-core</artifactId>
</dependency>
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java?rev=1524894&r1=1524893&r2=1524894&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java Fri Sep 20 03:39:56 2013
@@ -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(),
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1524894&r1=1524893&r2=1524894&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java Fri Sep 20 03:39:56 2013
@@ -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,
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1524894&r1=1524893&r2=1524894&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Fri Sep 20 03:39:56 2013
@@ -386,10 +386,6 @@
<url>https://repository.apache.org/content/repositories/orgapachehadoop-099/</url>
</repository>
<repository>
- <id>cloudbees netty</id>
- <url>http://repository-netty.forge.cloudbees.com/snapshot/</url>
- </repository>
- <repository>
<id>apache release</id>
<url>https://repository.apache.org/content/repositories/releases/</url>
</repository>
@@ -910,7 +906,6 @@
<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>
@@ -1039,11 +1034,6 @@
</dependency>
<!-- General dependencies -->
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>${jettison.version}</version>
@@ -1125,10 +1115,6 @@
<artifactId>jline</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
@@ -1637,13 +1623,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop-two.version}</version>
- <exclusions>
- <exclusion>
- <!-- We use a newer version of netty -->
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -1656,13 +1635,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop-two.version}</version>
- <exclusions>
- <exclusion>
- <!-- We use a newer version of netty -->
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</dependencyManagement>