From fb508dba4a570c1952f67fd36bbef76716b99c96 Mon Sep 17 00:00:00 2001
From: Armin Braun <me@obrown.io>
Date: Fri, 9 Aug 2019 01:58:53 +0200
Subject: [PATCH] Upgrade to Netty 4.1.38 (#45132)

* A number of fixes to buffer handling in the .37 and .38 -> we should stay up to date
---
 buildSrc/version.properties                                    | 2 +-
 modules/transport-netty4/build.gradle                          | 3 ++-
 .../licenses/netty-buffer-4.1.36.Final.jar.sha1                | 1 -
 .../licenses/netty-buffer-4.1.38.Final.jar.sha1                | 1 +
 .../licenses/netty-codec-4.1.36.Final.jar.sha1                 | 1 -
 .../licenses/netty-codec-4.1.38.Final.jar.sha1                 | 1 +
 .../licenses/netty-codec-http-4.1.36.Final.jar.sha1            | 1 -
 .../licenses/netty-codec-http-4.1.38.Final.jar.sha1            | 1 +
 .../licenses/netty-common-4.1.36.Final.jar.sha1                | 1 -
 .../licenses/netty-common-4.1.38.Final.jar.sha1                | 1 +
 .../licenses/netty-handler-4.1.36.Final.jar.sha1               | 1 -
 .../licenses/netty-handler-4.1.38.Final.jar.sha1               | 1 +
 .../licenses/netty-resolver-4.1.36.Final.jar.sha1              | 1 -
 .../licenses/netty-resolver-4.1.38.Final.jar.sha1              | 1 +
 .../licenses/netty-transport-4.1.36.Final.jar.sha1             | 1 -
 .../licenses/netty-transport-4.1.38.Final.jar.sha1             | 1 +
 plugins/transport-nio/build.gradle                             | 2 +-
 .../transport-nio/licenses/netty-buffer-4.1.36.Final.jar.sha1  | 1 -
 .../transport-nio/licenses/netty-buffer-4.1.38.Final.jar.sha1  | 1 +
 .../transport-nio/licenses/netty-codec-4.1.36.Final.jar.sha1   | 1 -
 .../transport-nio/licenses/netty-codec-4.1.38.Final.jar.sha1   | 1 +
 .../licenses/netty-codec-http-4.1.36.Final.jar.sha1            | 1 -
 .../licenses/netty-codec-http-4.1.38.Final.jar.sha1            | 1 +
 .../transport-nio/licenses/netty-common-4.1.36.Final.jar.sha1  | 1 -
 .../transport-nio/licenses/netty-common-4.1.38.Final.jar.sha1  | 1 +
 .../transport-nio/licenses/netty-handler-4.1.36.Final.jar.sha1 | 1 -
 .../transport-nio/licenses/netty-handler-4.1.38.Final.jar.sha1 | 1 +
 .../licenses/netty-resolver-4.1.36.Final.jar.sha1              | 1 -
 .../licenses/netty-resolver-4.1.38.Final.jar.sha1              | 1 +
 .../licenses/netty-transport-4.1.36.Final.jar.sha1             | 1 -
 .../licenses/netty-transport-4.1.38.Final.jar.sha1             | 1 +
 31 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.36.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.38.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.36.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.38.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.36.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.38.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.36.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.38.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.36.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.38.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.36.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.38.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.36.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.38.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.36.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.38.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.36.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.38.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.36.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.38.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-common-4.1.36.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-common-4.1.38.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.36.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.38.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.36.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.38.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.36.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.38.Final.jar.sha1

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index c8ea3dd75b042..0e41af0992835 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -20,7 +20,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.36.Final
+netty             = 4.1.38.Final
 joda              = 2.10.2
 
 # 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 4201e496dc981..ff21cfa30d357 100644
--- a/modules/transport-netty4/build.gradle
+++ b/modules/transport-netty4/build.gradle
@@ -143,12 +143,13 @@ thirdPartyAudit {
         'net.jpountz.lz4.LZ4Compressor',
         'net.jpountz.lz4.LZ4Factory',
         'net.jpountz.lz4.LZ4FastDecompressor',
-        'net.jpountz.xxhash.StreamingXXHash32',
+        'net.jpountz.xxhash.XXHash32',
         'net.jpountz.xxhash.XXHashFactory',
         'io.netty.internal.tcnative.CertificateCallback',
         'io.netty.internal.tcnative.CertificateVerifier',
         'io.netty.internal.tcnative.SessionTicketKey',
         'io.netty.internal.tcnative.SniHostNameMatcher',
+        'io.netty.internal.tcnative.SSL',
         'org.eclipse.jetty.alpn.ALPN$ClientProvider',
         'org.eclipse.jetty.alpn.ALPN$ServerProvider',
         'org.eclipse.jetty.alpn.ALPN',
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.36.Final.jar.sha1
deleted file mode 100644
index 90895a5e168c9..0000000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7f2db0921dd57df4db076229830ab09bba713aeb
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..5f99086039f07
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+d16cf15d29c409987cecde77407fbb6f1e16d262
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.36.Final.jar.sha1
deleted file mode 100644
index efd6e5a327745..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8462116d327bb3d1ec24258071f2e7345a73dbfc
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..2db183d46ca8f
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+ccfbdfc727cbf702350572a0b12fe92185ebf162
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.36.Final.jar.sha1
deleted file mode 100644
index 4e86fef0e121a..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-62b73d439dbddf3c0dde092b048580139695ab46
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..0a75cdf99577d
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+4d55b3cdb74cd140d262de96987ebd369125a64c
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.36.Final.jar.sha1
deleted file mode 100644
index d9d50d776e9ba..0000000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f6f38fde652a70ea579897edc80e52353e487ae6
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..e6ccf03b91064
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+6f8aae763f743d91fb1ba1e9011dae0ef4f6ff34
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.36.Final.jar.sha1
deleted file mode 100644
index d943140f3634c..0000000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1c38a5920a10c01b1cce4cdc964447ec76abf1b5
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..10e2094ebbd32
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+ebf1f2bd0dad5e16aa1fc48d32e5dbe507b38d53
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.36.Final.jar.sha1
deleted file mode 100644
index 1499233b60d33..0000000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e4d243fbf4e6837fa294f892bf97149e18129100
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..01512737b8d8e
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+b00be4aa309e9b56e498191aa8c73e4f393759ed
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.36.Final.jar.sha1
deleted file mode 100644
index f36c1b17d74e0..0000000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8546e6be47be587acab86bbd106ca023678f07d9
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..197ce53e032b7
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+cd8b612d5daa42d1be3bb3203e4857597d5db79b
\ No newline at end of file
diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle
index bf9b42d0558b2..a4d8e7a231c70 100644
--- a/plugins/transport-nio/build.gradle
+++ b/plugins/transport-nio/build.gradle
@@ -107,7 +107,7 @@ thirdPartyAudit {
         'net.jpountz.lz4.LZ4Compressor',
         'net.jpountz.lz4.LZ4Factory',
         'net.jpountz.lz4.LZ4FastDecompressor',
-        'net.jpountz.xxhash.StreamingXXHash32',
+        'net.jpountz.xxhash.XXHash32',
         'net.jpountz.xxhash.XXHashFactory',
         'org.eclipse.jetty.alpn.ALPN$ClientProvider',
         'org.eclipse.jetty.alpn.ALPN$ServerProvider',
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.36.Final.jar.sha1
deleted file mode 100644
index 90895a5e168c9..0000000000000
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7f2db0921dd57df4db076229830ab09bba713aeb
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..5f99086039f07
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+d16cf15d29c409987cecde77407fbb6f1e16d262
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.36.Final.jar.sha1
deleted file mode 100644
index efd6e5a327745..0000000000000
--- a/plugins/transport-nio/licenses/netty-codec-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8462116d327bb3d1ec24258071f2e7345a73dbfc
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..2db183d46ca8f
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+ccfbdfc727cbf702350572a0b12fe92185ebf162
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.36.Final.jar.sha1
deleted file mode 100644
index 4e86fef0e121a..0000000000000
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-62b73d439dbddf3c0dde092b048580139695ab46
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..0a75cdf99577d
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+4d55b3cdb74cd140d262de96987ebd369125a64c
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.36.Final.jar.sha1
deleted file mode 100644
index d9d50d776e9ba..0000000000000
--- a/plugins/transport-nio/licenses/netty-common-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f6f38fde652a70ea579897edc80e52353e487ae6
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..e6ccf03b91064
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-common-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+6f8aae763f743d91fb1ba1e9011dae0ef4f6ff34
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.36.Final.jar.sha1
deleted file mode 100644
index d943140f3634c..0000000000000
--- a/plugins/transport-nio/licenses/netty-handler-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1c38a5920a10c01b1cce4cdc964447ec76abf1b5
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..10e2094ebbd32
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+ebf1f2bd0dad5e16aa1fc48d32e5dbe507b38d53
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.36.Final.jar.sha1
deleted file mode 100644
index 1499233b60d33..0000000000000
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e4d243fbf4e6837fa294f892bf97149e18129100
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..01512737b8d8e
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+b00be4aa309e9b56e498191aa8c73e4f393759ed
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.36.Final.jar.sha1
deleted file mode 100644
index f36c1b17d74e0..0000000000000
--- a/plugins/transport-nio/licenses/netty-transport-4.1.36.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8546e6be47be587acab86bbd106ca023678f07d9
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.38.Final.jar.sha1
new file mode 100644
index 0000000000000..197ce53e032b7
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+cd8b612d5daa42d1be3bb3203e4857597d5db79b
\ No newline at end of file