Skip to content

Commit e59f14d

Browse files
authored
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.
1 parent f39402a commit e59f14d

15 files changed

+22
-22
lines changed

modules/transport-netty4/build.gradle

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr
3434

3535
dependencies {
3636
// network stack
37-
compile "io.netty:netty-buffer:4.1.13.Final"
38-
compile "io.netty:netty-codec:4.1.13.Final"
39-
compile "io.netty:netty-codec-http:4.1.13.Final"
40-
compile "io.netty:netty-common:4.1.13.Final"
41-
compile "io.netty:netty-handler:4.1.13.Final"
42-
compile "io.netty:netty-resolver:4.1.13.Final"
43-
compile "io.netty:netty-transport:4.1.13.Final"
37+
compile "io.netty:netty-buffer:4.1.16.Final"
38+
compile "io.netty:netty-codec:4.1.16.Final"
39+
compile "io.netty:netty-codec-http:4.1.16.Final"
40+
compile "io.netty:netty-common:4.1.16.Final"
41+
compile "io.netty:netty-handler:4.1.16.Final"
42+
compile "io.netty:netty-resolver:4.1.16.Final"
43+
compile "io.netty:netty-transport:4.1.16.Final"
4444
}
4545

4646
dependencyLicenses {
@@ -149,18 +149,18 @@ thirdPartyAudit.excludes = [
149149
'io.netty.util.internal.PlatformDependent0$3',
150150
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
151151
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
152-
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueue',
153-
'io.netty.util.internal.shaded.org.jctools.queues.ConcurrentSequencedCircularArrayQueue',
152+
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
153+
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields',
154+
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields',
154155
'io.netty.util.internal.shaded.org.jctools.queues.LinkedQueueNode',
155-
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerField',
156-
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerField',
157-
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerField',
158-
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueHeadLimitField',
159-
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueTailField',
160-
'io.netty.util.internal.shaded.org.jctools.util.JvmInfo',
156+
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
157+
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
158+
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
161159
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
162160
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
163161

162+
'org.conscrypt.AllocatedBuffer',
163+
'org.conscrypt.BufferAllocator',
164164
'org.conscrypt.Conscrypt$Engines',
165165
'org.conscrypt.HandshakeListener'
166166
]

modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
63b5fa95c74785e16f2c30ce268bc222e35c8cb5

modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d84a1f21768b7309c2954521cf5a1f46c2309eb1

modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d64312378b438dfdad84267c599a053327c6f02a

modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
177a6b30cca92f6f5f9873c9befd681377a4c328

modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fec0e63e7dd7f4eeef7ea8dc47a1ff32dfc7ebc2

modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f6eb553b53fb3a90a8ac1170697093fed82eae28

modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3c8ee2c4d4a1cbb947a5c184c7aeb2204260958b

0 commit comments

Comments
 (0)