hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject hbase git commit: HBASE-14027 clean up multiple netty jars.
Date Wed, 15 Jul 2015 07:37:06 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 2f327c911 -> 25f7e804c


HBASE-14027 clean up multiple netty jars.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/25f7e804
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/25f7e804
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/25f7e804

Branch: refs/heads/master
Commit: 25f7e804cd9e39e829fa02b476fa63ce7099ba46
Parents: 2f327c9
Author: Sean Busbey <busbey@apache.org>
Authored: Mon Jul 6 17:00:51 2015 -0500
Committer: Sean Busbey <busbey@apache.org>
Committed: Wed Jul 15 02:33:28 2015 -0500

----------------------------------------------------------------------
 hbase-it/pom.xml     | 6 ++++--
 hbase-server/pom.xml | 2 +-
 pom.xml              | 9 +++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/25f7e804/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 30bdf13..3b37108 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -251,10 +251,12 @@
       <groupId>org.apache.htrace</groupId>
       <artifactId>htrace-core</artifactId>
     </dependency>
+    <!-- Hadoop needs Netty 3.x at test scope for the minicluster -->
     <dependency>
-      <groupId>org.jboss.netty</groupId>
+      <groupId>io.netty</groupId>
       <artifactId>netty</artifactId>
-      <version>3.2.4.Final</version>
+      <version>${netty.hadoop.version}</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/25f7e804/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 229d11d..05bd619 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -677,7 +677,7 @@
         <dependency>
           <groupId>io.netty</groupId>
           <artifactId>netty</artifactId>
-          <version>3.6.2.Final</version>
+          <version>${netty.hadoop.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>

http://git-wip-us.apache.org/repos/asf/hbase/blob/25f7e804/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5da039f..569f31f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1194,6 +1194,7 @@
     <jamon-runtime.version>2.3.1</jamon-runtime.version>
     <jettison.version>1.3.3</jettison.version>
     <netty.version>4.0.23.Final</netty.version>
+    <netty.hadoop.version>3.6.2.Final</netty.hadoop.version>
     <joni.version>2.1.2</joni.version>
     <jcodings.version>1.0.8</jcodings.version>
     <spy.version>2.11.6</spy.version>
@@ -1978,6 +1979,10 @@
                 <artifactId>servlet-api</artifactId>
               </exclusion>
               <exclusion>
+                <groupId>io.netty</groupId>
+                <artifactId>netty</artifactId>
+              </exclusion>
+              <exclusion>
                 <groupId>stax</groupId>
                 <artifactId>stax-api</artifactId>
               </exclusion>
@@ -2000,6 +2005,10 @@
                 <artifactId>servlet-api</artifactId>
               </exclusion>
               <exclusion>
+                <groupId>io.netty</groupId>
+                <artifactId>netty</artifactId>
+              </exclusion>
+              <exclusion>
                 <groupId>stax</groupId>
                 <artifactId>stax-api</artifactId>
               </exclusion>


Mime
View raw message