Upgrade to Netty 4.1.38 (#45132)

* A number of fixes to buffer handling in the .37 and .38 -> we should stay up to date
elastic · Aug 8, 2019 · fb508db · fb508db
1 parent e0f9d61
commit fb508db
Show file tree

Hide file tree

Showing 31 changed files with 18 additions and 17 deletions.
diff --git 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.36.Final
+netty             = 4.1.38.Final
 joda              = 2.10.2
 
 # when updating this version, you need to ensure compatibility with:

diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
@@ -143,12 +143,13 @@ thirdPartyAudit {
         'net.jpountz.lz4.LZ4Compressor',
         'net.jpountz.lz4.LZ4Factory',
         'net.jpountz.lz4.LZ4FastDecompressor',
-        'net.jpountz.xxhash.StreamingXXHash32',
+        'net.jpountz.xxhash.XXHash32',
         'net.jpountz.xxhash.XXHashFactory',
         'io.netty.internal.tcnative.CertificateCallback',
         'io.netty.internal.tcnative.CertificateVerifier',
         'io.netty.internal.tcnative.SessionTicketKey',
         'io.netty.internal.tcnative.SniHostNameMatcher',
+        'io.netty.internal.tcnative.SSL',
         'org.eclipse.jetty.alpn.ALPN$ClientProvider',
         'org.eclipse.jetty.alpn.ALPN$ServerProvider',
         'org.eclipse.jetty.alpn.ALPN',

diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.36.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+d16cf15d29c409987cecde77407fbb6f1e16d262
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.36.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+ccfbdfc727cbf702350572a0b12fe92185ebf162
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.36.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+4d55b3cdb74cd140d262de96987ebd369125a64c
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.36.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+6f8aae763f743d91fb1ba1e9011dae0ef4f6ff34
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.36.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+ebf1f2bd0dad5e16aa1fc48d32e5dbe507b38d53
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.36.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+b00be4aa309e9b56e498191aa8c73e4f393759ed
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.36.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.36.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.38.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+cd8b612d5daa42d1be3bb3203e4857597d5db79b
diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle
@@ -107,7 +107,7 @@ thirdPartyAudit {
         'net.jpountz.lz4.LZ4Compressor',
         'net.jpountz.lz4.LZ4Factory',
         'net.jpountz.lz4.LZ4FastDecompressor',
-        'net.jpountz.xxhash.StreamingXXHash32',
+        'net.jpountz.xxhash.XXHash32',
         'net.jpountz.xxhash.XXHashFactory',
         'org.eclipse.jetty.alpn.ALPN$ClientProvider',
         'org.eclipse.jetty.alpn.ALPN$ServerProvider',

diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.36.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+d16cf15d29c409987cecde77407fbb6f1e16d262
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.36.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+ccfbdfc727cbf702350572a0b12fe92185ebf162
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.36.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+4d55b3cdb74cd140d262de96987ebd369125a64c
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.36.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+6f8aae763f743d91fb1ba1e9011dae0ef4f6ff34
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.36.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+ebf1f2bd0dad5e16aa1fc48d32e5dbe507b38d53
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.36.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+b00be4aa309e9b56e498191aa8c73e4f393759ed
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.36.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.36.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.38.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.38.Final.jar.sha1
@@ -0,0 +1 @@
+cd8b612d5daa42d1be3bb3203e4857597d5db79b