From 08c0ecb90e77afb6234ee09853ee52681b6875cb Mon Sep 17 00:00:00 2001
From: Armin Braun <me@obrown.io>
Date: Tue, 30 Apr 2019 09:27:51 +0200
Subject: [PATCH] Upgrade to Netty 4.1.35 (#41499) (#41651)

* Some fixes and possible performance fixes in the last 3 versions ->
upgrading
---
 buildSrc/version.properties                                     | 2 +-
 modules/transport-netty4/build.gradle                           | 1 +
 .../licenses/netty-buffer-4.1.32.Final.jar.sha1                 | 1 -
 .../licenses/netty-buffer-4.1.35.Final.jar.sha1                 | 1 +
 .../transport-netty4/licenses/netty-codec-4.1.32.Final.jar.sha1 | 1 -
 .../transport-netty4/licenses/netty-codec-4.1.35.Final.jar.sha1 | 1 +
 .../licenses/netty-codec-http-4.1.32.Final.jar.sha1             | 1 -
 .../licenses/netty-codec-http-4.1.35.Final.jar.sha1             | 1 +
 .../licenses/netty-common-4.1.32.Final.jar.sha1                 | 1 -
 .../licenses/netty-common-4.1.35.Final.jar.sha1                 | 1 +
 .../licenses/netty-handler-4.1.32.Final.jar.sha1                | 1 -
 .../licenses/netty-handler-4.1.35.Final.jar.sha1                | 1 +
 .../licenses/netty-resolver-4.1.32.Final.jar.sha1               | 1 -
 .../licenses/netty-resolver-4.1.35.Final.jar.sha1               | 1 +
 .../licenses/netty-transport-4.1.32.Final.jar.sha1              | 1 -
 .../licenses/netty-transport-4.1.35.Final.jar.sha1              | 1 +
 plugins/transport-nio/build.gradle                              | 1 +
 .../transport-nio/licenses/netty-buffer-4.1.32.Final.jar.sha1   | 1 -
 .../transport-nio/licenses/netty-buffer-4.1.35.Final.jar.sha1   | 1 +
 .../transport-nio/licenses/netty-codec-4.1.32.Final.jar.sha1    | 1 -
 .../transport-nio/licenses/netty-codec-4.1.35.Final.jar.sha1    | 1 +
 .../licenses/netty-codec-http-4.1.32.Final.jar.sha1             | 1 -
 .../licenses/netty-codec-http-4.1.35.Final.jar.sha1             | 1 +
 .../transport-nio/licenses/netty-common-4.1.32.Final.jar.sha1   | 1 -
 .../transport-nio/licenses/netty-common-4.1.35.Final.jar.sha1   | 1 +
 .../transport-nio/licenses/netty-handler-4.1.32.Final.jar.sha1  | 1 -
 .../transport-nio/licenses/netty-handler-4.1.35.Final.jar.sha1  | 1 +
 .../transport-nio/licenses/netty-resolver-4.1.32.Final.jar.sha1 | 1 -
 .../transport-nio/licenses/netty-resolver-4.1.35.Final.jar.sha1 | 1 +
 .../licenses/netty-transport-4.1.32.Final.jar.sha1              | 1 -
 .../licenses/netty-transport-4.1.35.Final.jar.sha1              | 1 +
 31 files changed, 17 insertions(+), 15 deletions(-)
 delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.32.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.35.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.32.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.35.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.32.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.35.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.32.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.35.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.32.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.35.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.32.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.35.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.32.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.35.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.32.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.35.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.32.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.35.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.32.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.35.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-common-4.1.32.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-common-4.1.35.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.32.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.35.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.32.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.35.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.32.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.35.Final.jar.sha1

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 8c378526bd8..d0a93edd836 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.32.Final
+netty             = 4.1.35.Final
 joda              = 2.10.1
 
 # 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 e8050c637f1..23de6a7f93b 100644
--- a/modules/transport-netty4/build.gradle
+++ b/modules/transport-netty4/build.gradle
@@ -81,6 +81,7 @@ thirdPartyAudit {
         'io.netty.internal.tcnative.Library',
         'io.netty.internal.tcnative.SSL',
         'io.netty.internal.tcnative.SSLContext',
+        'io.netty.internal.tcnative.SSLPrivateKeyMethod',
 
         // from io.netty.handler.ssl.util.BouncyCastleSelfSignedCertGenerator (netty)
         'org.bouncycastle.cert.X509v3CertificateBuilder',
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.32.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.32.Final.jar.sha1
deleted file mode 100644
index 111093792d3..00000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-046ede57693788181b2cafddc3a5967ed2f621c8
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.35.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..6112faf2d01
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+a244722975cddaef5f9bbd45e7a44d0db5f058d8
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.32.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.32.Final.jar.sha1
deleted file mode 100644
index 5830dd05a50..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8f32bd79c5a16f014a4372ed979dc62b39ede33a
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.35.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..811797decc1
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+b86f6b9eedbe38d6fa0bbbefa961d566e293e13e
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.32.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.32.Final.jar.sha1
deleted file mode 100644
index 6ff945b6c2d..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0b9218adba7353ad5a75fcb639e4755d64bd6ddf
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.35.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..3b0f1f7daa3
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+f7a38b0a3ee2fff3d9dd2bb44f5e16140b70b354
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.32.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.32.Final.jar.sha1
deleted file mode 100644
index 02dd7ce15b8..00000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e95de4f762606f492328e180c8ad5438565a5e3b
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.35.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..26576f8e9cc
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+c776487b782046e1399b00cd40c63ef51d26e953
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.32.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.32.Final.jar.sha1
deleted file mode 100644
index 06af1850f8c..00000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b4e3fa13f219df14a9455cc2111f133374428be0
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.35.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..0956313b2aa
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+b23efe31416942718ac46ad00bb3e91e4b3f6ab7
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.32.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.32.Final.jar.sha1
deleted file mode 100644
index 58d0dfb949c..00000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e0114715cb125a12db8d982b2208e552a91256d
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.35.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..cdd335d0591
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+d60c4f4e12f0703dff477c9bf595f37a41ecacbc
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.32.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.32.Final.jar.sha1
deleted file mode 100644
index b248610a886..00000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d5e5a8ff9c2bc7d91ddccc536a5aca1a4355bd8b
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.35.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..8f52a39c4f7
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+526b2646885c57adb54e2f89b2e2b80bebce3962
\ No newline at end of file
diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle
index 9e855995c3b..9f93d18a0e1 100644
--- a/plugins/transport-nio/build.gradle
+++ b/plugins/transport-nio/build.gradle
@@ -120,6 +120,7 @@ thirdPartyAudit {
         'io.netty.internal.tcnative.Library',
         'io.netty.internal.tcnative.SSL',
         'io.netty.internal.tcnative.SSLContext',
+        'io.netty.internal.tcnative.SSLPrivateKeyMethod',
         'io.netty.internal.tcnative.CertificateCallback',
         'io.netty.internal.tcnative.CertificateVerifier',
         'io.netty.internal.tcnative.SessionTicketKey',
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.32.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.32.Final.jar.sha1
deleted file mode 100644
index 111093792d3..00000000000
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-046ede57693788181b2cafddc3a5967ed2f621c8
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.35.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..6112faf2d01
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+a244722975cddaef5f9bbd45e7a44d0db5f058d8
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.32.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.32.Final.jar.sha1
deleted file mode 100644
index 5830dd05a50..00000000000
--- a/plugins/transport-nio/licenses/netty-codec-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8f32bd79c5a16f014a4372ed979dc62b39ede33a
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.35.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..811797decc1
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+b86f6b9eedbe38d6fa0bbbefa961d566e293e13e
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.32.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.32.Final.jar.sha1
deleted file mode 100644
index 6ff945b6c2d..00000000000
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0b9218adba7353ad5a75fcb639e4755d64bd6ddf
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.35.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..3b0f1f7daa3
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+f7a38b0a3ee2fff3d9dd2bb44f5e16140b70b354
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.32.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.32.Final.jar.sha1
deleted file mode 100644
index 02dd7ce15b8..00000000000
--- a/plugins/transport-nio/licenses/netty-common-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e95de4f762606f492328e180c8ad5438565a5e3b
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.35.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..26576f8e9cc
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-common-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+c776487b782046e1399b00cd40c63ef51d26e953
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.32.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.32.Final.jar.sha1
deleted file mode 100644
index 06af1850f8c..00000000000
--- a/plugins/transport-nio/licenses/netty-handler-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b4e3fa13f219df14a9455cc2111f133374428be0
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.35.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..0956313b2aa
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+b23efe31416942718ac46ad00bb3e91e4b3f6ab7
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.32.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.32.Final.jar.sha1
deleted file mode 100644
index 58d0dfb949c..00000000000
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e0114715cb125a12db8d982b2208e552a91256d
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.35.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..cdd335d0591
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+d60c4f4e12f0703dff477c9bf595f37a41ecacbc
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.32.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.32.Final.jar.sha1
deleted file mode 100644
index b248610a886..00000000000
--- a/plugins/transport-nio/licenses/netty-transport-4.1.32.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d5e5a8ff9c2bc7d91ddccc536a5aca1a4355bd8b
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.35.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.35.Final.jar.sha1
new file mode 100644
index 00000000000..8f52a39c4f7
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.35.Final.jar.sha1
@@ -0,0 +1 @@
+526b2646885c57adb54e2f89b2e2b80bebce3962
\ No newline at end of file