Skip to content

Commit c933738

Browse files
NETWORKING: Upgrade Netty to 4.1.30 (elastic#34417)
* closes elastic#34411
1 parent 87580cd commit c933738

16 files changed

+19
-16
lines changed

buildSrc/version.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ slf4j = 1.6.2
1515
# when updating the JNA version, also update the version in buildSrc/build.gradle
1616
jna = 4.5.1
1717

18+
netty = 4.1.30.Final
19+
1820
# test dependencies
1921
randomizedrunner = 2.7.0
2022
junit = 4.12

modules/transport-netty4/build.gradle

Lines changed: 10 additions & 9 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.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"
37+
compile "io.netty:netty-buffer:${versions.netty}"
38+
compile "io.netty:netty-codec:${versions.netty}"
39+
compile "io.netty:netty-codec-http:${versions.netty}"
40+
compile "io.netty:netty-common:${versions.netty}"
41+
compile "io.netty:netty-handler:${versions.netty}"
42+
compile "io.netty:netty-resolver:${versions.netty}"
43+
compile "io.netty:netty-transport:${versions.netty}"
4444
}
4545

4646
dependencyLicenses {
@@ -111,6 +111,7 @@ thirdPartyAudit.excludes = [
111111
// from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional
112112
'org.slf4j.Logger',
113113
'org.slf4j.LoggerFactory',
114+
'org.slf4j.spi.LocationAwareLogger',
114115

115116
'com.google.protobuf.ExtensionRegistryLite',
116117
'com.google.protobuf.MessageLiteOrBuilder',
@@ -133,7 +134,6 @@ thirdPartyAudit.excludes = [
133134
'net.jpountz.xxhash.StreamingXXHash32',
134135
'net.jpountz.xxhash.XXHashFactory',
135136
'io.netty.internal.tcnative.CertificateRequestedCallback',
136-
'io.netty.internal.tcnative.CertificateRequestedCallback$KeyMaterial',
137137
'io.netty.internal.tcnative.CertificateVerifier',
138138
'io.netty.internal.tcnative.SessionTicketKey',
139139
'io.netty.internal.tcnative.SniHostNameMatcher',
@@ -146,6 +146,7 @@ thirdPartyAudit.excludes = [
146146
'io.netty.util.internal.PlatformDependent0$1',
147147
'io.netty.util.internal.PlatformDependent0$2',
148148
'io.netty.util.internal.PlatformDependent0$3',
149+
'io.netty.util.internal.PlatformDependent0$5',
149150
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
150151
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
151152
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
@@ -160,7 +161,7 @@ thirdPartyAudit.excludes = [
160161

161162
'org.conscrypt.AllocatedBuffer',
162163
'org.conscrypt.BufferAllocator',
163-
'org.conscrypt.Conscrypt$Engines',
164+
'org.conscrypt.Conscrypt',
164165
'org.conscrypt.HandshakeListener'
165166
]
166167

modules/transport-netty4/licenses/netty-buffer-4.1.16.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+
597adb653306470fb3ec1af3c0f3f30a37b1310a

modules/transport-netty4/licenses/netty-codec-4.1.16.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+
515c8f609aaca28a94f984d89a9667dd3359c1b1

modules/transport-netty4/licenses/netty-codec-http-4.1.16.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+
1384c630e8a0eeef33ad12a28791dce6e1d8767c

modules/transport-netty4/licenses/netty-common-4.1.16.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+
5dca0c34d8f38af51a2398614e81888f51cf811a

modules/transport-netty4/licenses/netty-handler-4.1.16.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+
ecc076332ed103411347f4806a44ee32d9d9cb5f

modules/transport-netty4/licenses/netty-resolver-4.1.16.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+
5106fd687066ffd712e5295d32af4e2ac6482613

modules/transport-netty4/licenses/netty-transport-4.1.16.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+
3d27bb432a3b125167ac161b26415ad29ec17f02

0 commit comments

Comments
 (0)