From 6a51017cb2f64117b9fbda961592a3ef8a402d8b Mon Sep 17 00:00:00 2001
From: Tim Brooks <tim@uncontended.net>
Date: Thu, 30 Apr 2020 15:58:27 -0600
Subject: [PATCH] Upgrade netty to 4.1.49.Final (#56059)

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

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 93f1cd4005a..a7d008607cf 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.45.Final
+netty             = 4.1.49.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 ea6c749adb6..7a49fa55256 100644
--- a/modules/transport-netty4/build.gradle
+++ b/modules/transport-netty4/build.gradle
@@ -156,6 +156,7 @@ thirdPartyAudit {
     'com.ning.compress.BufferRecycler',
     'com.ning.compress.lzf.ChunkDecoder',
     'com.ning.compress.lzf.ChunkEncoder',
+    'com.ning.compress.lzf.LZFChunk',
     'com.ning.compress.lzf.LZFEncoder',
     'com.ning.compress.lzf.util.ChunkDecoderFactory',
     'com.ning.compress.lzf.util.ChunkEncoderFactory',
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
deleted file mode 100644
index 63591509826..00000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0bac54338074540c4f3241a3d92358fad5df89ba
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..14da1fbad92
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+8e819a81bca88d1e88137336f64531a53db0a4ad
\ 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
deleted file mode 100644
index 0efc0b6a9ce..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8c768728a3e82c3cef62a7a2c8f52ae8d777bac9
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..6353dc0b7ad
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+20218de83c906348283f548c255650fd06030424
\ 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
deleted file mode 100644
index 0d0e9294f6c..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6f0770e3c00d94e47a9086e2d7870fd69c29c332
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..07651dd7f76
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+4f30dbc462b26c588dffc0eb7552caef1a0f549e
\ 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
deleted file mode 100644
index b651ce5a077..00000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5cf5e448d44ddf53d00f2fc4047c2a7aceaa7087
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..2c0aee66a99
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+927c8563a1662d869b145e70ce82ad89100f2c90
\ 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
deleted file mode 100644
index 1ffafd43d01..00000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-51071ba9977cce64e3a58e6f2f6326bbb7e5bc7f
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..c6e2ae4fa04
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+c73443adb9d085d5dc2d5b7f3bdd91d5963976f7
\ 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
deleted file mode 100644
index b298b561c18..00000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9e77bdc045d33a570dabf9d53192ea954bb195d7
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..986895a8ecf
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+eb81e1f0eaa99e75983bf3d28cae2b103e0f3a34
\ 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
deleted file mode 100644
index 9f2167b89fa..00000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b7d8f2645e330bd66cd4f28f155eba605e0c8758
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.49.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..175b8c84a88
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+415ea7f326635743aec952fe2349ca45959e94a7
\ No newline at end of file
diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle
index 192efe63c43..e93166091ea 100644
--- a/plugins/transport-nio/build.gradle
+++ b/plugins/transport-nio/build.gradle
@@ -104,6 +104,7 @@ thirdPartyAudit {
     'com.ning.compress.BufferRecycler',
     'com.ning.compress.lzf.ChunkDecoder',
     'com.ning.compress.lzf.ChunkEncoder',
+    'com.ning.compress.lzf.LZFChunk',
     'com.ning.compress.lzf.LZFEncoder',
     'com.ning.compress.lzf.util.ChunkDecoderFactory',
     'com.ning.compress.lzf.util.ChunkEncoderFactory',
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
deleted file mode 100644
index 63591509826..00000000000
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0bac54338074540c4f3241a3d92358fad5df89ba
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..14da1fbad92
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+8e819a81bca88d1e88137336f64531a53db0a4ad
\ 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
deleted file mode 100644
index 0efc0b6a9ce..00000000000
--- a/plugins/transport-nio/licenses/netty-codec-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8c768728a3e82c3cef62a7a2c8f52ae8d777bac9
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..6353dc0b7ad
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+20218de83c906348283f548c255650fd06030424
\ 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
deleted file mode 100644
index 0d0e9294f6c..00000000000
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6f0770e3c00d94e47a9086e2d7870fd69c29c332
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..07651dd7f76
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+4f30dbc462b26c588dffc0eb7552caef1a0f549e
\ 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
deleted file mode 100644
index b651ce5a077..00000000000
--- a/plugins/transport-nio/licenses/netty-common-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5cf5e448d44ddf53d00f2fc4047c2a7aceaa7087
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..2c0aee66a99
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-common-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+927c8563a1662d869b145e70ce82ad89100f2c90
\ 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
deleted file mode 100644
index 1ffafd43d01..00000000000
--- a/plugins/transport-nio/licenses/netty-handler-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-51071ba9977cce64e3a58e6f2f6326bbb7e5bc7f
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..c6e2ae4fa04
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+c73443adb9d085d5dc2d5b7f3bdd91d5963976f7
\ 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
deleted file mode 100644
index b298b561c18..00000000000
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9e77bdc045d33a570dabf9d53192ea954bb195d7
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..986895a8ecf
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+eb81e1f0eaa99e75983bf3d28cae2b103e0f3a34
\ 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
deleted file mode 100644
index 9f2167b89fa..00000000000
--- a/plugins/transport-nio/licenses/netty-transport-4.1.45.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b7d8f2645e330bd66cd4f28f155eba605e0c8758
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.49.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.49.Final.jar.sha1
new file mode 100644
index 00000000000..175b8c84a88
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.49.Final.jar.sha1
@@ -0,0 +1 @@
+415ea7f326635743aec952fe2349ca45959e94a7
\ No newline at end of file