Upgrading netty version to 4.1.69.Final (#1363) (#1382)

Signed-off-by: Vacha <vachshah@amazon.com>
opensearch-project · Oct 19, 2021 · e00e8eb · e00e8eb
1 parent a0425bb
commit e00e8eb
Show file tree

Hide file tree

Showing 31 changed files with 40 additions and 15 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               = 5.5.0
 
-netty             = 4.1.59.Final
+netty             = 4.1.69.Final
 joda              = 2.10.4
 
 # when updating this version, you need to ensure compatibility with:

diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
@@ -117,6 +117,12 @@ check.dependsOn(pooledTest, pooledJavaRestTest, pooledInternalClusterTest)
 
 thirdPartyAudit {
   ignoreMissingClasses(
+    'com.aayushatharva.brotli4j.Brotli4jLoader',
+    'com.aayushatharva.brotli4j.decoder.DecoderJNI$Status',
+    'com.aayushatharva.brotli4j.decoder.DecoderJNI$Wrapper',
+    'com.aayushatharva.brotli4j.encoder.Encoder',
+    'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
+    'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',
     // classes are missing
 
     // from io.netty.handler.codec.protobuf.ProtobufDecoder (netty)
@@ -174,6 +180,7 @@ thirdPartyAudit {
     'org.slf4j.LoggerFactory',
     'org.slf4j.spi.LocationAwareLogger',
 
+    'com.github.luben.zstd.Zstd',
     'com.google.protobuf.ExtensionRegistryLite',
     'com.google.protobuf.MessageLiteOrBuilder',
     'com.google.protobuf.nano.CodedOutputByteBufferNano',
@@ -195,11 +202,16 @@ thirdPartyAudit {
     'net.jpountz.lz4.LZ4FastDecompressor',
     'net.jpountz.xxhash.XXHash32',
     'net.jpountz.xxhash.XXHashFactory',
+    'io.netty.internal.tcnative.AsyncSSLPrivateKeyMethod',
+    'io.netty.internal.tcnative.AsyncTask',
     'io.netty.internal.tcnative.CertificateCallback',
     'io.netty.internal.tcnative.CertificateVerifier',
+    'io.netty.internal.tcnative.ResultCallback',
     'io.netty.internal.tcnative.SessionTicketKey',
     'io.netty.internal.tcnative.SniHostNameMatcher',
     'io.netty.internal.tcnative.SSL',
+    'io.netty.internal.tcnative.SSLSession',
+    'io.netty.internal.tcnative.SSLSessionCache',
     '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.59.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.59.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+c87da90e422b331ecd1e157ca77e5300348b6d0d
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.59.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.59.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+617ecaee8bcb3874234e8c0832843ebbc9e9dcc9
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.59.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.59.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+702c6104a716ca9dc8eec6f4459733fdfcbe1959
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.59.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.59.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+810e0649787c4930a8e699d68eb8519df2560dd0
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.59.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.59.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+73e932059ce8881094cedcfe4a92b8391ffa7b1b
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.59.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.59.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+d4e7b1b8c1e5aeaf41877906b90762f1e0151902
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.59.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.59.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.69.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+228e5318012edb93138005ebe896b5dd91d4b47d
diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle
@@ -58,6 +58,13 @@ tasks.named("dependencyLicenses").configure {
 
 thirdPartyAudit {
   ignoreMissingClasses(
+    'com.aayushatharva.brotli4j.Brotli4jLoader',
+    'com.aayushatharva.brotli4j.decoder.DecoderJNI$Status',
+    'com.aayushatharva.brotli4j.decoder.DecoderJNI$Wrapper',
+    'com.aayushatharva.brotli4j.encoder.Encoder',
+    'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
+    'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',
+
     // from io.netty.handler.codec.protobuf.ProtobufDecoder (netty)
     'com.google.protobuf.ExtensionRegistry',
     'com.google.protobuf.MessageLite$Builder',
@@ -106,6 +113,7 @@ thirdPartyAudit {
     'org.slf4j.LoggerFactory',
     'org.slf4j.spi.LocationAwareLogger',
 
+    'com.github.luben.zstd.Zstd',
     'com.google.protobuf.ExtensionRegistryLite',
     'com.google.protobuf.MessageLiteOrBuilder',
     'com.google.protobuf.nano.CodedOutputByteBufferNano',
@@ -137,11 +145,16 @@ thirdPartyAudit {
     'org.conscrypt.HandshakeListener',
 
     // from io.netty.handler.ssl.OpenSslEngine (netty)
+    'io.netty.internal.tcnative.AsyncSSLPrivateKeyMethod',
+    'io.netty.internal.tcnative.AsyncTask',
     'io.netty.internal.tcnative.Buffer',
     'io.netty.internal.tcnative.Library',
+    'io.netty.internal.tcnative.ResultCallback',
     'io.netty.internal.tcnative.SSL',
     'io.netty.internal.tcnative.SSLContext',
     'io.netty.internal.tcnative.SSLPrivateKeyMethod',
+    'io.netty.internal.tcnative.SSLSession',
+    'io.netty.internal.tcnative.SSLSessionCache',
     'io.netty.internal.tcnative.CertificateCallback',
     'io.netty.internal.tcnative.CertificateVerifier',
     'io.netty.internal.tcnative.SessionTicketKey',

diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.59.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.59.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+c87da90e422b331ecd1e157ca77e5300348b6d0d
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.59.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.59.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+617ecaee8bcb3874234e8c0832843ebbc9e9dcc9
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.59.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.59.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+702c6104a716ca9dc8eec6f4459733fdfcbe1959
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.59.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.59.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+810e0649787c4930a8e699d68eb8519df2560dd0
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.59.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.59.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+73e932059ce8881094cedcfe4a92b8391ffa7b1b
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.59.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.59.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+d4e7b1b8c1e5aeaf41877906b90762f1e0151902
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.59.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.59.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.69.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.69.Final.jar.sha1
@@ -0,0 +1 @@
+228e5318012edb93138005ebe896b5dd91d4b47d