From e752221fc642118de5350d7bc5e8993ea8096d3e Mon Sep 17 00:00:00 2001
From: Tim Brooks <tim@uncontended.net>
Date: Fri, 31 Jan 2020 10:33:23 -0700
Subject: [PATCH] Upgrade netty to 4.1.45.Final (#51689)

Upgrade netty.
---
 buildSrc/version.properties                                  | 2 +-
 modules/transport-netty4/build.gradle                        | 5 ++++-
 .../licenses/netty-buffer-4.1.43.Final.jar.sha1              | 1 -
 .../licenses/netty-buffer-4.1.45.Final.jar.sha1              | 1 +
 .../licenses/netty-codec-4.1.43.Final.jar.sha1               | 1 -
 .../licenses/netty-codec-4.1.45.Final.jar.sha1               | 1 +
 .../licenses/netty-codec-http-4.1.43.Final.jar.sha1          | 1 -
 .../licenses/netty-codec-http-4.1.45.Final.jar.sha1          | 1 +
 .../licenses/netty-common-4.1.43.Final.jar.sha1              | 1 -
 .../licenses/netty-common-4.1.45.Final.jar.sha1              | 1 +
 .../licenses/netty-handler-4.1.43.Final.jar.sha1             | 1 -
 .../licenses/netty-handler-4.1.45.Final.jar.sha1             | 1 +
 .../licenses/netty-resolver-4.1.43.Final.jar.sha1            | 1 -
 .../licenses/netty-resolver-4.1.45.Final.jar.sha1            | 1 +
 .../licenses/netty-transport-4.1.43.Final.jar.sha1           | 1 -
 .../licenses/netty-transport-4.1.45.Final.jar.sha1           | 1 +
 plugins/transport-nio/build.gradle                           | 3 +++
 .../licenses/netty-buffer-4.1.43.Final.jar.sha1              | 1 -
 .../licenses/netty-buffer-4.1.45.Final.jar.sha1              | 1 +
 .../transport-nio/licenses/netty-codec-4.1.43.Final.jar.sha1 | 1 -
 .../transport-nio/licenses/netty-codec-4.1.45.Final.jar.sha1 | 1 +
 .../licenses/netty-codec-http-4.1.43.Final.jar.sha1          | 1 -
 .../licenses/netty-codec-http-4.1.45.Final.jar.sha1          | 1 +
 .../licenses/netty-common-4.1.43.Final.jar.sha1              | 1 -
 .../licenses/netty-common-4.1.45.Final.jar.sha1              | 1 +
 .../licenses/netty-handler-4.1.43.Final.jar.sha1             | 1 -
 .../licenses/netty-handler-4.1.45.Final.jar.sha1             | 1 +
 .../licenses/netty-resolver-4.1.43.Final.jar.sha1            | 1 -
 .../licenses/netty-resolver-4.1.45.Final.jar.sha1            | 1 +
 .../licenses/netty-transport-4.1.43.Final.jar.sha1           | 1 -
 .../licenses/netty-transport-4.1.45.Final.jar.sha1           | 1 +
 31 files changed, 22 insertions(+), 16 deletions(-)
 delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.43.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.45.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.43.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.45.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.43.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.45.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.43.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.45.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.43.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.45.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.43.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.45.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.43.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.45.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.43.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.45.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.43.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.45.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.43.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.45.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-common-4.1.43.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-common-4.1.45.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.43.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.45.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.43.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.45.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.43.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.45.Final.jar.sha1

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 044d1777978..3082cd02a5a 100644
--- 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:
diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
index cb190a56b54..d7e40c02759 100644
--- 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(
diff --git 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
deleted file mode 100644
index 39a1983f012..00000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c0d142260a32709523e3bcf0d015b193f2ff2df4
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..63591509826
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+0bac54338074540c4f3241a3d92358fad5df89ba
\ No newline at end of file
diff --git 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
deleted file mode 100644
index 26954c749a6..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-44731a5739c40a8434c43e1303e9196f23da67fa
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..0efc0b6a9ce
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+8c768728a3e82c3cef62a7a2c8f52ae8d777bac9
\ No newline at end of file
diff --git 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
deleted file mode 100644
index f75b7134294..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-07320f9db621dc51b79807a4e5094665f260432c
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..0d0e9294f6c
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+6f0770e3c00d94e47a9086e2d7870fd69c29c332
\ No newline at end of file
diff --git 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
deleted file mode 100644
index 8454bcb8a19..00000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ccb6f627ded1bb2671a66a84506174d240c7bec8
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..b651ce5a077
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+5cf5e448d44ddf53d00f2fc4047c2a7aceaa7087
\ No newline at end of file
diff --git 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
deleted file mode 100644
index 47abba9148d..00000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f83ac0492d44057d07ec6d40cf79e8e2de949836
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..1ffafd43d01
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+51071ba9977cce64e3a58e6f2f6326bbb7e5bc7f
\ No newline at end of file
diff --git 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
deleted file mode 100644
index 01bf3b84900..00000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-94ae5a7e595fdc29dac254014e3159d3572d7e44
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..b298b561c18
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+9e77bdc045d33a570dabf9d53192ea954bb195d7
\ No newline at end of file
diff --git 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
deleted file mode 100644
index 275eb47cc2f..00000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-781cd7cfc1118bdfe1538f39cc1f4d07d6254094
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..9f2167b89fa
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+b7d8f2645e330bd66cd4f28f155eba605e0c8758
\ No newline at end of file
diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle
index 22db4b348e7..8aa700286d3 100644
--- 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(
diff --git 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
deleted file mode 100644
index 39a1983f012..00000000000
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c0d142260a32709523e3bcf0d015b193f2ff2df4
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..63591509826
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+0bac54338074540c4f3241a3d92358fad5df89ba
\ No newline at end of file
diff --git 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
deleted file mode 100644
index 26954c749a6..00000000000
--- a/plugins/transport-nio/licenses/netty-codec-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-44731a5739c40a8434c43e1303e9196f23da67fa
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..0efc0b6a9ce
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+8c768728a3e82c3cef62a7a2c8f52ae8d777bac9
\ No newline at end of file
diff --git 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
deleted file mode 100644
index f75b7134294..00000000000
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-07320f9db621dc51b79807a4e5094665f260432c
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..0d0e9294f6c
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+6f0770e3c00d94e47a9086e2d7870fd69c29c332
\ No newline at end of file
diff --git 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
deleted file mode 100644
index 8454bcb8a19..00000000000
--- a/plugins/transport-nio/licenses/netty-common-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ccb6f627ded1bb2671a66a84506174d240c7bec8
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..b651ce5a077
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-common-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+5cf5e448d44ddf53d00f2fc4047c2a7aceaa7087
\ No newline at end of file
diff --git 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
deleted file mode 100644
index 47abba9148d..00000000000
--- a/plugins/transport-nio/licenses/netty-handler-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f83ac0492d44057d07ec6d40cf79e8e2de949836
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..1ffafd43d01
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+51071ba9977cce64e3a58e6f2f6326bbb7e5bc7f
\ No newline at end of file
diff --git 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
deleted file mode 100644
index 01bf3b84900..00000000000
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-94ae5a7e595fdc29dac254014e3159d3572d7e44
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..b298b561c18
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+9e77bdc045d33a570dabf9d53192ea954bb195d7
\ No newline at end of file
diff --git 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
deleted file mode 100644
index 275eb47cc2f..00000000000
--- a/plugins/transport-nio/licenses/netty-transport-4.1.43.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-781cd7cfc1118bdfe1538f39cc1f4d07d6254094
\ No newline at end of file
diff --git 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
new file mode 100644
index 00000000000..9f2167b89fa
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.45.Final.jar.sha1
@@ -0,0 +1 @@
+b7d8f2645e330bd66cd4f28f155eba605e0c8758
\ No newline at end of file