From 04a48430aa59fde2855a522db90e9d8f5899c56e Mon Sep 17 00:00:00 2001
From: Armin Braun <me@obrown.io>
Date: Sun, 25 Nov 2018 10:17:54 +0100
Subject: [PATCH] NETWORKING: Upgrade Netty 4.3.31.Final (#35877)

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

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index b65388c2cdd..1d4bd51477d 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -15,7 +15,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.30.Final
+netty             = 4.1.31.Final
 joda              = 2.10.1
 
 # test dependencies
diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
index 210b440ebb9..afa82e01586 100644
--- a/modules/transport-netty4/build.gradle
+++ b/modules/transport-netty4/build.gradle
@@ -133,7 +133,7 @@ thirdPartyAudit.excludes = [
         'net.jpountz.lz4.LZ4FastDecompressor',
         'net.jpountz.xxhash.StreamingXXHash32',
         'net.jpountz.xxhash.XXHashFactory',
-        'io.netty.internal.tcnative.CertificateRequestedCallback',
+        'io.netty.internal.tcnative.CertificateCallback',
         'io.netty.internal.tcnative.CertificateVerifier',
         'io.netty.internal.tcnative.SessionTicketKey',
         'io.netty.internal.tcnative.SniHostNameMatcher',
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.30.Final.jar.sha1
deleted file mode 100644
index 070bb3f8332..00000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-597adb653306470fb3ec1af3c0f3f30a37b1310a
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.31.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..22b58c52414
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+e086523d6bb01fcab1d8dd370eecfcd606311b92
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.30.Final.jar.sha1
deleted file mode 100644
index cd0786f3e9f..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-515c8f609aaca28a94f984d89a9667dd3359c1b1
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.31.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..83e6eab1261
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+cfa60b136f5ea57787e910eee37e240bb45402a7
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.30.Final.jar.sha1
deleted file mode 100644
index e795cce1ba0..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1384c630e8a0eeef33ad12a28791dce6e1d8767c
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.31.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..b6d43d380ac
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+bf6321b3f10ea3aefc1970b30bb8928e833f236c
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.30.Final.jar.sha1
deleted file mode 100644
index 079e35ecc4c..00000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5dca0c34d8f38af51a2398614e81888f51cf811a
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.31.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..1c0c67721e2
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+39ddfa47808c8393a343513571e404fef02f45f0
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.30.Final.jar.sha1
deleted file mode 100644
index 50b87cdac13..00000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ecc076332ed103411347f4806a44ee32d9d9cb5f
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.31.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..c344af3b70a
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+7703c0696f2f34ec7c223c6a5750366a5f4dfb6f
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.30.Final.jar.sha1
deleted file mode 100644
index 2ef4d895143..00000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5106fd687066ffd712e5295d32af4e2ac6482613
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.31.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..f6d72804412
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+8ea7a47400beedd5bb901b96a0730eea8b7b6f2a
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.30.Final.jar.sha1
deleted file mode 100644
index e4febd661cb..00000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3d27bb432a3b125167ac161b26415ad29ec17f02
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.31.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..e44515c5e8f
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+e3396bd65e9c76accac11c29dca035da1cc39cb1
\ No newline at end of file
diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle
index 97ce4330fb5..2287fd683f8 100644
--- a/plugins/transport-nio/build.gradle
+++ b/plugins/transport-nio/build.gradle
@@ -112,7 +112,7 @@ thirdPartyAudit.excludes = [
         'net.jpountz.lz4.LZ4FastDecompressor',
         'net.jpountz.xxhash.StreamingXXHash32',
         'net.jpountz.xxhash.XXHashFactory',
-        'io.netty.internal.tcnative.CertificateRequestedCallback',
+        'io.netty.internal.tcnative.CertificateCallback',
         'io.netty.internal.tcnative.CertificateVerifier',
         'io.netty.internal.tcnative.SessionTicketKey',
         'io.netty.internal.tcnative.SniHostNameMatcher',
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.30.Final.jar.sha1
deleted file mode 100644
index 070bb3f8332..00000000000
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-597adb653306470fb3ec1af3c0f3f30a37b1310a
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.31.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..22b58c52414
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+e086523d6bb01fcab1d8dd370eecfcd606311b92
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.30.Final.jar.sha1
deleted file mode 100644
index cd0786f3e9f..00000000000
--- a/plugins/transport-nio/licenses/netty-codec-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-515c8f609aaca28a94f984d89a9667dd3359c1b1
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.31.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..83e6eab1261
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+cfa60b136f5ea57787e910eee37e240bb45402a7
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.30.Final.jar.sha1
deleted file mode 100644
index e795cce1ba0..00000000000
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1384c630e8a0eeef33ad12a28791dce6e1d8767c
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.31.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..b6d43d380ac
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+bf6321b3f10ea3aefc1970b30bb8928e833f236c
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.30.Final.jar.sha1
deleted file mode 100644
index 079e35ecc4c..00000000000
--- a/plugins/transport-nio/licenses/netty-common-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5dca0c34d8f38af51a2398614e81888f51cf811a
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.31.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..1c0c67721e2
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-common-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+39ddfa47808c8393a343513571e404fef02f45f0
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.30.Final.jar.sha1
deleted file mode 100644
index 50b87cdac13..00000000000
--- a/plugins/transport-nio/licenses/netty-handler-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ecc076332ed103411347f4806a44ee32d9d9cb5f
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.31.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..c344af3b70a
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+7703c0696f2f34ec7c223c6a5750366a5f4dfb6f
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.30.Final.jar.sha1
deleted file mode 100644
index 2ef4d895143..00000000000
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5106fd687066ffd712e5295d32af4e2ac6482613
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.31.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..f6d72804412
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+8ea7a47400beedd5bb901b96a0730eea8b7b6f2a
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.30.Final.jar.sha1
deleted file mode 100644
index e4febd661cb..00000000000
--- a/plugins/transport-nio/licenses/netty-transport-4.1.30.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3d27bb432a3b125167ac161b26415ad29ec17f02
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.31.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.31.Final.jar.sha1
new file mode 100644
index 00000000000..e44515c5e8f
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.31.Final.jar.sha1
@@ -0,0 +1 @@
+e3396bd65e9c76accac11c29dca035da1cc39cb1
\ No newline at end of file