From 2ad06f6e670611f0a5c00e816adcda4c492c7805 Mon Sep 17 00:00:00 2001
From: Armin Braun <me@obrown.io>
Date: Tue, 25 Sep 2018 08:46:38 +0200
Subject: [PATCH] NETWORKING: Upgrade to Netty 4.1.29 (#33984)

---
 modules/transport-netty4/build.gradle              | 14 +++++++-------
 .../licenses/netty-buffer-4.1.28.Final.jar.sha1    |  1 -
 .../licenses/netty-buffer-4.1.29.Final.jar.sha1    |  1 +
 .../licenses/netty-codec-4.1.28.Final.jar.sha1     |  1 -
 .../licenses/netty-codec-4.1.29.Final.jar.sha1     |  1 +
 .../netty-codec-http-4.1.28.Final.jar.sha1         |  1 -
 .../netty-codec-http-4.1.29.Final.jar.sha1         |  1 +
 .../licenses/netty-common-4.1.28.Final.jar.sha1    |  1 -
 .../licenses/netty-common-4.1.29.Final.jar.sha1    |  1 +
 .../licenses/netty-handler-4.1.28.Final.jar.sha1   |  1 -
 .../licenses/netty-handler-4.1.29.Final.jar.sha1   |  1 +
 .../licenses/netty-resolver-4.1.28.Final.jar.sha1  |  1 -
 .../licenses/netty-resolver-4.1.29.Final.jar.sha1  |  1 +
 .../licenses/netty-transport-4.1.28.Final.jar.sha1 |  1 -
 .../licenses/netty-transport-4.1.29.Final.jar.sha1 |  1 +
 plugins/transport-nio/build.gradle                 | 14 +++++++-------
 .../licenses/netty-buffer-4.1.28.Final.jar.sha1    |  1 -
 .../licenses/netty-buffer-4.1.29.Final.jar.sha1    |  1 +
 .../licenses/netty-codec-4.1.28.Final.jar.sha1     |  1 -
 .../licenses/netty-codec-4.1.29.Final.jar.sha1     |  1 +
 .../netty-codec-http-4.1.28.Final.jar.sha1         |  1 -
 .../netty-codec-http-4.1.29.Final.jar.sha1         |  1 +
 .../licenses/netty-common-4.1.28.Final.jar.sha1    |  1 -
 .../licenses/netty-common-4.1.29.Final.jar.sha1    |  1 +
 .../licenses/netty-handler-4.1.28.Final.jar.sha1   |  1 -
 .../licenses/netty-handler-4.1.29.Final.jar.sha1   |  1 +
 .../licenses/netty-resolver-4.1.28.Final.jar.sha1  |  1 -
 .../licenses/netty-resolver-4.1.29.Final.jar.sha1  |  1 +
 .../licenses/netty-transport-4.1.28.Final.jar.sha1 |  1 -
 .../licenses/netty-transport-4.1.29.Final.jar.sha1 |  1 +
 30 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.28.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.29.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.28.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.29.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.28.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.29.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.28.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.29.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.28.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.29.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.28.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.29.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.28.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.29.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.28.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.29.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.28.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.29.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.28.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.29.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-common-4.1.28.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-common-4.1.29.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.28.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.29.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.28.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.29.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.28.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.29.Final.jar.sha1

diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
index e7c36ff506e..05e3b1807f0 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.28.Final"
-    compile "io.netty:netty-codec:4.1.28.Final"
-    compile "io.netty:netty-codec-http:4.1.28.Final"
-    compile "io.netty:netty-common:4.1.28.Final"
-    compile "io.netty:netty-handler:4.1.28.Final"
-    compile "io.netty:netty-resolver:4.1.28.Final"
-    compile "io.netty:netty-transport:4.1.28.Final"
+    compile "io.netty:netty-buffer:4.1.29.Final"
+    compile "io.netty:netty-codec:4.1.29.Final"
+    compile "io.netty:netty-codec-http:4.1.29.Final"
+    compile "io.netty:netty-common:4.1.29.Final"
+    compile "io.netty:netty-handler:4.1.29.Final"
+    compile "io.netty:netty-resolver:4.1.29.Final"
+    compile "io.netty:netty-transport:4.1.29.Final"
 }
 
 dependencyLicenses {
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.28.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.28.Final.jar.sha1
deleted file mode 100644
index f8a652d0dd1..00000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d6c2d13492778009d33f60e05ed90bcb535d1fd1
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..17798a82aa7
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+c3809f72e4b535b343b7dfa3c0c8210dad2fa5ea
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.28.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.28.Final.jar.sha1
deleted file mode 100644
index 70799bf1032..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a38361d893900947524f8a9da980555950e73d6a
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..f892420795b
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+1651bc2e279216773c234cafe402d68d2a5adc90
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.28.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.28.Final.jar.sha1
deleted file mode 100644
index e1d34ebf89b..00000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-897100c1022c780b0a436b9349e507e8fa9800dc
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..aa97345bad1
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+454688b88cea27a4d407202d1fc79a6522345b5e
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.28.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.28.Final.jar.sha1
deleted file mode 100644
index bc951426832..00000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df69ce8bb9b544a71e7bbee290253cf7c93e6bad
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..47140876e6a
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+a5d6a735ed07d8f197daa48db7f097cfc971ee5e
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.28.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.28.Final.jar.sha1
deleted file mode 100644
index 80dc8b8f6fe..00000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a035784682da0126bc25f10713dac732b5082a6d
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..7c2d407f75e
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+1acf1d94799296a2517533ec75ce7e155e9c4ea7
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.28.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.28.Final.jar.sha1
deleted file mode 100644
index afe004bd716..00000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f33557dcb31fa20da075ac05e4808115e32ef9b7
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..bac08f57079
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+bbec1dc913732e4773893c14d795b15d6c1e878e
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.28.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.28.Final.jar.sha1
deleted file mode 100644
index af19a16d6ed..00000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d2ef28f49d726737f0ffe84bf66529b3bf6e0c0d
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..0ce64132afb
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+c190b90f70e2ae8a48c068afad709e8728fcaa39
\ No newline at end of file
diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle
index cb8916b857c..d6d1793066a 100644
--- a/plugins/transport-nio/build.gradle
+++ b/plugins/transport-nio/build.gradle
@@ -29,13 +29,13 @@ dependencies {
     compile "org.elasticsearch:elasticsearch-nio:${version}"
 
     // network stack
-    compile "io.netty:netty-buffer:4.1.28.Final"
-    compile "io.netty:netty-codec:4.1.28.Final"
-    compile "io.netty:netty-codec-http:4.1.28.Final"
-    compile "io.netty:netty-common:4.1.28.Final"
-    compile "io.netty:netty-handler:4.1.28.Final"
-    compile "io.netty:netty-resolver:4.1.28.Final"
-    compile "io.netty:netty-transport:4.1.28.Final"
+    compile "io.netty:netty-buffer:4.1.29.Final"
+    compile "io.netty:netty-codec:4.1.29.Final"
+    compile "io.netty:netty-codec-http:4.1.29.Final"
+    compile "io.netty:netty-common:4.1.29.Final"
+    compile "io.netty:netty-handler:4.1.29.Final"
+    compile "io.netty:netty-resolver:4.1.29.Final"
+    compile "io.netty:netty-transport:4.1.29.Final"
 }
 
 dependencyLicenses {
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.28.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.28.Final.jar.sha1
deleted file mode 100644
index f8a652d0dd1..00000000000
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d6c2d13492778009d33f60e05ed90bcb535d1fd1
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..17798a82aa7
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+c3809f72e4b535b343b7dfa3c0c8210dad2fa5ea
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.28.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.28.Final.jar.sha1
deleted file mode 100644
index 70799bf1032..00000000000
--- a/plugins/transport-nio/licenses/netty-codec-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a38361d893900947524f8a9da980555950e73d6a
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..f892420795b
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+1651bc2e279216773c234cafe402d68d2a5adc90
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.28.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.28.Final.jar.sha1
deleted file mode 100644
index e1d34ebf89b..00000000000
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-897100c1022c780b0a436b9349e507e8fa9800dc
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..aa97345bad1
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+454688b88cea27a4d407202d1fc79a6522345b5e
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.28.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.28.Final.jar.sha1
deleted file mode 100644
index bc951426832..00000000000
--- a/plugins/transport-nio/licenses/netty-common-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df69ce8bb9b544a71e7bbee290253cf7c93e6bad
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..47140876e6a
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-common-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+a5d6a735ed07d8f197daa48db7f097cfc971ee5e
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.28.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.28.Final.jar.sha1
deleted file mode 100644
index 80dc8b8f6fe..00000000000
--- a/plugins/transport-nio/licenses/netty-handler-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a035784682da0126bc25f10713dac732b5082a6d
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..7c2d407f75e
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+1acf1d94799296a2517533ec75ce7e155e9c4ea7
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.28.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.28.Final.jar.sha1
deleted file mode 100644
index afe004bd716..00000000000
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f33557dcb31fa20da075ac05e4808115e32ef9b7
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..bac08f57079
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+bbec1dc913732e4773893c14d795b15d6c1e878e
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.28.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.28.Final.jar.sha1
deleted file mode 100644
index af19a16d6ed..00000000000
--- a/plugins/transport-nio/licenses/netty-transport-4.1.28.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d2ef28f49d726737f0ffe84bf66529b3bf6e0c0d
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.29.Final.jar.sha1
new file mode 100644
index 00000000000..0ce64132afb
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.29.Final.jar.sha1
@@ -0,0 +1 @@
+c190b90f70e2ae8a48c068afad709e8728fcaa39
\ No newline at end of file