Revert "JAVA-1241: Upgrade Netty to 4.1.x"

olim7t · olim7t · commit 25499d644d4e · 2017-03-23T10:13:38.000-07:00
This reverts commit f2468d3.
diff --git a/changelog/README.md b/changelog/README.md
@@ -22,6 +22,7 @@
 - [improvement] JAVA-1310: Make mapper's ignored properties configurable.
 - [improvement] JAVA-1316: Add strategy for resolving properties into CQL names.
 - [bug] JAVA-1424: Handle new WRITE_FAILURE and READ_FAILURE format in v5 protocol.
+- revert JAVA-1241 (go back to Netty 4.0)
 
 Merged from 3.1.x branch:
 
diff --git a/driver-core/pom.xml b/driver-core/pom.xml
@@ -269,8 +269,6 @@
                                         <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
@@ -103,8 +103,7 @@ 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-resolver", nettyVersion)
+                        mavenBundle("io.netty", "netty-transport", nettyVersion)
                 );
             }
         };
diff --git 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>19.0</guava.version>
-        <netty.version>4.1.8.Final</netty.version>
+        <netty.version>4.0.44.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>
