Skip to content

Commit 24856f4

Browse files
original-brownbearkcm
authored andcommitted
NETWORKING: Upgrade Netty to 4.1.30 (#34417)
* closes #34411
1 parent f48e422 commit 24856f4

31 files changed

+34
-28
lines changed

buildSrc/version.properties

+2
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

+9-7
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.29.Final"
38-
compile "io.netty:netty-codec:4.1.29.Final"
39-
compile "io.netty:netty-codec-http:4.1.29.Final"
40-
compile "io.netty:netty-common:4.1.29.Final"
41-
compile "io.netty:netty-handler:4.1.29.Final"
42-
compile "io.netty:netty-resolver:4.1.29.Final"
43-
compile "io.netty:netty-transport:4.1.29.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',
@@ -145,6 +146,7 @@ thirdPartyAudit.excludes = [
145146
'io.netty.util.internal.PlatformDependent0$1',
146147
'io.netty.util.internal.PlatformDependent0$2',
147148
'io.netty.util.internal.PlatformDependent0$3',
149+
'io.netty.util.internal.PlatformDependent0$5',
148150
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
149151
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
150152
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
597adb653306470fb3ec1af3c0f3f30a37b1310a

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
515c8f609aaca28a94f984d89a9667dd3359c1b1

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1384c630e8a0eeef33ad12a28791dce6e1d8767c

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5dca0c34d8f38af51a2398614e81888f51cf811a

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ecc076332ed103411347f4806a44ee32d9d9cb5f

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5106fd687066ffd712e5295d32af4e2ac6482613

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3d27bb432a3b125167ac161b26415ad29ec17f02

plugins/transport-nio/build.gradle

+9-7
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ dependencies {
2929
compile "org.elasticsearch:elasticsearch-nio:${version}"
3030

3131
// network stack
32-
compile "io.netty:netty-buffer:4.1.29.Final"
33-
compile "io.netty:netty-codec:4.1.29.Final"
34-
compile "io.netty:netty-codec-http:4.1.29.Final"
35-
compile "io.netty:netty-common:4.1.29.Final"
36-
compile "io.netty:netty-handler:4.1.29.Final"
37-
compile "io.netty:netty-resolver:4.1.29.Final"
38-
compile "io.netty:netty-transport:4.1.29.Final"
32+
compile "io.netty:netty-buffer:${versions.netty}"
33+
compile "io.netty:netty-codec:${versions.netty}"
34+
compile "io.netty:netty-codec-http:${versions.netty}"
35+
compile "io.netty:netty-common:${versions.netty}"
36+
compile "io.netty:netty-handler:${versions.netty}"
37+
compile "io.netty:netty-resolver:${versions.netty}"
38+
compile "io.netty:netty-transport:${versions.netty}"
3939
}
4040

4141
dependencyLicenses {
@@ -90,6 +90,7 @@ thirdPartyAudit.excludes = [
9090
// from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional
9191
'org.slf4j.Logger',
9292
'org.slf4j.LoggerFactory',
93+
'org.slf4j.spi.LocationAwareLogger',
9394

9495
'com.google.protobuf.ExtensionRegistryLite',
9596
'com.google.protobuf.MessageLiteOrBuilder',
@@ -124,6 +125,7 @@ thirdPartyAudit.excludes = [
124125
'io.netty.util.internal.PlatformDependent0$1',
125126
'io.netty.util.internal.PlatformDependent0$2',
126127
'io.netty.util.internal.PlatformDependent0$3',
128+
'io.netty.util.internal.PlatformDependent0$5',
127129
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
128130
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
129131
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',

plugins/transport-nio/licenses/netty-buffer-4.1.29.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
597adb653306470fb3ec1af3c0f3f30a37b1310a

plugins/transport-nio/licenses/netty-codec-4.1.29.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
515c8f609aaca28a94f984d89a9667dd3359c1b1

plugins/transport-nio/licenses/netty-codec-http-4.1.29.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1384c630e8a0eeef33ad12a28791dce6e1d8767c

plugins/transport-nio/licenses/netty-common-4.1.29.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5dca0c34d8f38af51a2398614e81888f51cf811a

plugins/transport-nio/licenses/netty-handler-4.1.29.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ecc076332ed103411347f4806a44ee32d9d9cb5f

plugins/transport-nio/licenses/netty-resolver-4.1.29.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5106fd687066ffd712e5295d32af4e2ac6482613

plugins/transport-nio/licenses/netty-transport-4.1.29.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3d27bb432a3b125167ac161b26415ad29ec17f02

0 commit comments

Comments
 (0)