Upgrade Netty to version 4.0.34

patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for CASSANDRA-11096
2016-03-30 10:13:51 +02:00 · 2016-03-30 10:13:51 +02:00 · 43ff27fc70
parent ae6809d07c
commit 43ff27fc70
5 changed files with 2 additions and 1 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -1,4 +1,5 @@
 3.6
+ * Upgrade Netty to version 4.0.34 (CASSANDRA-11096)
 * Break the CQL grammar into separate Parser and Lexer (CASSANDRA-11372)
 * Compress only inter-dc traffic by default (CASSANDRA-8888)
 * Add metrics to track write amplification (CASSANDRA-11420)
--- a/build.xml
+++ b/build.xml
@ -408,7 +408,7 @@
          <dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.0" />
          <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" />
          <dependency groupId="io.airlift" artifactId="airline" version="0.6" />
-          <dependency groupId="io.netty" artifactId="netty-all" version="4.0.23.Final" />
+          <dependency groupId="io.netty" artifactId="netty-all" version="4.0.34.Final" />
          <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" />
          <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" />
          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.0.0" classifier="shaded" />
--- a/lib/licenses/netty-all-4.0.34.Final.txt
+++ b/lib/licenses/netty-all-4.0.34.Final.txt
--- a/lib/netty-all-4.0.23.Final.jar
+++ b/lib/netty-all-4.0.23.Final.jar
--- a/lib/netty-all-4.0.34.Final.jar
+++ b/lib/netty-all-4.0.34.Final.jar