From 6223b09dd0ec56d6072aa4e1c4f06992abf52cc6 Mon Sep 17 00:00:00 2001
From: nkeywal <nkeywal@unknown>
Date: Mon, 12 Nov 2012 13:06:41 +0000
Subject: [PATCH] HBASE-7104  HBase includes multiple versions of netty: 3.5.0;
 3.2.4; 3.2.2

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1408274 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ade62daabcc..423c913601d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -856,7 +856,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.5.0.Final</netty.version>
+    <netty.version>3.5.9.Final</netty.version>
     <!-- Plugin Dependencies -->
     <maven.assembly.version>2.3</maven.assembly.version>
     <maven.antrun.version>1.6</maven.antrun.version>
@@ -956,6 +956,17 @@
         <version>${project.version}</version>
       </dependency>
       <!-- General dependencies -->
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-mapreduce-client-app</artifactId>
+        <version>${hadoop.version}</version>
+	<exclusions>
+	  <exclusion>
+	    <groupId>org.jboss.netty</groupId>
+            <artifactId>netty</artifactId>
+	  </exclusion>
+	</exclusions>
+      </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty</artifactId>
@@ -1025,6 +1036,10 @@
             <groupId>jline</groupId>
             <artifactId>jline</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.jboss.netty</groupId>
+            <artifactId>netty</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>