From 244838fba411801ce2473850df56a1e6fa87e3ed Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Sun, 10 Jan 2016 22:20:16 -0800
Subject: [PATCH 1/7] Try to fix tests.

---
 dev/deps/spark-deps-hadoop-2.2 |  1 +
 dev/deps/spark-deps-hadoop-2.3 |  1 +
 dev/deps/spark-deps-hadoop-2.4 |  1 +
 dev/deps/spark-deps-hadoop-2.6 |  1 +
 pom.xml                        | 38 +++++++---------------------------
 5 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index 13d1b0e950480..e4373f79f7922 100644
--- a/dev/deps/spark-deps-hadoop-2.2
+++ b/dev/deps/spark-deps-hadoop-2.2
@@ -142,6 +142,7 @@ metrics-graphite-3.1.2.jar
 metrics-json-3.1.2.jar
 metrics-jvm-3.1.2.jar
 minlog-1.2.jar
+netty-3.8.0.Final.jar
 netty-all-4.0.29.Final.jar
 objenesis-1.2.jar
 opencsv-2.3.jar
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index d7deaa0a24541..7478181406d07 100644
--- a/dev/deps/spark-deps-hadoop-2.3
+++ b/dev/deps/spark-deps-hadoop-2.3
@@ -133,6 +133,7 @@ metrics-json-3.1.2.jar
 metrics-jvm-3.1.2.jar
 minlog-1.2.jar
 mx4j-3.0.2.jar
+netty-3.8.0.Final.jar
 netty-all-4.0.29.Final.jar
 objenesis-1.2.jar
 opencsv-2.3.jar
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index 7ad2212ed5ae7..faffb8bf398a5 100644
--- a/dev/deps/spark-deps-hadoop-2.4
+++ b/dev/deps/spark-deps-hadoop-2.4
@@ -134,6 +134,7 @@ metrics-json-3.1.2.jar
 metrics-jvm-3.1.2.jar
 minlog-1.2.jar
 mx4j-3.0.2.jar
+netty-3.8.0.Final.jar
 netty-all-4.0.29.Final.jar
 objenesis-1.2.jar
 opencsv-2.3.jar
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index 7f8518927aec4..e703c7acd3876 100644
--- a/dev/deps/spark-deps-hadoop-2.6
+++ b/dev/deps/spark-deps-hadoop-2.6
@@ -140,6 +140,7 @@ metrics-json-3.1.2.jar
 metrics-jvm-3.1.2.jar
 minlog-1.2.jar
 mx4j-3.0.2.jar
+netty-3.8.0.Final.jar
 netty-all-4.0.29.Final.jar
 objenesis-1.2.jar
 opencsv-2.3.jar
diff --git a/pom.xml b/pom.xml
index cbed36c1eac16..ac125739eece5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -519,12 +519,6 @@
         <groupId>${akka.group}</groupId>
         <artifactId>akka-remote_${scala.binary.version}</artifactId>
         <version>${akka.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>${akka.group}</groupId>
@@ -768,10 +762,6 @@
             <groupId>org.jboss.netty</groupId>
             <artifactId>netty</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -832,10 +822,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -964,10 +950,6 @@
             <groupId>org.jboss.netty</groupId>
             <artifactId>netty</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -997,10 +979,6 @@
             <groupId>org.jboss.netty</groupId>
             <artifactId>netty</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -1029,10 +1007,6 @@
             <groupId>org.jboss.netty</groupId>
             <artifactId>netty</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -1061,10 +1035,6 @@
             <groupId>org.jboss.netty</groupId>
             <artifactId>netty</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -1832,7 +1802,13 @@
                   </requireJavaVersion>
                   <bannedDependencies>
                     <excludes>
-                      <exclude>io.netty:netty</exclude>
+                      <!--
+                        Akka depends on io.netty, which places classes under the org.jboss.netty
+                        namespace. This can conflict with the classes in org.jboss.netty:netty
+                        artifact, so we have to ban that artifact here.  In Netty 4.x, the classes
+                        are under the io.netty namespace, so it's fine for us to depend on both
+                        io.netty:netty and io.netty:netty-all.
+                       -->
                       <exclude>org.jboss.netty</exclude>
                     </excludes>
                     <includes>

From f808ba0bc1c663ca9438e1542319140612b6e827 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Sun, 10 Jan 2016 22:28:09 -0800
Subject: [PATCH 2/7] Update pom.xml

---
 examples/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 6013085b10e84..1a0d5e5854642 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -111,10 +111,6 @@
           <groupId>org.jruby</groupId>
           <artifactId>jruby-complete</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

From 88bb9b73d1877e6854994054069fc387a35f3ff2 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Sun, 10 Jan 2016 22:28:58 -0800
Subject: [PATCH 3/7] Update pom.xml

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index ac125739eece5..956f269f14c2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -922,10 +922,6 @@
             <groupId>org.jboss.netty</groupId>
             <artifactId>netty</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>

From 8dc0cfef086d9a86a6abdd73f9b2536e15787f37 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Sun, 10 Jan 2016 22:30:04 -0800
Subject: [PATCH 4/7] Update pom.xml

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 956f269f14c2b..70583a1eb7121 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1051,10 +1051,6 @@
             <groupId>org.jboss.netty</groupId>
             <artifactId>netty</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
       <dependency>

From 5211ab80f8e87848c89d45e9495a9a3e559b28a0 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Sun, 10 Jan 2016 22:59:04 -0800
Subject: [PATCH 5/7] Update pom.xml

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 70583a1eb7121..8694d4a34aa08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1803,10 +1803,6 @@
                        -->
                       <exclude>org.jboss.netty</exclude>
                     </excludes>
-                    <includes>
-                      <!-- Required by Flume sink tests -->
-                      <include>io.netty:netty:3.4.0.Final:*:test</include>
-                    </includes>
                     <searchTransitive>true</searchTransitive>
                   </bannedDependencies>
                 </rules>

From 1d24aaa8f746bce64cc7b75e1c5f3451db5e825f Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Sun, 10 Jan 2016 23:24:05 -0800
Subject: [PATCH 6/7] Update pom.xml

---
 pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8694d4a34aa08..66ea3b6413763 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1795,10 +1795,11 @@
                   <bannedDependencies>
                     <excludes>
                       <!--
-                        Akka depends on io.netty, which places classes under the org.jboss.netty
-                        namespace. This can conflict with the classes in org.jboss.netty:netty
-                        artifact, so we have to ban that artifact here.  In Netty 4.x, the classes
-                        are under the io.netty namespace, so it's fine for us to depend on both
+                      <!--
+                        Akka depends on io.netty:netty, which puts classes under the org.jboss.netty
+                        package. This conflicts with the classes in org.jboss.netty:netty
+                        artifact, so we have to ban that artifact here. In Netty 4.x, the classes
+                        are under the io.netty package, so it's fine for us to depend on both
                         io.netty:netty and io.netty:netty-all.
                        -->
                       <exclude>org.jboss.netty</exclude>

From 7e14d7d7117dca125eebd3ce7ba4d882173b0b6c Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 11 Jan 2016 00:23:21 -0800
Subject: [PATCH 7/7] Update pom.xml

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 66ea3b6413763..06cccf1df0bb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1794,14 +1794,13 @@
                   </requireJavaVersion>
                   <bannedDependencies>
                     <excludes>
-                      <!--
                       <!--
                         Akka depends on io.netty:netty, which puts classes under the org.jboss.netty
                         package. This conflicts with the classes in org.jboss.netty:netty
                         artifact, so we have to ban that artifact here. In Netty 4.x, the classes
                         are under the io.netty package, so it's fine for us to depend on both
                         io.netty:netty and io.netty:netty-all.
-                       -->
+                      -->
                       <exclude>org.jboss.netty</exclude>
                     </excludes>
                     <searchTransitive>true</searchTransitive>