Upgrade netty to 4.1.45.Final (#51689)

Upgrade netty.
2020-01-31 10:33:23 -07:00 · 2020-01-31 10:33:23 -07:00 · e752221fc6
parent 09773efb41
commit e752221fc6
31 changed files with 22 additions and 16 deletions
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@ -22,7 +22,7 @@ slf4j             = 1.6.2
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 4.5.1

-netty             = 4.1.43.Final
+netty             = 4.1.45.Final
 joda              = 2.10.4

 # when updating this version, you need to ensure compatibility with:
--- a/modules/transport-netty4/build.gradle
+++ b/modules/transport-netty4/build.gradle
@ -173,7 +173,10 @@ thirdPartyAudit {
    'org.conscrypt.AllocatedBuffer',
    'org.conscrypt.BufferAllocator',
    'org.conscrypt.Conscrypt',
-    'org.conscrypt.HandshakeListener'
+    'org.conscrypt.HandshakeListener',
+
+    'reactor.blockhound.BlockHound$Builder',
+    'reactor.blockhound.integration.BlockHoundIntegration'
  )

  ignoreViolations(
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.43.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-c0d142260a32709523e3bcf0d015b193f2ff2df4
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.45.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+0bac54338074540c4f3241a3d92358fad5df89ba
--- a/modules/transport-netty4/licenses/netty-codec-4.1.43.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-44731a5739c40a8434c43e1303e9196f23da67fa
--- a/modules/transport-netty4/licenses/netty-codec-4.1.45.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+8c768728a3e82c3cef62a7a2c8f52ae8d777bac9
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.43.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-07320f9db621dc51b79807a4e5094665f260432c
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.45.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+6f0770e3c00d94e47a9086e2d7870fd69c29c332
--- a/modules/transport-netty4/licenses/netty-common-4.1.43.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-common-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-ccb6f627ded1bb2671a66a84506174d240c7bec8
--- a/modules/transport-netty4/licenses/netty-common-4.1.45.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-common-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+5cf5e448d44ddf53d00f2fc4047c2a7aceaa7087
--- a/modules/transport-netty4/licenses/netty-handler-4.1.43.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-f83ac0492d44057d07ec6d40cf79e8e2de949836
--- a/modules/transport-netty4/licenses/netty-handler-4.1.45.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+51071ba9977cce64e3a58e6f2f6326bbb7e5bc7f
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.43.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-94ae5a7e595fdc29dac254014e3159d3572d7e44
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.45.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+9e77bdc045d33a570dabf9d53192ea954bb195d7
--- a/modules/transport-netty4/licenses/netty-transport-4.1.43.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-781cd7cfc1118bdfe1538f39cc1f4d07d6254094
--- a/modules/transport-netty4/licenses/netty-transport-4.1.45.Final.jar.sha1
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+b7d8f2645e330bd66cd4f28f155eba605e0c8758
--- a/plugins/transport-nio/build.gradle
+++ b/plugins/transport-nio/build.gradle
@ -132,6 +132,9 @@ thirdPartyAudit {
    'io.netty.internal.tcnative.CertificateVerifier',
    'io.netty.internal.tcnative.SessionTicketKey',
    'io.netty.internal.tcnative.SniHostNameMatcher',
+
+    'reactor.blockhound.BlockHound$Builder',
+    'reactor.blockhound.integration.BlockHoundIntegration'
  )

  ignoreViolations(
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.43.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-c0d142260a32709523e3bcf0d015b193f2ff2df4
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.45.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+0bac54338074540c4f3241a3d92358fad5df89ba
--- a/plugins/transport-nio/licenses/netty-codec-4.1.43.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-44731a5739c40a8434c43e1303e9196f23da67fa
--- a/plugins/transport-nio/licenses/netty-codec-4.1.45.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+8c768728a3e82c3cef62a7a2c8f52ae8d777bac9
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.43.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-07320f9db621dc51b79807a4e5094665f260432c
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.45.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+6f0770e3c00d94e47a9086e2d7870fd69c29c332
--- a/plugins/transport-nio/licenses/netty-common-4.1.43.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-common-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-ccb6f627ded1bb2671a66a84506174d240c7bec8
--- a/plugins/transport-nio/licenses/netty-common-4.1.45.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-common-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+5cf5e448d44ddf53d00f2fc4047c2a7aceaa7087
--- a/plugins/transport-nio/licenses/netty-handler-4.1.43.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-f83ac0492d44057d07ec6d40cf79e8e2de949836
--- a/plugins/transport-nio/licenses/netty-handler-4.1.45.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+51071ba9977cce64e3a58e6f2f6326bbb7e5bc7f
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.43.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-94ae5a7e595fdc29dac254014e3159d3572d7e44
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.45.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+9e77bdc045d33a570dabf9d53192ea954bb195d7
--- a/plugins/transport-nio/licenses/netty-transport-4.1.43.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.43.Final.jar.sha1
@ -1 +0,0 @@
-781cd7cfc1118bdfe1538f39cc1f4d07d6254094
--- a/plugins/transport-nio/licenses/netty-transport-4.1.45.Final.jar.sha1
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.45.Final.jar.sha1
@ -0,0 +1 @@
+b7d8f2645e330bd66cd4f28f155eba605e0c8758