From c96257ca734c19fc5b0cc0dd77440febf1087257 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Thu, 6 Jul 2017 15:37:00 -0400
Subject: [PATCH] Upgrade to Netty 4.1.13.Final

This commit upgrades the Netty dependency from version 4.1.11.Final to
4.1.13.Final.

Relates #25581
---
 modules/transport-netty4/build.gradle              | 14 +++++++-------
 .../licenses/netty-buffer-4.1.11.Final.jar.sha1    |  1 -
 .../licenses/netty-buffer-4.1.13.Final.jar.sha1    |  1 +
 .../licenses/netty-codec-4.1.11.Final.jar.sha1     |  1 -
 .../licenses/netty-codec-4.1.13.Final.jar.sha1     |  1 +
 .../netty-codec-http-4.1.11.Final.jar.sha1         |  1 -
 .../netty-codec-http-4.1.13.Final.jar.sha1         |  1 +
 .../licenses/netty-common-4.1.11.Final.jar.sha1    |  1 -
 .../licenses/netty-common-4.1.13.Final.jar.sha1    |  1 +
 .../licenses/netty-handler-4.1.11.Final.jar.sha1   |  1 -
 .../licenses/netty-handler-4.1.13.Final.jar.sha1   |  1 +
 .../licenses/netty-resolver-4.1.11.Final.jar.sha1  |  1 -
 .../licenses/netty-resolver-4.1.13.Final.jar.sha1  |  1 +
 .../licenses/netty-transport-4.1.11.Final.jar.sha1 |  1 -
 .../licenses/netty-transport-4.1.13.Final.jar.sha1 |  1 +
 .../main/plugin-metadata/plugin-security.policy    |  4 ++--
 16 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.11.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.11.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.11.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.11.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.11.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.11.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.11.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1

diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
index 87db7e93075..222cbca07ae 100644
--- a/modules/transport-netty4/build.gradle
+++ b/modules/transport-netty4/build.gradle
@@ -34,13 +34,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr
 
 dependencies {
     // network stack
-    compile "io.netty:netty-buffer:4.1.11.Final"
-    compile "io.netty:netty-codec:4.1.11.Final"
-    compile "io.netty:netty-codec-http:4.1.11.Final"
-    compile "io.netty:netty-common:4.1.11.Final"
-    compile "io.netty:netty-handler:4.1.11.Final"
-    compile "io.netty:netty-resolver:4.1.11.Final"
-    compile "io.netty:netty-transport:4.1.11.Final"
+    compile "io.netty:netty-buffer:4.1.13.Final"
+    compile "io.netty:netty-codec:4.1.13.Final"
+    compile "io.netty:netty-codec-http:4.1.13.Final"
+    compile "io.netty:netty-common:4.1.13.Final"
+    compile "io.netty:netty-handler:4.1.13.Final"
+    compile "io.netty:netty-resolver:4.1.13.Final"
+    compile "io.netty:netty-transport:4.1.13.Final"
 }
 
 dependencyLicenses {
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.11.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.11.Final.jar.sha1
deleted file mode 100644
index 5c7fd45c71b..00000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.11.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-84da342824017dcbeefda0becfef11ce2b5836da
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1
new file mode 100644
index 00000000000..31f015e158a
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1
@@ -0,0 +1 @@
+0e3f583ea8a2618a7563b1ee2aa696c23edcc3d8
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.11.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.11.Final.jar.sha1
deleted file mode 100644
index 0d5093c08a2..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.11.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d9ffe2192b567a4df052f6a36e7b7090b510e0cf
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1
new file mode 100644
index 00000000000..6e7f1bdc14c
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1
@@ -0,0 +1 @@
+370eeb6e9d92495a2a3be096ab6102755af76730
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.11.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.11.Final.jar.sha1
deleted file mode 100644
index ba7787f052d..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.11.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3edeb0f08e455e570a55eb56bf64595fcb1a6b15
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1
new file mode 100644
index 00000000000..80d18918e1d
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1
@@ -0,0 +1 @@
+0ee87368766e6b900cf6be8ac9cdce27156e9411
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.11.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.11.Final.jar.sha1
deleted file mode 100644
index 786f535a322..00000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.11.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f79a702bc5f275832ae18e33ba3d2a264a4aa728
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1
new file mode 100644
index 00000000000..044ec3ef4ed
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1
@@ -0,0 +1 @@
+f640e8cd8866527150784f8986152d3bba45b712
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.11.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.11.Final.jar.sha1
deleted file mode 100644
index 5a27bb52a82..00000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.11.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6f43aae489b2e4fd7446cd347b077bb058a225d8
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1
new file mode 100644
index 00000000000..862f16a32a3
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1
@@ -0,0 +1 @@
+85847aa81a98d29948731befb4784d141046fa0e
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.11.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.11.Final.jar.sha1
deleted file mode 100644
index 5fdf253a110..00000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.11.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3310d435f97ef9769dd5659dae3ef762ee3f0f57
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1
new file mode 100644
index 00000000000..7857ddac89c
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1
@@ -0,0 +1 @@
+d33ce420bd22c8a53246296ceb6e1ff08d31f8e1
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.11.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.11.Final.jar.sha1
deleted file mode 100644
index 4c2de1a7a1a..00000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.11.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6244fb27cbc24a8d006e9aaaead6b25dcf3aa2e1
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1
new file mode 100644
index 00000000000..dc86ce66f43
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1
@@ -0,0 +1 @@
+5008406221a849a350ad2a8885f14ac330e038f3
\ No newline at end of file
diff --git a/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy b/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy
index 2fd74d6c762..4c87e1ef9c5 100644
--- a/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy
+++ b/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-grant codeBase "${codebase.netty-common-4.1.11.Final.jar}" {
+grant codeBase "${codebase.netty-common-4.1.13.Final.jar}" {
    // for reading the system-wide configuration for the backlog of established sockets
    permission java.io.FilePermission "/proc/sys/net/core/somaxconn", "read";
 
@@ -25,7 +25,7 @@ grant codeBase "${codebase.netty-common-4.1.11.Final.jar}" {
    permission java.net.SocketPermission "*", "accept,connect";
 };
 
-grant codeBase "${codebase.netty-transport-4.1.11.Final.jar}" {
+grant codeBase "${codebase.netty-transport-4.1.13.Final.jar}" {
    // Netty NioEventLoop wants to change this, because of https://bugs.openjdk.java.net/browse/JDK-6427854
    // the bug says it only happened rarely, and that its fixed, but apparently it still happens rarely!
    permission java.util.PropertyPermission "sun.nio.ch.bugLevel", "write";