Update Netty to 4.1.16.Final (#28345)

This commit updates netty to 4.1.16.Final. This is the latest version that we can have work without extra permissions. This updated version of netty fixes issues seen with Java 9 and some data not being sent, which results in timeouts.
elastic · Jan 25, 2018 · bac6737 · bac6737
1 parent fbe0f22
commit bac6737
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 22 deletions.
diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
@@ -34,13 +34,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr
 
 dependencies {
     // network stack
-    compile "io.netty:netty-buffer:4.1.13.Final"
-    compile "io.netty:netty-codec:4.1.13.Final"
-    compile "io.netty:netty-codec-http:4.1.13.Final"
-    compile "io.netty:netty-common:4.1.13.Final"
-    compile "io.netty:netty-handler:4.1.13.Final"
-    compile "io.netty:netty-resolver:4.1.13.Final"
-    compile "io.netty:netty-transport:4.1.13.Final"
+    compile "io.netty:netty-buffer:4.1.16.Final"
+    compile "io.netty:netty-codec:4.1.16.Final"
+    compile "io.netty:netty-codec-http:4.1.16.Final"
+    compile "io.netty:netty-common:4.1.16.Final"
+    compile "io.netty:netty-handler:4.1.16.Final"
+    compile "io.netty:netty-resolver:4.1.16.Final"
+    compile "io.netty:netty-transport:4.1.16.Final"
 }
 
 dependencyLicenses {
@@ -149,18 +149,18 @@ thirdPartyAudit.excludes = [
         'io.netty.util.internal.PlatformDependent0$3',
         'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
         'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
-        'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueue',
-        'io.netty.util.internal.shaded.org.jctools.queues.ConcurrentSequencedCircularArrayQueue',
+        'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
+        'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields',
+        'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields',
         'io.netty.util.internal.shaded.org.jctools.queues.LinkedQueueNode',
-        'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerField',
-        'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerField',
-        'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerField',
-        'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueHeadLimitField',
-        'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueTailField',
-        'io.netty.util.internal.shaded.org.jctools.util.JvmInfo',
+        'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
+        'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
+        'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
         'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
         'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
 
+        'org.conscrypt.AllocatedBuffer',
+        'org.conscrypt.BufferAllocator',
         'org.conscrypt.Conscrypt$Engines',
         'org.conscrypt.HandshakeListener'
 ]
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.16.Final.jar.sha1
@@ -0,0 +1 @@
+63b5fa95c74785e16f2c30ce268bc222e35c8cb5
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.16.Final.jar.sha1
@@ -0,0 +1 @@
+d84a1f21768b7309c2954521cf5a1f46c2309eb1
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.16.Final.jar.sha1
@@ -0,0 +1 @@
+d64312378b438dfdad84267c599a053327c6f02a
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.16.Final.jar.sha1
@@ -0,0 +1 @@
+177a6b30cca92f6f5f9873c9befd681377a4c328
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.16.Final.jar.sha1
@@ -0,0 +1 @@
+fec0e63e7dd7f4eeef7ea8dc47a1ff32dfc7ebc2
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.16.Final.jar.sha1
@@ -0,0 +1 @@
+f6eb553b53fb3a90a8ac1170697093fed82eae28
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.16.Final.jar.sha1
@@ -0,0 +1 @@
+3c8ee2c4d4a1cbb947a5c184c7aeb2204260958b