diff --git a/CHANGELOG.md b/CHANGELOG.md index 3eddaad332ee1..1f84382138776 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `com.diffplug.spotless` from 6.17.0 to 6.18.0 (#7896) - Bump `jackson` from 2.15.1 to 2.15.2 ([#7897](https://github.com/opensearch-project/OpenSearch/pull/7897)) - Add `com.github.luben:zstd-jni` version 1.5.5-3 ([#2996](https://github.com/opensearch-project/OpenSearch/pull/2996)) +- Bump `netty` from 4.1.91.Final to 4.1.93.Final ([#7901](https://github.com/opensearch-project/OpenSearch/pull/7901)) ### Changed - Replace jboss-annotations-api_1.2_spec with jakarta.annotation-api ([#7836](https://github.com/opensearch-project/OpenSearch/pull/7836)) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index c305a91f31561..587759fa42b51 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -27,7 +27,7 @@ jakarta_annotation = 1.3.5 # when updating the JNA version, also update the version in buildSrc/build.gradle jna = 5.5.0 -netty = 4.1.91.Final +netty = 4.1.93.Final joda = 2.12.2 # client dependencies 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 deleted file mode 100644 index 158024bc892d5..0000000000000 --- a/modules/transport-netty4/licenses/netty-buffer-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d8f180291c3501e931968ca7e40ae0323c4eacee \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.93.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..5c5a17a9466f1 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-buffer-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +87fac21f4ef95157866b07b48e3c707a2f13c581 \ 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 deleted file mode 100644 index 764a03d3d73d1..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3044b8e325e33f72c96ac1ea51dda85bef090cc0 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.93.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..2b12a111335a2 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +503badb458b6586632be8d1f81aa4e5ab99a80fc \ 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 deleted file mode 100644 index ca956129d98c1..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-http-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4519d2ff470941f0086214b19c9acf992868112f \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.93.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..6719e882e40fe --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +36acf0c94d03eb6ecef78a749a32cbb7dc0c57b4 \ 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 deleted file mode 100644 index deaad405402f2..0000000000000 --- a/modules/transport-netty4/licenses/netty-common-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -93e5056462a242718e7689d81180d125c79d7723 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.93.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..2324a54dc5735 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-common-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +1cfc49b91b0d3ddb30c9f7d8467e5d02ae8babdf \ 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 deleted file mode 100644 index 3e121e5de16b8..0000000000000 --- a/modules/transport-netty4/licenses/netty-handler-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -444cf41e4fe28c47ffebba5e77b9458a12f938a1 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.93.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..54e5b22047812 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-handler-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +10f7ed9d8e1bfcba416074c70e5388be96116bfc \ 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 deleted file mode 100644 index bc57e2d01a2bf..0000000000000 --- a/modules/transport-netty4/licenses/netty-resolver-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -04725d117d4b71ef0e743aa79062489b45472b26 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.93.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..c795762c2d7f1 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-resolver-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +3860e99075f9e078364ed38f6d6fc8825b7a168a \ 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 deleted file mode 100644 index 2562ece34790b..0000000000000 --- a/modules/transport-netty4/licenses/netty-transport-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c2f6bd7143194ca842b535546a405c06aa993934 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.93.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..687cade3c7b3a --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +1a0894915c8027ce83b4d6a811c4e765955efd15 \ 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 deleted file mode 100644 index 6f45d642c8c0d..0000000000000 --- a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -80990b5885b8b67be096d7090cba18f05c67120e \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.93.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..0f0acb2eccddf --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +f4fb8b4c8da539091f43abcbb9f0389e48807eea \ 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 deleted file mode 100644 index de151d86d4595..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-dns-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2c0242c69eee44ee559d02c564dbceee8bf0a5c7 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.93.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..8ddec4af248f4 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-dns-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +a1433e4ae1cc56c0809b5b740ff8800d20b33c36 \ 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 deleted file mode 100644 index d57336af7f414..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-http2-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4ee7027e1653c6ee3f843191e0d932f29e8e14e1 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.93.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..02423842d6244 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-http2-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +0f1625b43bde13ec057da0d2fe381ded2547a70e \ 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 deleted file mode 100644 index 10d7478ce02ca..0000000000000 --- a/plugins/repository-azure/licenses/netty-codec-socks-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8f0a52677da411a8ab762c426d723c7f54471504 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.93.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..3e3f699a3b9a9 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-codec-socks-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +81ca78969afc60073e47c3b7b361cc3839392c73 \ 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 deleted file mode 100644 index 116ed58f33a4d..0000000000000 --- a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2e3e57eae1a61e4e5f558e39619186fec6c424d3 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.93.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..1ac94e6579c89 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +c165c1efe1b9c0cc22546a057b530611a088768b \ 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 deleted file mode 100644 index 5f96d34bab52c..0000000000000 --- a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e1567967f5a85a469b10b7394e3e2b90ea5c0b12 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.93.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..67eb275207963 --- /dev/null +++ b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +d5560348ab139dc9ea2dd9c0aa8ddffd0bf1b60f \ 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 deleted file mode 100644 index 6f45d642c8c0d..0000000000000 --- a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -80990b5885b8b67be096d7090cba18f05c67120e \ No newline at end of file diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.93.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..0f0acb2eccddf --- /dev/null +++ b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +f4fb8b4c8da539091f43abcbb9f0389e48807eea \ 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 deleted file mode 100644 index fd9d37b2f0c8d..0000000000000 --- a/plugins/repository-hdfs/licenses/netty-all-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d96d417b6c6b4a786d54418e09593c4b2292f437 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.93.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..a0f7bc4bf65ef --- /dev/null +++ b/plugins/repository-hdfs/licenses/netty-all-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +408780d8b32ce4510f5408b06efabc2230aaf9b6 \ 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 deleted file mode 100644 index 158024bc892d5..0000000000000 --- a/plugins/transport-nio/licenses/netty-buffer-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d8f180291c3501e931968ca7e40ae0323c4eacee \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.93.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..5c5a17a9466f1 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-buffer-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +87fac21f4ef95157866b07b48e3c707a2f13c581 \ 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 deleted file mode 100644 index 764a03d3d73d1..0000000000000 --- a/plugins/transport-nio/licenses/netty-codec-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3044b8e325e33f72c96ac1ea51dda85bef090cc0 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.93.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..2b12a111335a2 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +503badb458b6586632be8d1f81aa4e5ab99a80fc \ 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 deleted file mode 100644 index ca956129d98c1..0000000000000 --- a/plugins/transport-nio/licenses/netty-codec-http-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4519d2ff470941f0086214b19c9acf992868112f \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.93.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..6719e882e40fe --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +36acf0c94d03eb6ecef78a749a32cbb7dc0c57b4 \ 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 deleted file mode 100644 index deaad405402f2..0000000000000 --- a/plugins/transport-nio/licenses/netty-common-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -93e5056462a242718e7689d81180d125c79d7723 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-common-4.1.93.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..2324a54dc5735 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-common-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +1cfc49b91b0d3ddb30c9f7d8467e5d02ae8babdf \ 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 deleted file mode 100644 index 3e121e5de16b8..0000000000000 --- a/plugins/transport-nio/licenses/netty-handler-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -444cf41e4fe28c47ffebba5e77b9458a12f938a1 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.93.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..54e5b22047812 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-handler-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +10f7ed9d8e1bfcba416074c70e5388be96116bfc \ 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 deleted file mode 100644 index bc57e2d01a2bf..0000000000000 --- a/plugins/transport-nio/licenses/netty-resolver-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -04725d117d4b71ef0e743aa79062489b45472b26 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.93.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..c795762c2d7f1 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-resolver-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +3860e99075f9e078364ed38f6d6fc8825b7a168a \ 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 deleted file mode 100644 index 2562ece34790b..0000000000000 --- a/plugins/transport-nio/licenses/netty-transport-4.1.91.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c2f6bd7143194ca842b535546a405c06aa993934 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.93.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.93.Final.jar.sha1 new file mode 100644 index 0000000000000..687cade3c7b3a --- /dev/null +++ b/plugins/transport-nio/licenses/netty-transport-4.1.93.Final.jar.sha1 @@ -0,0 +1 @@ +1a0894915c8027ce83b4d6a811c4e765955efd15 \ No newline at end of file