From e59f14d139d350a0eacde4603c40a9579ed00046 Mon Sep 17 00:00:00 2001 From: Jay Modi Date: Thu, 25 Jan 2018 12:48:43 -0700 Subject: [PATCH] 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. --- modules/transport-netty4/build.gradle | 30 +++++++++---------- .../netty-buffer-4.1.13.Final.jar.sha1 | 1 - .../netty-buffer-4.1.16.Final.jar.sha1 | 1 + .../netty-codec-4.1.13.Final.jar.sha1 | 1 - .../netty-codec-4.1.16.Final.jar.sha1 | 1 + .../netty-codec-http-4.1.13.Final.jar.sha1 | 1 - .../netty-codec-http-4.1.16.Final.jar.sha1 | 1 + .../netty-common-4.1.13.Final.jar.sha1 | 1 - .../netty-common-4.1.16.Final.jar.sha1 | 1 + .../netty-handler-4.1.13.Final.jar.sha1 | 1 - .../netty-handler-4.1.16.Final.jar.sha1 | 1 + .../netty-resolver-4.1.13.Final.jar.sha1 | 1 - .../netty-resolver-4.1.16.Final.jar.sha1 | 1 + .../netty-transport-4.1.13.Final.jar.sha1 | 1 - .../netty-transport-4.1.16.Final.jar.sha1 | 1 + 15 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.16.Final.jar.sha1 diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index 222cbca07ae..5d4bcd7c10a 100644 --- 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 deleted file mode 100644 index 31f015e158a..00000000000 --- a/modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0e3f583ea8a2618a7563b1ee2aa696c23edcc3d8 \ No newline at end of file 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 new file mode 100644 index 00000000000..c5462229719 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-buffer-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +63b5fa95c74785e16f2c30ce268bc222e35c8cb5 \ No newline at end of file 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 deleted file mode 100644 index 6e7f1bdc14c..00000000000 --- a/modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -370eeb6e9d92495a2a3be096ab6102755af76730 \ No newline at end of file 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 new file mode 100644 index 00000000000..1e6c241ea0b --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +d84a1f21768b7309c2954521cf5a1f46c2309eb1 \ No newline at end of file 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 deleted file mode 100644 index 80d18918e1d..00000000000 --- a/modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0ee87368766e6b900cf6be8ac9cdce27156e9411 \ No newline at end of file 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 new file mode 100644 index 00000000000..71c33af1c5f --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +d64312378b438dfdad84267c599a053327c6f02a \ No newline at end of file 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 deleted file mode 100644 index 044ec3ef4ed..00000000000 --- a/modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f640e8cd8866527150784f8986152d3bba45b712 \ No newline at end of file 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 new file mode 100644 index 00000000000..3edf5fcea59 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-common-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +177a6b30cca92f6f5f9873c9befd681377a4c328 \ No newline at end of file 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 deleted file mode 100644 index 862f16a32a3..00000000000 --- a/modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -85847aa81a98d29948731befb4784d141046fa0e \ No newline at end of file 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 new file mode 100644 index 00000000000..cba27387268 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-handler-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +fec0e63e7dd7f4eeef7ea8dc47a1ff32dfc7ebc2 \ No newline at end of file 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 deleted file mode 100644 index 7857ddac89c..00000000000 --- a/modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d33ce420bd22c8a53246296ceb6e1ff08d31f8e1 \ No newline at end of file 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 new file mode 100644 index 00000000000..3571d2ecfdc --- /dev/null +++ b/modules/transport-netty4/licenses/netty-resolver-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +f6eb553b53fb3a90a8ac1170697093fed82eae28 \ No newline at end of file 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 deleted file mode 100644 index dc86ce66f43..00000000000 --- a/modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5008406221a849a350ad2a8885f14ac330e038f3 \ No newline at end of file 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 new file mode 100644 index 00000000000..e502d4c7708 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +3c8ee2c4d4a1cbb947a5c184c7aeb2204260958b \ No newline at end of file