From c7f5c90a5f6aae90bbf0bd7374d4ecaf52fcf497 Mon Sep 17 00:00:00 2001 From: Vacha Date: Mon, 18 Oct 2021 14:30:19 -0700 Subject: [PATCH] Upgrading netty version to 4.1.69.Final (#1363) Signed-off-by: Vacha --- buildSrc/version.properties | 2 +- modules/transport-netty4/build.gradle | 12 ++++++++++++ .../licenses/netty-buffer-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-buffer-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-codec-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-codec-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-codec-http-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-codec-http-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-common-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-common-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-handler-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-handler-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-resolver-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-resolver-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-transport-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-transport-4.1.69.Final.jar.sha1 | 1 + plugins/transport-nio/build.gradle | 13 +++++++++++++ .../licenses/netty-buffer-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-buffer-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-codec-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-codec-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-codec-http-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-codec-http-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-common-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-common-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-handler-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-handler-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-resolver-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-resolver-4.1.69.Final.jar.sha1 | 1 + .../licenses/netty-transport-4.1.59.Final.jar.sha1 | 1 - .../licenses/netty-transport-4.1.69.Final.jar.sha1 | 1 + 31 files changed, 40 insertions(+), 15 deletions(-) delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.59.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.69.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.59.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.69.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.59.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.69.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.59.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.69.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.59.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.69.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.59.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.69.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.59.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.69.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.59.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.69.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.59.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.69.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.59.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.69.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-common-4.1.59.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-common-4.1.69.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.59.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.69.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.59.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.69.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.59.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.69.Final.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 6270d7207a4..270b2cb2360 100644 --- 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.12 # when updating this version, you need to ensure compatibility with: diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index a0a67048dc4..2e62fdd697e 100644 --- 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 deleted file mode 100644 index 4208a78d15c..00000000000 --- a/modules/transport-netty4/licenses/netty-buffer-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a1f281008d7e9574c14d386b39b3639a240eb0d1 \ No newline at end of file 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 new file mode 100644 index 00000000000..fc03e8208aa --- /dev/null +++ b/modules/transport-netty4/licenses/netty-buffer-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +c87da90e422b331ecd1e157ca77e5300348b6d0d \ No newline at end of file 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 deleted file mode 100644 index 485da5b1367..00000000000 --- a/modules/transport-netty4/licenses/netty-codec-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5e563309b99cf55bdbecc4dab7c417a0167c31aa \ No newline at end of file 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 new file mode 100644 index 00000000000..331c79c9df8 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +617ecaee8bcb3874234e8c0832843ebbc9e9dcc9 \ No newline at end of file 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 deleted file mode 100644 index 15643e77e22..00000000000 --- a/modules/transport-netty4/licenses/netty-codec-http-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -766327d675678686a05faa446c4413d8ccb79b5c \ No newline at end of file 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 new file mode 100644 index 00000000000..f9724d5d94f --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +702c6104a716ca9dc8eec6f4459733fdfcbe1959 \ No newline at end of file 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 deleted file mode 100644 index 40e42da3879..00000000000 --- a/modules/transport-netty4/licenses/netty-common-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e8800b0c50b6743ec1c5a3713816ce58910a703a \ No newline at end of file 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 new file mode 100644 index 00000000000..aed96048f03 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-common-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +810e0649787c4930a8e699d68eb8519df2560dd0 \ No newline at end of file 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 deleted file mode 100644 index f3ef330c0fc..00000000000 --- a/modules/transport-netty4/licenses/netty-handler-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -302b4c8ca800aeddcf94401f2403114c8f5db5a5 \ No newline at end of file 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 new file mode 100644 index 00000000000..2e26b081f7f --- /dev/null +++ b/modules/transport-netty4/licenses/netty-handler-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +73e932059ce8881094cedcfe4a92b8391ffa7b1b \ No newline at end of file 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 deleted file mode 100644 index 10c84a03a0f..00000000000 --- a/modules/transport-netty4/licenses/netty-resolver-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -26bc136952a9f7a994dd7162f481c860275948de \ No newline at end of file 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 new file mode 100644 index 00000000000..da0a22628a1 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-resolver-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +d4e7b1b8c1e5aeaf41877906b90762f1e0151902 \ No newline at end of file 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 deleted file mode 100644 index 00f5f191975..00000000000 --- a/modules/transport-netty4/licenses/netty-transport-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -864d20f35ce909e6a7462095cb8f91ee94d1cd4c \ No newline at end of file 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 new file mode 100644 index 00000000000..5e0a883f29d --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +228e5318012edb93138005ebe896b5dd91d4b47d \ No newline at end of file diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle index 3954b811f31..6e309e10924 100644 --- 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 deleted file mode 100644 index 4208a78d15c..00000000000 --- a/plugins/transport-nio/licenses/netty-buffer-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a1f281008d7e9574c14d386b39b3639a240eb0d1 \ No newline at end of file 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 new file mode 100644 index 00000000000..fc03e8208aa --- /dev/null +++ b/plugins/transport-nio/licenses/netty-buffer-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +c87da90e422b331ecd1e157ca77e5300348b6d0d \ No newline at end of file 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 deleted file mode 100644 index 485da5b1367..00000000000 --- a/plugins/transport-nio/licenses/netty-codec-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5e563309b99cf55bdbecc4dab7c417a0167c31aa \ No newline at end of file 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 new file mode 100644 index 00000000000..331c79c9df8 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +617ecaee8bcb3874234e8c0832843ebbc9e9dcc9 \ No newline at end of file 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 deleted file mode 100644 index 15643e77e22..00000000000 --- a/plugins/transport-nio/licenses/netty-codec-http-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -766327d675678686a05faa446c4413d8ccb79b5c \ No newline at end of file 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 new file mode 100644 index 00000000000..f9724d5d94f --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +702c6104a716ca9dc8eec6f4459733fdfcbe1959 \ No newline at end of file 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 deleted file mode 100644 index 40e42da3879..00000000000 --- a/plugins/transport-nio/licenses/netty-common-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e8800b0c50b6743ec1c5a3713816ce58910a703a \ No newline at end of file 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 new file mode 100644 index 00000000000..aed96048f03 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-common-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +810e0649787c4930a8e699d68eb8519df2560dd0 \ No newline at end of file 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 deleted file mode 100644 index f3ef330c0fc..00000000000 --- a/plugins/transport-nio/licenses/netty-handler-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -302b4c8ca800aeddcf94401f2403114c8f5db5a5 \ No newline at end of file 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 new file mode 100644 index 00000000000..2e26b081f7f --- /dev/null +++ b/plugins/transport-nio/licenses/netty-handler-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +73e932059ce8881094cedcfe4a92b8391ffa7b1b \ No newline at end of file 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 deleted file mode 100644 index 10c84a03a0f..00000000000 --- a/plugins/transport-nio/licenses/netty-resolver-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -26bc136952a9f7a994dd7162f481c860275948de \ No newline at end of file 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 new file mode 100644 index 00000000000..da0a22628a1 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-resolver-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +d4e7b1b8c1e5aeaf41877906b90762f1e0151902 \ No newline at end of file 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 deleted file mode 100644 index 00f5f191975..00000000000 --- a/plugins/transport-nio/licenses/netty-transport-4.1.59.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -864d20f35ce909e6a7462095cb8f91ee94d1cd4c \ No newline at end of file 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 new file mode 100644 index 00000000000..5e0a883f29d --- /dev/null +++ b/plugins/transport-nio/licenses/netty-transport-4.1.69.Final.jar.sha1 @@ -0,0 +1 @@ +228e5318012edb93138005ebe896b5dd91d4b47d \ No newline at end of file