From 4d0fdd4207ac1d9bcf0bacbcd21daabf9d22b922 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 08:26:43 -0400 Subject: [PATCH] Upgrade netty from 4.1.73.Final to 4.1.78.Final (#3772) (#3855) Signed-off-by: Craig Perkins (cherry picked from commit 5c531bbac8868bba2b9ed6c35aed2ae405620d19) Co-authored-by: Craig Perkins --- buildSrc/version.properties | 2 +- modules/transport-netty4/build.gradle | 10 ++++++++-- .../licenses/netty-buffer-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-buffer-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-codec-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-codec-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-codec-http-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-codec-http-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-common-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-common-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-handler-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-handler-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-resolver-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-resolver-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-transport-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-transport-4.1.78.Final.jar.sha1 | 1 + .../java/org/opensearch/rest/Netty4BadRequestIT.java | 2 +- .../licenses/netty-codec-dns-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-codec-dns-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-codec-http2-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-codec-http2-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-codec-socks-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-codec-socks-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-handler-proxy-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-handler-proxy-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-resolver-dns-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-resolver-dns-4.1.78.Final.jar.sha1 | 1 + ...-transport-native-unix-common-4.1.73.Final.jar.sha1 | 1 - ...-transport-native-unix-common-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-all-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-all-4.1.78.Final.jar.sha1 | 1 + plugins/transport-nio/build.gradle | 10 ++++++++-- .../licenses/netty-buffer-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-buffer-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-codec-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-codec-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-codec-http-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-codec-http-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-common-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-common-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-handler-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-handler-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-resolver-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-resolver-4.1.78.Final.jar.sha1 | 1 + .../licenses/netty-transport-4.1.73.Final.jar.sha1 | 1 - .../licenses/netty-transport-4.1.78.Final.jar.sha1 | 1 + 46 files changed, 39 insertions(+), 27 deletions(-) delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.73.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.78.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.73.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.78.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.73.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.78.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.73.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.78.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.73.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.78.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.73.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.78.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.73.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.78.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-codec-dns-4.1.73.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-dns-4.1.78.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-codec-http2-4.1.73.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-http2-4.1.78.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-codec-socks-4.1.73.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-socks-4.1.78.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-handler-proxy-4.1.73.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-handler-proxy-4.1.78.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-resolver-dns-4.1.73.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-resolver-dns-4.1.78.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.73.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.78.Final.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/netty-all-4.1.73.Final.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/netty-all-4.1.78.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.73.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.78.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.73.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.78.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.73.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.78.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-common-4.1.73.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-common-4.1.78.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.73.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.78.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.73.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.78.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.73.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.78.Final.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 8938f25c5bb41..8f08fc9ed9eec 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -21,7 +21,7 @@ asm = 9.3 # when updating the JNA version, also update the version in buildSrc/build.gradle jna = 5.5.0 -netty = 4.1.73.Final +netty = 4.1.78.Final joda = 2.10.12 # client dependencies diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index f0029837c7d03..74448e7a5ac06 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -120,7 +120,7 @@ thirdPartyAudit { '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.Encoders', 'com.aayushatharva.brotli4j.encoder.Encoder$Mode', 'com.aayushatharva.brotli4j.encoder.Encoder$Parameters', // classes are missing @@ -141,11 +141,16 @@ thirdPartyAudit { // from io.netty.handler.ssl.OpenSslEngine (netty) 'io.netty.internal.tcnative.Buffer', + 'io.netty.internal.tcnative.CertificateCompressionAlgo', 'io.netty.internal.tcnative.Library', 'io.netty.internal.tcnative.SSL', 'io.netty.internal.tcnative.SSLContext', 'io.netty.internal.tcnative.SSLPrivateKeyMethod', + // from io.netty.channel.unix (netty) + 'io.netty.channel.unix.FileDescriptor', + 'io.netty.channel.unix.UnixChannel', + // from io.netty.handler.ssl.util.BouncyCastleSelfSignedCertGenerator (netty) 'org.bouncycastle.cert.X509v3CertificateBuilder', 'org.bouncycastle.cert.jcajce.JcaX509CertificateConverter', @@ -227,7 +232,8 @@ thirdPartyAudit { 'io.netty.util.internal.PlatformDependent0$1', 'io.netty.util.internal.PlatformDependent0$2', 'io.netty.util.internal.PlatformDependent0$3', - 'io.netty.util.internal.PlatformDependent0$5', + 'io.netty.util.internal.PlatformDependent0$4', + 'io.netty.util.internal.PlatformDependent0$6', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef', 'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields', diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.73.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.73.Final.jar.sha1 deleted file mode 100644 index e5833785ebb7e..0000000000000 --- a/modules/transport-netty4/licenses/netty-buffer-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -244a569c9aae973f6f485ac9801d79c1eca36daa \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.78.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..d32cb7202ac0c --- /dev/null +++ b/modules/transport-netty4/licenses/netty-buffer-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +6c0c2d805a2c8ea30223677d8219235f9ec14c38 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.73.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.73.Final.jar.sha1 deleted file mode 100644 index dcdc1e4e58afe..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9496a30a349863a4c6fa10d5c36b4f3b495d3a31 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.78.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..801c8d5e74de2 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +e8486c8923fc0914df4562a8e0923462e885f88a \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.73.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.73.Final.jar.sha1 deleted file mode 100644 index 374cfb98614d5..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-http-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1ceeac4429b9bd517dc05e376a144bbe6b6bd038 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.78.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..473c81d37a969 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +b636591e973418479f2d08e881b12be61845aa6f \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.73.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.73.Final.jar.sha1 deleted file mode 100644 index e80a6e2569d81..0000000000000 --- a/modules/transport-netty4/licenses/netty-common-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -27731b58d741b6faa6a00fa3285e7a55cc47be01 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.78.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..3e2d3ec9e5106 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-common-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +d6f560098050f88ba11750aa856edd955e4a7707 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.73.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.73.Final.jar.sha1 deleted file mode 100644 index 0e227997874bf..0000000000000 --- a/modules/transport-netty4/licenses/netty-handler-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1a2231c0074f88254865c3769a4b5842939ea04d \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.78.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..f597dcc2030a7 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-handler-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +7e902b6018378bb700ec9364b1d0fba6eefd99fd \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.73.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.73.Final.jar.sha1 deleted file mode 100644 index ba24531724fb5..0000000000000 --- a/modules/transport-netty4/licenses/netty-resolver-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bfe83710f0c1739019613e81a06101020ca65def \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.78.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..88a70642001e5 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-resolver-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +691170d70a979757d50f60e16121ced5f411a9b8 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.73.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.73.Final.jar.sha1 deleted file mode 100644 index 6a8647497f210..0000000000000 --- a/modules/transport-netty4/licenses/netty-transport-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -abb155ddff196ccedfe85b810d4b9375ef85fcfa \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.78.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..faa5512a44973 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +b1639d431e43622d6cbfdd45c30d3fb810fa9101 \ No newline at end of file diff --git a/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java b/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java index e9de417f1efe6..3f504ff36b148 100644 --- a/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java +++ b/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java @@ -86,7 +86,7 @@ public void testBadRequest() throws IOException { () -> client().performRequest(new Request(randomFrom("GET", "POST", "PUT"), path)) ); assertThat(e.getResponse().getStatusLine().getStatusCode(), equalTo(BAD_REQUEST.getStatus())); - assertThat(e, hasToString(containsString("too_long_frame_exception"))); + assertThat(e, hasToString(containsString("too_long_http_line_exception"))); assertThat(e, hasToString(matches("An HTTP line is larger than \\d+ bytes"))); } diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.73.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.73.Final.jar.sha1 deleted file mode 100644 index 320ae18c98bda..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-dns-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -46137a5b01a5202059324cf4300443e53f11a38d \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.78.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..6bdf8e35a1229 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-dns-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +6b51ce00cfe34adbe93171088f1c7fbd2a517308 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.73.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.73.Final.jar.sha1 deleted file mode 100644 index d7f5a464bcc00..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-http2-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0eb145bc31fd32a20fd2a3e8b30736d2e0248b0c \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.78.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..73f234d843204 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-http2-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +9a4e44bebe5979b59c9bf4cd879e65c4c52bf869 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.73.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.73.Final.jar.sha1 deleted file mode 100644 index 6ba41c576c93d..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-socks-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cefa44d8f5dcaab21179d945f12b6c6d7325cce9 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.78.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..ba6d08c14941c --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-socks-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +0a8b9c0e9819e4e2c6c938e8f079683a65d85faf \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.73.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.73.Final.jar.sha1 deleted file mode 100644 index f50c9abf023cf..0000000000000 --- a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d1afa6876c3d3bdbdbe5127ddd495e6514d6e600 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.78.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..86e407b5a171d --- /dev/null +++ b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +f9e5ad080d1d1a9a82ba598814e6f5a229db4594 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.73.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.73.Final.jar.sha1 deleted file mode 100644 index 817fa4cc0d86f..0000000000000 --- a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -97cdf5fb97f8d961cfa3ffb05175009b90e5cfee \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.78.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..f85de54545500 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +84fc82d8ff839d85c81979a5dc2525857b9a8837 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.73.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.73.Final.jar.sha1 deleted file mode 100644 index 22b8f58bd5103..0000000000000 --- a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4701063d36f390e02da6da85c13e32a0e78349d2 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.78.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..58224c6d6bddb --- /dev/null +++ b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +62c64e182a11e31ad80e68a94f0b02b45344df23 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.73.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.73.Final.jar.sha1 deleted file mode 100644 index 52d6f22e73013..0000000000000 --- a/plugins/repository-hdfs/licenses/netty-all-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -75c5a0ddb28adcc9e4991c75678d4a85dfe4a0b3 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.78.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..a32faf2eba6cc --- /dev/null +++ b/plugins/repository-hdfs/licenses/netty-all-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +c64dedb62484d9fe9dfe1d1e877ef480fd1d0957 \ No newline at end of file diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle index 2b9e11cb2521f..a7e8c42a4e2d3 100644 --- a/plugins/transport-nio/build.gradle +++ b/plugins/transport-nio/build.gradle @@ -61,7 +61,7 @@ thirdPartyAudit { '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.Encoders', 'com.aayushatharva.brotli4j.encoder.Encoder$Mode', 'com.aayushatharva.brotli4j.encoder.Encoder$Parameters', @@ -145,6 +145,7 @@ thirdPartyAudit { 'io.netty.internal.tcnative.AsyncSSLPrivateKeyMethod', 'io.netty.internal.tcnative.AsyncTask', 'io.netty.internal.tcnative.Buffer', + 'io.netty.internal.tcnative.CertificateCompressionAlgo', 'io.netty.internal.tcnative.Library', 'io.netty.internal.tcnative.ResultCallback', 'io.netty.internal.tcnative.SSL', @@ -157,6 +158,10 @@ thirdPartyAudit { 'io.netty.internal.tcnative.SessionTicketKey', 'io.netty.internal.tcnative.SniHostNameMatcher', + // from io.netty.channel.unix (netty) + 'io.netty.channel.unix.FileDescriptor', + 'io.netty.channel.unix.UnixChannel', + 'reactor.blockhound.BlockHound$Builder', 'reactor.blockhound.integration.BlockHoundIntegration' ) @@ -167,7 +172,8 @@ thirdPartyAudit { 'io.netty.util.internal.PlatformDependent0$1', 'io.netty.util.internal.PlatformDependent0$2', 'io.netty.util.internal.PlatformDependent0$3', - 'io.netty.util.internal.PlatformDependent0$5', + 'io.netty.util.internal.PlatformDependent0$4', + 'io.netty.util.internal.PlatformDependent0$6', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef', 'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields', diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.73.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.73.Final.jar.sha1 deleted file mode 100644 index e5833785ebb7e..0000000000000 --- a/plugins/transport-nio/licenses/netty-buffer-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -244a569c9aae973f6f485ac9801d79c1eca36daa \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.78.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..d32cb7202ac0c --- /dev/null +++ b/plugins/transport-nio/licenses/netty-buffer-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +6c0c2d805a2c8ea30223677d8219235f9ec14c38 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.73.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.73.Final.jar.sha1 deleted file mode 100644 index dcdc1e4e58afe..0000000000000 --- a/plugins/transport-nio/licenses/netty-codec-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9496a30a349863a4c6fa10d5c36b4f3b495d3a31 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.78.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..801c8d5e74de2 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +e8486c8923fc0914df4562a8e0923462e885f88a \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.73.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.73.Final.jar.sha1 deleted file mode 100644 index 374cfb98614d5..0000000000000 --- a/plugins/transport-nio/licenses/netty-codec-http-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1ceeac4429b9bd517dc05e376a144bbe6b6bd038 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.78.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..473c81d37a969 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +b636591e973418479f2d08e881b12be61845aa6f \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-common-4.1.73.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.73.Final.jar.sha1 deleted file mode 100644 index e80a6e2569d81..0000000000000 --- a/plugins/transport-nio/licenses/netty-common-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -27731b58d741b6faa6a00fa3285e7a55cc47be01 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-common-4.1.78.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..3e2d3ec9e5106 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-common-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +d6f560098050f88ba11750aa856edd955e4a7707 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.73.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.73.Final.jar.sha1 deleted file mode 100644 index 0e227997874bf..0000000000000 --- a/plugins/transport-nio/licenses/netty-handler-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1a2231c0074f88254865c3769a4b5842939ea04d \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.78.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..f597dcc2030a7 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-handler-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +7e902b6018378bb700ec9364b1d0fba6eefd99fd \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.73.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.73.Final.jar.sha1 deleted file mode 100644 index ba24531724fb5..0000000000000 --- a/plugins/transport-nio/licenses/netty-resolver-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bfe83710f0c1739019613e81a06101020ca65def \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.78.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..88a70642001e5 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-resolver-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +691170d70a979757d50f60e16121ced5f411a9b8 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.73.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.73.Final.jar.sha1 deleted file mode 100644 index 6a8647497f210..0000000000000 --- a/plugins/transport-nio/licenses/netty-transport-4.1.73.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -abb155ddff196ccedfe85b810d4b9375ef85fcfa \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.78.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.78.Final.jar.sha1 new file mode 100644 index 0000000000000..faa5512a44973 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-transport-4.1.78.Final.jar.sha1 @@ -0,0 +1 @@ +b1639d431e43622d6cbfdd45c30d3fb810fa9101 \ No newline at end of file