From 458129a85aafb201857e11afc8fa728eaae47e7d Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Fri, 12 May 2017 15:53:51 -0400
Subject: [PATCH] Upgrade to Netty 4.1.11.Final

This commit upgrades the Netty dependency from 4.1.10.Final to
4.1.11.Final.

Relates #24652
---
 modules/transport-netty4/build.gradle              | 14 +++++++-------
 .../licenses/netty-buffer-4.1.10.Final.jar.sha1    |  1 -
 .../licenses/netty-buffer-4.1.11.Final.jar.sha1    |  1 +
 .../licenses/netty-codec-4.1.10.Final.jar.sha1     |  1 -
 .../licenses/netty-codec-4.1.11.Final.jar.sha1     |  1 +
 .../netty-codec-http-4.1.10.Final.jar.sha1         |  1 -
 .../netty-codec-http-4.1.11.Final.jar.sha1         |  1 +
 .../licenses/netty-common-4.1.10.Final.jar.sha1    |  1 -
 .../licenses/netty-common-4.1.11.Final.jar.sha1    |  1 +
 .../licenses/netty-handler-4.1.10.Final.jar.sha1   |  1 -
 .../licenses/netty-handler-4.1.11.Final.jar.sha1   |  1 +
 .../licenses/netty-resolver-4.1.10.Final.jar.sha1  |  1 -
 .../licenses/netty-resolver-4.1.11.Final.jar.sha1  |  1 +
 .../licenses/netty-transport-4.1.10.Final.jar.sha1 |  1 -
 .../licenses/netty-transport-4.1.11.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.10.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.11.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.10.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.11.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.10.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.11.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.10.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.11.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.10.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.11.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.10.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.11.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.10.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.11.Final.jar.sha1

diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
index c35dbe8ff29..87db7e93075 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.10.Final"
-    compile "io.netty:netty-codec:4.1.10.Final"
-    compile "io.netty:netty-codec-http:4.1.10.Final"
-    compile "io.netty:netty-common:4.1.10.Final"
-    compile "io.netty:netty-handler:4.1.10.Final"
-    compile "io.netty:netty-resolver:4.1.10.Final"
-    compile "io.netty:netty-transport:4.1.10.Final"
+    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"
 }
 
 dependencyLicenses {
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.10.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.10.Final.jar.sha1
deleted file mode 100644
index 147710bd3b4..00000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.10.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-62b25bb39c22f5a4c267b9ff1d9915f8c0191c3a
\ No newline at end of file
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
new file mode 100644
index 00000000000..5c7fd45c71b
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.11.Final.jar.sha1
@@ -0,0 +1 @@
+84da342824017dcbeefda0becfef11ce2b5836da
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.10.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.10.Final.jar.sha1
deleted file mode 100644
index 81bdd2f8854..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.10.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1fd4a9d3a8d1ded1e1620ce16ae4afe0b3746c41
\ 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
new file mode 100644
index 00000000000..0d5093c08a2
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.11.Final.jar.sha1
@@ -0,0 +1 @@
+d9ffe2192b567a4df052f6a36e7b7090b510e0cf
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.10.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.10.Final.jar.sha1
deleted file mode 100644
index e25988ddfa3..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.10.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-38cbc4d4a0d40dd6f94ff722d76f6f3ea07a6ca6
\ 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
new file mode 100644
index 00000000000..ba7787f052d
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.11.Final.jar.sha1
@@ -0,0 +1 @@
+3edeb0f08e455e570a55eb56bf64595fcb1a6b15
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.10.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.10.Final.jar.sha1
deleted file mode 100644
index 25de3864866..00000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.10.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-93eba0a663a990b8350c0949870b0db29d4d4f38
\ 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
new file mode 100644
index 00000000000..786f535a322
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.11.Final.jar.sha1
@@ -0,0 +1 @@
+f79a702bc5f275832ae18e33ba3d2a264a4aa728
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.10.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.10.Final.jar.sha1
deleted file mode 100644
index 22316debbe7..00000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.10.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c984b5d37563f15f10a0de0f4927d4a0dcb675de
\ 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
new file mode 100644
index 00000000000..5a27bb52a82
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.11.Final.jar.sha1
@@ -0,0 +1 @@
+6f43aae489b2e4fd7446cd347b077bb058a225d8
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.10.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.10.Final.jar.sha1
deleted file mode 100644
index 8c8a275ce05..00000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.10.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dd05aa176779768dde2562283b0df3c39b92767b
\ 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
new file mode 100644
index 00000000000..5fdf253a110
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.11.Final.jar.sha1
@@ -0,0 +1 @@
+3310d435f97ef9769dd5659dae3ef762ee3f0f57
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.10.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.10.Final.jar.sha1
deleted file mode 100644
index fca9fad1962..00000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.10.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7a2be072e9962c751f90307379c2edb86d0b61a7
\ 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
new file mode 100644
index 00000000000..4c2de1a7a1a
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.11.Final.jar.sha1
@@ -0,0 +1 @@
+6244fb27cbc24a8d006e9aaaead6b25dcf3aa2e1
\ 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 490e6254cd2..2fd74d6c762 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.10.Final.jar}" {
+grant codeBase "${codebase.netty-common-4.1.11.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.10.Final.jar}" {
    permission java.net.SocketPermission "*", "accept,connect";
 };
 
-grant codeBase "${codebase.netty-transport-4.1.10.Final.jar}" {
+grant codeBase "${codebase.netty-transport-4.1.11.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";