HBASE-14027 clean up multiple netty jars.

sirpkt · Jul 15, 2015 · 25f7e80 · 25f7e80
1 parent 2f327c9
commit 25f7e80
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git 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>
 

diff --git 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>

diff --git 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>
@@ -1977,6 +1978,10 @@
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>io.netty</groupId>
+                <artifactId>netty</artifactId>
+              </exclusion>
               <exclusion>
                 <groupId>stax</groupId>
                 <artifactId>stax-api</artifactId>
@@ -1999,6 +2004,10 @@
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>io.netty</groupId>
+                <artifactId>netty</artifactId>
+              </exclusion>
               <exclusion>
                 <groupId>stax</groupId>
                 <artifactId>stax-api</artifactId>