From ff454ddb8806a65a9d7493b51e8d960f2b407070 Mon Sep 17 00:00:00 2001
From: Alexander Bulaev <alexbool@yandex-team.ru>
Date: Thu, 20 Oct 2016 11:53:25 +0300
Subject: [PATCH 1/3] Updated netty to 4.1.6.Final

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

diff --git a/pom.xml b/pom.xml
index e060ff829ab..552d91b9e27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
         <log4j.version>1.2.17</log4j.version>
         <slf4j-log4j12.version>1.7.6</slf4j-log4j12.version>
         <guava.version>16.0.1</guava.version>
-        <netty.version>4.0.37.Final</netty.version>
+        <netty.version>4.1.6.Final</netty.version>
         <metrics.version>3.1.2</metrics.version>
         <snappy.version>1.1.2.6</snappy.version>
         <lz4.version>1.3.0</lz4.version>

From 8e12acd6b780286c495cdd5949cc493ec7cde895 Mon Sep 17 00:00:00 2001
From: Andrew Tolbert <andrew.tolbert@datastax.com>
Date: Fri, 4 Nov 2016 17:26:30 -0500
Subject: [PATCH 2/3] Update netty-tcnative to Fork23, update OSGi tests to use
 4.1.6.

---
 driver-core/pom.xml                                             | 2 +-
 .../src/test/java/com/datastax/driver/osgi/BundleOptions.java   | 2 +-
 manual/ssl/README.md                                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/driver-core/pom.xml b/driver-core/pom.xml
index 6470b503a31..086e3606b3a 100644
--- a/driver-core/pom.xml
+++ b/driver-core/pom.xml
@@ -142,7 +142,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative</artifactId>
-            <version>1.1.33.Fork18</version>
+            <version>1.1.33.Fork23</version>
             <classifier>${os.detected.classifier}</classifier>
             <scope>test</scope>
         </dependency>
diff --git a/driver-tests/osgi/src/test/java/com/datastax/driver/osgi/BundleOptions.java b/driver-tests/osgi/src/test/java/com/datastax/driver/osgi/BundleOptions.java
index 532b7a2cc53..100e7b49f3d 100644
--- a/driver-tests/osgi/src/test/java/com/datastax/driver/osgi/BundleOptions.java
+++ b/driver-tests/osgi/src/test/java/com/datastax/driver/osgi/BundleOptions.java
@@ -93,7 +93,7 @@ public Option[] getOptions() {
     }
 
     public static CompositeOption nettyBundles() {
-        final String nettyVersion = "4.0.33.Final";
+        final String nettyVersion = "4.1.6.Final";
         return new CompositeOption() {
 
             @Override
diff --git a/manual/ssl/README.md b/manual/ssl/README.md
index c86876b6048..9d5659b3b7b 100644
--- a/manual/ssl/README.md
+++ b/manual/ssl/README.md
@@ -154,7 +154,7 @@ add it to your dependencies.
 
 There are known runtime incompatibilities between newer versions of
 netty-tcnative and the version of netty that the driver uses.  For best
-results, use version 1.1.33.Fork18.
+results, use version 1.1.33.Fork23.
 
 Using netty-tcnative requires JDK 1.7 or above and requires the presence of
 OpenSSL on the system.  It will not fall back to the JDK implementation.

From ea2cdbabdf9e0e12910f3877e51eb5b7190be690 Mon Sep 17 00:00:00 2001
From: Andrew Tolbert <andrew.tolbert@datastax.com>
Date: Tue, 8 Nov 2016 08:14:29 -0600
Subject: [PATCH 3/3] Account for netty-transport depending on new resolver
 module in 4.1

---
 driver-core/pom.xml                                            | 2 ++
 .../src/test/java/com/datastax/driver/osgi/BundleOptions.java  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/driver-core/pom.xml b/driver-core/pom.xml
index 086e3606b3a..889cb963339 100644
--- a/driver-core/pom.xml
+++ b/driver-core/pom.xml
@@ -269,6 +269,8 @@
                                         <resource>META-INF/maven/io.netty/netty-common/pom.xml</resource>
                                         <resource>META-INF/maven/io.netty/netty-handler/pom.properties</resource>
                                         <resource>META-INF/maven/io.netty/netty-handler/pom.xml</resource>
+                                        <resource>META-INF/maven/io.netty/netty-resolver/pom.properties</resource>
+                                        <resource>META-INF/maven/io.netty/netty-resolver/pom.xml</resource>
                                         <resource>META-INF/maven/io.netty/netty-transport/pom.properties</resource>
                                         <resource>META-INF/maven/io.netty/netty-transport/pom.xml</resource>
                                     </resources>
diff --git a/driver-tests/osgi/src/test/java/com/datastax/driver/osgi/BundleOptions.java b/driver-tests/osgi/src/test/java/com/datastax/driver/osgi/BundleOptions.java
index 100e7b49f3d..2557de04550 100644
--- a/driver-tests/osgi/src/test/java/com/datastax/driver/osgi/BundleOptions.java
+++ b/driver-tests/osgi/src/test/java/com/datastax/driver/osgi/BundleOptions.java
@@ -103,7 +103,8 @@ public Option[] getOptions() {
                         mavenBundle("io.netty", "netty-codec", nettyVersion),
                         mavenBundle("io.netty", "netty-common", nettyVersion),
                         mavenBundle("io.netty", "netty-handler", nettyVersion),
-                        mavenBundle("io.netty", "netty-transport", nettyVersion)
+                        mavenBundle("io.netty", "netty-transport", nettyVersion),
+                        mavenBundle("io.netty", "netty-resolver", nettyVersion)
                 );
             }
         };