From f51bf8ee47e1a804a2034a84409392ef43b3c278 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Thu, 20 Oct 2016 20:13:29 -0400
Subject: [PATCH] Upgrade to Netty 4.1.6

This commit upgrades the transport-netty4 module dependency from Netty
version 4.1.5 to version 4.1.6. This is a bug fix release of Netty.

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

diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
index 4fc38bc3947..4cd80e4a231 100644
--- a/modules/transport-netty4/build.gradle
+++ b/modules/transport-netty4/build.gradle
@@ -33,13 +33,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr
 
 dependencies {
     // network stack
-    compile "io.netty:netty-buffer:4.1.5.Final"
-    compile "io.netty:netty-codec:4.1.5.Final"
-    compile "io.netty:netty-codec-http:4.1.5.Final"
-    compile "io.netty:netty-common:4.1.5.Final"
-    compile "io.netty:netty-handler:4.1.5.Final"
-    compile "io.netty:netty-resolver:4.1.5.Final"
-    compile "io.netty:netty-transport:4.1.5.Final"
+    compile "io.netty:netty-buffer:4.1.6.Final"
+    compile "io.netty:netty-codec:4.1.6.Final"
+    compile "io.netty:netty-codec-http:4.1.6.Final"
+    compile "io.netty:netty-common:4.1.6.Final"
+    compile "io.netty:netty-handler:4.1.6.Final"
+    compile "io.netty:netty-resolver:4.1.6.Final"
+    compile "io.netty:netty-transport:4.1.6.Final"
 }
 
 integTest {
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.5.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.5.Final.jar.sha1
deleted file mode 100644
index e64426f033a..00000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.5.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b5fb6bccda4d63d4a74c9faccdf32f77ab66abc1
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.6.Final.jar.sha1
new file mode 100644
index 00000000000..a1b16cc76e9
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.6.Final.jar.sha1
@@ -0,0 +1 @@
+dc1a304ee7c448bfa241f60c41948db6f12b653b
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.5.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.5.Final.jar.sha1
deleted file mode 100644
index 66484a93047..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.5.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-66bbf9324fa36467d041083f89328e2a24ec4f67
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.6.Final.jar.sha1
new file mode 100644
index 00000000000..45cf352fc1b
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.6.Final.jar.sha1
@@ -0,0 +1 @@
+086ce3c559af6759a0b991b9ad2faec20981e18e
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.5.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.5.Final.jar.sha1
deleted file mode 100644
index 93a445416a5..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.5.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-087bda1b9ec7e3f75ca721fc87735cbedad2aa1a
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.6.Final.jar.sha1
new file mode 100644
index 00000000000..31ba47f6a30
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.6.Final.jar.sha1
@@ -0,0 +1 @@
+ee6c65cb3f39f212241e9131dc05a837e776fd70
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.5.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.5.Final.jar.sha1
deleted file mode 100644
index 95da96aaf80..00000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.5.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-607f8433d8782445e72abe34e43a7e57e86a5e6c
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.6.Final.jar.sha1
new file mode 100644
index 00000000000..1e2bbb9656e
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.6.Final.jar.sha1
@@ -0,0 +1 @@
+654e4d8e87bc442be5c1d82d0369a3885f7168ea
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.5.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.5.Final.jar.sha1
deleted file mode 100644
index 7aadd85058e..00000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.5.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6262900ee9487e62560030a136160df953b1cd6b
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.6.Final.jar.sha1
new file mode 100644
index 00000000000..9cfb2d9d0d0
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.6.Final.jar.sha1
@@ -0,0 +1 @@
+a24e92d67e467a3b97ff63642ab56637990685fd
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.5.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.5.Final.jar.sha1
deleted file mode 100644
index 060655014a3..00000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.5.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5f367bedcdc185a727fda3296b9a18014cdc22c4
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.6.Final.jar.sha1
new file mode 100644
index 00000000000..67c8474f268
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.6.Final.jar.sha1
@@ -0,0 +1 @@
+2a1c97445b6aa544cd029faa72abfb3f85e9957e
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.5.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.5.Final.jar.sha1
deleted file mode 100644
index 0e7dc27daaf..00000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.5.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-37126b370722ff9631ee13c91139aacec0a71d1d
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.6.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.6.Final.jar.sha1
new file mode 100644
index 00000000000..7107502b453
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.6.Final.jar.sha1
@@ -0,0 +1 @@
+4cba91ad2711c13a063d480f01edf70aa3f9387d
\ 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 a8cd1a7fffd..902bfdee231 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-transport-4.1.5.Final.jar}" {
+grant codeBase "${codebase.netty-transport-4.1.6.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";