From b59f290898b6cb7fa01e96a24cb33e119bc08fa3 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Wed, 5 Apr 2023 17:26:29 -0400 Subject: [PATCH] Routine dependency updates: Netty 4.1.91.Final, ASM 9.5, ByteBuddy 1.14.3 (#6981) (#6986) (#7005) (cherry picked from commit 509454169778bb8b26a1fe8441975f7c344ec4be) Signed-off-by: Andriy Redko --- CHANGELOG.md | 1 + buildSrc/version.properties | 7 ++++--- modules/lang-expression/build.gradle | 6 +++--- modules/lang-expression/licenses/asm-9.2.jar.sha1 | 1 - modules/lang-expression/licenses/asm-9.5.jar.sha1 | 1 + .../lang-expression/licenses/asm-commons-9.2.jar.sha1 | 1 - .../lang-expression/licenses/asm-commons-9.5.jar.sha1 | 1 + modules/lang-expression/licenses/asm-tree-9.2.jar.sha1 | 1 - modules/lang-expression/licenses/asm-tree-9.5.jar.sha1 | 1 + modules/lang-painless/build.gradle | 10 +++++----- modules/lang-painless/licenses/asm-9.2.jar.sha1 | 1 - modules/lang-painless/licenses/asm-9.5.jar.sha1 | 1 + .../lang-painless/licenses/asm-analysis-7.2.jar.sha1 | 1 - .../lang-painless/licenses/asm-analysis-9.5.jar.sha1 | 1 + .../lang-painless/licenses/asm-commons-7.2.jar.sha1 | 1 - .../lang-painless/licenses/asm-commons-9.5.jar.sha1 | 1 + modules/lang-painless/licenses/asm-tree-7.2.jar.sha1 | 1 - modules/lang-painless/licenses/asm-tree-9.5.jar.sha1 | 1 + modules/lang-painless/licenses/asm-util-9.2.jar.sha1 | 1 - modules/lang-painless/licenses/asm-util-9.5.jar.sha1 | 1 + modules/transport-netty4/build.gradle | 7 ++++++- .../licenses/netty-buffer-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-buffer-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-codec-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-codec-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-codec-http-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-codec-http-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-common-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-common-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-handler-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-handler-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-resolver-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-resolver-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-transport-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-transport-4.1.91.Final.jar.sha1 | 1 + ...-transport-native-unix-common-4.1.90.Final.jar.sha1 | 1 - ...-transport-native-unix-common-4.1.91.Final.jar.sha1 | 1 + .../licenses/jettison-1.5.3.jar.sha1 | 1 - .../licenses/jettison-1.5.4.jar.sha1 | 1 + .../licenses/netty-codec-dns-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-codec-dns-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-codec-http2-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-codec-http2-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-codec-socks-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-codec-socks-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-handler-proxy-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-handler-proxy-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-resolver-dns-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-resolver-dns-4.1.91.Final.jar.sha1 | 1 + ...-transport-native-unix-common-4.1.90.Final.jar.sha1 | 1 - ...-transport-native-unix-common-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-all-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-all-4.1.91.Final.jar.sha1 | 1 + plugins/transport-nio/build.gradle | 7 ++++++- .../licenses/netty-buffer-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-buffer-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-codec-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-codec-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-codec-http-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-codec-http-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-common-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-common-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-handler-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-handler-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-resolver-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-resolver-4.1.91.Final.jar.sha1 | 1 + .../licenses/netty-transport-4.1.90.Final.jar.sha1 | 1 - .../licenses/netty-transport-4.1.91.Final.jar.sha1 | 1 + 68 files changed, 56 insertions(+), 44 deletions(-) delete mode 100644 modules/lang-expression/licenses/asm-9.2.jar.sha1 create mode 100644 modules/lang-expression/licenses/asm-9.5.jar.sha1 delete mode 100644 modules/lang-expression/licenses/asm-commons-9.2.jar.sha1 create mode 100644 modules/lang-expression/licenses/asm-commons-9.5.jar.sha1 delete mode 100644 modules/lang-expression/licenses/asm-tree-9.2.jar.sha1 create mode 100644 modules/lang-expression/licenses/asm-tree-9.5.jar.sha1 delete mode 100644 modules/lang-painless/licenses/asm-9.2.jar.sha1 create mode 100644 modules/lang-painless/licenses/asm-9.5.jar.sha1 delete mode 100644 modules/lang-painless/licenses/asm-analysis-7.2.jar.sha1 create mode 100644 modules/lang-painless/licenses/asm-analysis-9.5.jar.sha1 delete mode 100644 modules/lang-painless/licenses/asm-commons-7.2.jar.sha1 create mode 100644 modules/lang-painless/licenses/asm-commons-9.5.jar.sha1 delete mode 100644 modules/lang-painless/licenses/asm-tree-7.2.jar.sha1 create mode 100644 modules/lang-painless/licenses/asm-tree-9.5.jar.sha1 delete mode 100644 modules/lang-painless/licenses/asm-util-9.2.jar.sha1 create mode 100644 modules/lang-painless/licenses/asm-util-9.5.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.90.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.91.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.90.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.91.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.90.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.91.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.90.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.91.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.90.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.91.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.90.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.91.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.90.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.91.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1 delete mode 100644 plugins/discovery-azure-classic/licenses/jettison-1.5.3.jar.sha1 create mode 100644 plugins/discovery-azure-classic/licenses/jettison-1.5.4.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-codec-dns-4.1.90.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-dns-4.1.91.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-codec-http2-4.1.90.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-http2-4.1.91.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-codec-socks-4.1.90.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-codec-socks-4.1.91.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-handler-proxy-4.1.91.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-resolver-dns-4.1.90.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-resolver-dns-4.1.91.Final.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 create mode 100644 plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/netty-all-4.1.90.Final.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/netty-all-4.1.91.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.90.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.91.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.90.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.91.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.90.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.91.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-common-4.1.90.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-common-4.1.91.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.90.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.91.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.90.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.91.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.90.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.91.Final.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index c884ef6a333a2..795abe8bdce49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Added ### Dependencies +- Bump: Netty from 4.1.90.Final to 4.1.91.Final , ASM 9.4 to ASM 9.5, ByteBuddy 1.14.2 to 1.14.3 ([#6981](https://github.com/opensearch-project/OpenSearch/pull/6981)) ### Changed ### Deprecated diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 5c798510f79d4..bff4b83598726 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -14,14 +14,15 @@ icu4j = 62.1 supercsv = 2.4.0 log4j = 2.17.1 slf4j = 1.6.2 -jettison = 1.5.3 +asm = 9.5 +jettison = 1.5.4 woodstox = 6.4.0 kotlin = 1.7.10 # when updating the JNA version, also update the version in buildSrc/build.gradle jna = 5.5.0 -netty = 4.1.90.Final +netty = 4.1.91.Final joda = 2.12.2 # when updating this version, you need to ensure compatibility with: @@ -40,7 +41,7 @@ hamcrest = 2.1 mocksocket = 1.2 mockito = 3.12.4 objenesis = 3.2 -bytebuddy = 1.11.13 +bytebuddy = 1.14.3 # benchmark dependencies jmh = 1.19 diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle index e3feacd71f060..9109e9ae28a94 100644 --- a/modules/lang-expression/build.gradle +++ b/modules/lang-expression/build.gradle @@ -38,9 +38,9 @@ opensearchplugin { dependencies { api "org.apache.lucene:lucene-expressions:${versions.lucene}" api 'org.antlr:antlr4-runtime:4.9.3' - api 'org.ow2.asm:asm:9.2' - api 'org.ow2.asm:asm-commons:9.2' - api 'org.ow2.asm:asm-tree:9.2' + api "org.ow2.asm:asm:${versions.asm}" + api "org.ow2.asm:asm-commons:${versions.asm}" + api "org.ow2.asm:asm-tree:${versions.asm}" } restResources { restApi { diff --git a/modules/lang-expression/licenses/asm-9.2.jar.sha1 b/modules/lang-expression/licenses/asm-9.2.jar.sha1 deleted file mode 100644 index 28f456d3cbcb2..0000000000000 --- a/modules/lang-expression/licenses/asm-9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -81a03f76019c67362299c40e0ba13405f5467bff \ No newline at end of file diff --git a/modules/lang-expression/licenses/asm-9.5.jar.sha1 b/modules/lang-expression/licenses/asm-9.5.jar.sha1 new file mode 100644 index 0000000000000..ea4aa3581dc87 --- /dev/null +++ b/modules/lang-expression/licenses/asm-9.5.jar.sha1 @@ -0,0 +1 @@ +dc6ea1875f4d64fbc85e1691c95b96a3d8569c90 \ No newline at end of file diff --git a/modules/lang-expression/licenses/asm-commons-9.2.jar.sha1 b/modules/lang-expression/licenses/asm-commons-9.2.jar.sha1 deleted file mode 100644 index 7beb3d29afe86..0000000000000 --- a/modules/lang-expression/licenses/asm-commons-9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f4d7f0fc9054386f2893b602454d48e07d4fbead \ No newline at end of file diff --git a/modules/lang-expression/licenses/asm-commons-9.5.jar.sha1 b/modules/lang-expression/licenses/asm-commons-9.5.jar.sha1 new file mode 100644 index 0000000000000..5be792660c19f --- /dev/null +++ b/modules/lang-expression/licenses/asm-commons-9.5.jar.sha1 @@ -0,0 +1 @@ +19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0 \ No newline at end of file diff --git a/modules/lang-expression/licenses/asm-tree-9.2.jar.sha1 b/modules/lang-expression/licenses/asm-tree-9.2.jar.sha1 deleted file mode 100644 index 7b486521ecef3..0000000000000 --- a/modules/lang-expression/licenses/asm-tree-9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d96c99a30f5e1a19b0e609dbb19a44d8518ac01e \ No newline at end of file diff --git a/modules/lang-expression/licenses/asm-tree-9.5.jar.sha1 b/modules/lang-expression/licenses/asm-tree-9.5.jar.sha1 new file mode 100644 index 0000000000000..fb42db6a9d15c --- /dev/null +++ b/modules/lang-expression/licenses/asm-tree-9.5.jar.sha1 @@ -0,0 +1 @@ +fd33c8b6373abaa675be407082fdfda35021254a \ No newline at end of file diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle index eb93cdc77fb9c..a582b984079ff 100644 --- a/modules/lang-painless/build.gradle +++ b/modules/lang-painless/build.gradle @@ -46,11 +46,11 @@ testClusters.all { dependencies { api 'org.antlr:antlr4-runtime:4.5.3' - api 'org.ow2.asm:asm-util:9.2' - api 'org.ow2.asm:asm-tree:7.2' - api 'org.ow2.asm:asm-commons:7.2' - api 'org.ow2.asm:asm-analysis:7.2' - api 'org.ow2.asm:asm:9.2' + api "org.ow2.asm:asm-util:${versions.asm}" + api "org.ow2.asm:asm-tree:${versions.asm}" + api "org.ow2.asm:asm-commons:${versions.asm}" + api "org.ow2.asm:asm-analysis:${versions.asm}" + api "org.ow2.asm:asm:${versions.asm}" api project('spi') } diff --git a/modules/lang-painless/licenses/asm-9.2.jar.sha1 b/modules/lang-painless/licenses/asm-9.2.jar.sha1 deleted file mode 100644 index 28f456d3cbcb2..0000000000000 --- a/modules/lang-painless/licenses/asm-9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -81a03f76019c67362299c40e0ba13405f5467bff \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-9.5.jar.sha1 b/modules/lang-painless/licenses/asm-9.5.jar.sha1 new file mode 100644 index 0000000000000..ea4aa3581dc87 --- /dev/null +++ b/modules/lang-painless/licenses/asm-9.5.jar.sha1 @@ -0,0 +1 @@ +dc6ea1875f4d64fbc85e1691c95b96a3d8569c90 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-analysis-7.2.jar.sha1 b/modules/lang-painless/licenses/asm-analysis-7.2.jar.sha1 deleted file mode 100644 index 849b5e0bfa671..0000000000000 --- a/modules/lang-painless/licenses/asm-analysis-7.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b6e6abe057f23630113f4167c34bda7086691258 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-analysis-9.5.jar.sha1 b/modules/lang-painless/licenses/asm-analysis-9.5.jar.sha1 new file mode 100644 index 0000000000000..9e87d3ce7d719 --- /dev/null +++ b/modules/lang-painless/licenses/asm-analysis-9.5.jar.sha1 @@ -0,0 +1 @@ +490bacc77de7cbc0be1a30bb3471072d705be4a4 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-commons-7.2.jar.sha1 b/modules/lang-painless/licenses/asm-commons-7.2.jar.sha1 deleted file mode 100644 index b634981fc89ac..0000000000000 --- a/modules/lang-painless/licenses/asm-commons-7.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ca2954e8d92a05bacc28ff465b25c70e0f512497 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-commons-9.5.jar.sha1 b/modules/lang-painless/licenses/asm-commons-9.5.jar.sha1 new file mode 100644 index 0000000000000..5be792660c19f --- /dev/null +++ b/modules/lang-painless/licenses/asm-commons-9.5.jar.sha1 @@ -0,0 +1 @@ +19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-tree-7.2.jar.sha1 b/modules/lang-painless/licenses/asm-tree-7.2.jar.sha1 deleted file mode 100644 index 986a1c55f5e8f..0000000000000 --- a/modules/lang-painless/licenses/asm-tree-7.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3a23cc36edaf8fc5a89cb100182758ccb5991487 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-tree-9.5.jar.sha1 b/modules/lang-painless/licenses/asm-tree-9.5.jar.sha1 new file mode 100644 index 0000000000000..fb42db6a9d15c --- /dev/null +++ b/modules/lang-painless/licenses/asm-tree-9.5.jar.sha1 @@ -0,0 +1 @@ +fd33c8b6373abaa675be407082fdfda35021254a \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-util-9.2.jar.sha1 b/modules/lang-painless/licenses/asm-util-9.2.jar.sha1 deleted file mode 100644 index 5cb89aa115f30..0000000000000 --- a/modules/lang-painless/licenses/asm-util-9.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fbc178fc5ba3dab50fd7e8a5317b8b647c8e8946 \ No newline at end of file diff --git a/modules/lang-painless/licenses/asm-util-9.5.jar.sha1 b/modules/lang-painless/licenses/asm-util-9.5.jar.sha1 new file mode 100644 index 0000000000000..5fffbfe655deb --- /dev/null +++ b/modules/lang-painless/licenses/asm-util-9.5.jar.sha1 @@ -0,0 +1 @@ +64b5a1fc8c1b15ed2efd6a063e976bc8d3dc5ffe \ No newline at end of file diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index 94af5ceae9c1f..173aa40a2a93b 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -249,6 +249,11 @@ thirdPartyAudit { 'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess', - 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator' + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator', + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$1', + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$2', + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$3', + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$4', + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$5' ) } diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.90.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.90.Final.jar.sha1 deleted file mode 100644 index 67604d11c1eca..0000000000000 --- a/modules/transport-netty4/licenses/netty-buffer-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -937eb60c19c5f5c1326b96123c9ec3d33238d4d5 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.91.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..158024bc892d5 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-buffer-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +d8f180291c3501e931968ca7e40ae0323c4eacee \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.90.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.90.Final.jar.sha1 deleted file mode 100644 index c8fb04a021807..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9992a22c82e18b8fd4f34989535f3e504e55aa37 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.91.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..764a03d3d73d1 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +3044b8e325e33f72c96ac1ea51dda85bef090cc0 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.90.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.90.Final.jar.sha1 deleted file mode 100644 index 861599ce1d1d2..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-http-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19bbcd46f8ee0d118486f98eff22fe665b9689e5 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.91.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..ca956129d98c1 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +4519d2ff470941f0086214b19c9acf992868112f \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.90.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.90.Final.jar.sha1 deleted file mode 100644 index afb531805329e..0000000000000 --- a/modules/transport-netty4/licenses/netty-common-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -43597a09382c6ae2bef469a9b3a41e8a17850638 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.91.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..deaad405402f2 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-common-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +93e5056462a242718e7689d81180d125c79d7723 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.90.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.90.Final.jar.sha1 deleted file mode 100644 index c98bfb52393d6..0000000000000 --- a/modules/transport-netty4/licenses/netty-handler-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -64f6946ce4d9189cec5341d3f5f86ac5653099b5 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.91.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..3e121e5de16b8 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-handler-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +444cf41e4fe28c47ffebba5e77b9458a12f938a1 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.90.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.90.Final.jar.sha1 deleted file mode 100644 index b92177828aa56..0000000000000 --- a/modules/transport-netty4/licenses/netty-resolver-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -47c415d8c83f08b820ba00e6497a6cf19dd0155f \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.91.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..bc57e2d01a2bf --- /dev/null +++ b/modules/transport-netty4/licenses/netty-resolver-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +04725d117d4b71ef0e743aa79062489b45472b26 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.90.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.90.Final.jar.sha1 deleted file mode 100644 index c7a77dbf6aaa8..0000000000000 --- a/modules/transport-netty4/licenses/netty-transport-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -82d68da212f62b076c763f5efa9b072d2abc018f \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.91.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..2562ece34790b --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +c2f6bd7143194ca842b535546a405c06aa993934 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 deleted file mode 100644 index 5f954b2595927..0000000000000 --- a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e42282002cf22105e7e993651aead231246d0220 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..6f45d642c8c0d --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +80990b5885b8b67be096d7090cba18f05c67120e \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/jettison-1.5.3.jar.sha1 b/plugins/discovery-azure-classic/licenses/jettison-1.5.3.jar.sha1 deleted file mode 100644 index afd13439e739c..0000000000000 --- a/plugins/discovery-azure-classic/licenses/jettison-1.5.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -964d35bbdecbbc33cf2f2044e8a1648d9f6f1474 \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/jettison-1.5.4.jar.sha1 b/plugins/discovery-azure-classic/licenses/jettison-1.5.4.jar.sha1 new file mode 100644 index 0000000000000..a87b7691bfce8 --- /dev/null +++ b/plugins/discovery-azure-classic/licenses/jettison-1.5.4.jar.sha1 @@ -0,0 +1 @@ +174ca56c411b05aec323d8f53e66709c0d28b337 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.90.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.90.Final.jar.sha1 deleted file mode 100644 index 3ef0c5df26b85..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-dns-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ebf5da8e6edf783d069d9aca346ff46c55772de6 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.91.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..de151d86d4595 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-dns-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +2c0242c69eee44ee559d02c564dbceee8bf0a5c7 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.90.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.90.Final.jar.sha1 deleted file mode 100644 index 64caa309f2c05..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-http2-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ea3be877ea976b3d71e1a872958d32854b24db66 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.91.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..d57336af7f414 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-http2-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +4ee7027e1653c6ee3f843191e0d932f29e8e14e1 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.90.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.90.Final.jar.sha1 deleted file mode 100644 index 2738db8a6710a..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-socks-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7397535a4e03d2f74c71aa2282eb7a2760ffc37b \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.91.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..10d7478ce02ca --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-socks-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +8f0a52677da411a8ab762c426d723c7f54471504 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1 deleted file mode 100644 index 60bde875d0faf..0000000000000 --- a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6ab526a43a14f7796434fa6a705c34201603235f \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.91.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..116ed58f33a4d --- /dev/null +++ b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +2e3e57eae1a61e4e5f558e39619186fec6c424d3 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.90.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.90.Final.jar.sha1 deleted file mode 100644 index 6124f27a050e0..0000000000000 --- a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c9e6762805fe1bc854352dbc8020226f38674bce \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.91.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..5f96d34bab52c --- /dev/null +++ b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +e1567967f5a85a469b10b7394e3e2b90ea5c0b12 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 deleted file mode 100644 index 5f954b2595927..0000000000000 --- a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e42282002cf22105e7e993651aead231246d0220 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..6f45d642c8c0d --- /dev/null +++ b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +80990b5885b8b67be096d7090cba18f05c67120e \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.90.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.90.Final.jar.sha1 deleted file mode 100644 index 829204d91b994..0000000000000 --- a/plugins/repository-hdfs/licenses/netty-all-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0fb2bac7d106f8db84b111202bfb1c68a1aa89b8 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.91.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..fd9d37b2f0c8d --- /dev/null +++ b/plugins/repository-hdfs/licenses/netty-all-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +d96d417b6c6b4a786d54418e09593c4b2292f437 \ No newline at end of file diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle index 2c8642eb3d880..ea1bc64c3c3d2 100644 --- a/plugins/transport-nio/build.gradle +++ b/plugins/transport-nio/build.gradle @@ -193,7 +193,12 @@ thirdPartyAudit { 'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess', - 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator' + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator', + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$1', + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$2', + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$3', + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$4', + 'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$5' ) } diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.90.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.90.Final.jar.sha1 deleted file mode 100644 index 67604d11c1eca..0000000000000 --- a/plugins/transport-nio/licenses/netty-buffer-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -937eb60c19c5f5c1326b96123c9ec3d33238d4d5 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.91.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..158024bc892d5 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-buffer-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +d8f180291c3501e931968ca7e40ae0323c4eacee \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.90.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.90.Final.jar.sha1 deleted file mode 100644 index c8fb04a021807..0000000000000 --- a/plugins/transport-nio/licenses/netty-codec-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9992a22c82e18b8fd4f34989535f3e504e55aa37 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.91.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..764a03d3d73d1 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +3044b8e325e33f72c96ac1ea51dda85bef090cc0 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.90.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.90.Final.jar.sha1 deleted file mode 100644 index 861599ce1d1d2..0000000000000 --- a/plugins/transport-nio/licenses/netty-codec-http-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19bbcd46f8ee0d118486f98eff22fe665b9689e5 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.91.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..ca956129d98c1 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +4519d2ff470941f0086214b19c9acf992868112f \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-common-4.1.90.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.90.Final.jar.sha1 deleted file mode 100644 index afb531805329e..0000000000000 --- a/plugins/transport-nio/licenses/netty-common-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -43597a09382c6ae2bef469a9b3a41e8a17850638 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-common-4.1.91.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..deaad405402f2 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-common-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +93e5056462a242718e7689d81180d125c79d7723 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.90.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.90.Final.jar.sha1 deleted file mode 100644 index c98bfb52393d6..0000000000000 --- a/plugins/transport-nio/licenses/netty-handler-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -64f6946ce4d9189cec5341d3f5f86ac5653099b5 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.91.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..3e121e5de16b8 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-handler-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +444cf41e4fe28c47ffebba5e77b9458a12f938a1 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.90.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.90.Final.jar.sha1 deleted file mode 100644 index b92177828aa56..0000000000000 --- a/plugins/transport-nio/licenses/netty-resolver-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -47c415d8c83f08b820ba00e6497a6cf19dd0155f \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.91.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..bc57e2d01a2bf --- /dev/null +++ b/plugins/transport-nio/licenses/netty-resolver-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +04725d117d4b71ef0e743aa79062489b45472b26 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.90.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.90.Final.jar.sha1 deleted file mode 100644 index c7a77dbf6aaa8..0000000000000 --- a/plugins/transport-nio/licenses/netty-transport-4.1.90.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -82d68da212f62b076c763f5efa9b072d2abc018f \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.91.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.91.Final.jar.sha1 new file mode 100644 index 0000000000000..2562ece34790b --- /dev/null +++ b/plugins/transport-nio/licenses/netty-transport-4.1.91.Final.jar.sha1 @@ -0,0 +1 @@ +c2f6bd7143194ca842b535546a405c06aa993934 \ No newline at end of file