From a9dbf0b948347bb2c727976526657fa99673987e Mon Sep 17 00:00:00 2001 From: Solr Bot <125606113+solrbot@users.noreply.github.com> Date: Sat, 9 Nov 2024 17:42:45 +0100 Subject: [PATCH] chore(deps): update io.netty:* to v4.1.114.final (#2702) * Update io.netty:* to v4.1.114.Final * Introduce netty BOM * Ensure consistent and compatible netty versions with netty BOM. * Update netty's license and notice files --------- Co-authored-by: Christos Malliaridis (cherry picked from commit ee9a77f6f42be7a74d9c688a5a930c2611ab5653) --- solr/licenses/netty-LICENSE-ASL.txt | 4 +- solr/licenses/netty-NOTICE.txt | 61 ++++++++++++++++--- .../netty-buffer-4.1.112.Final.jar.sha1 | 1 - .../netty-buffer-4.1.114.Final.jar.sha1 | 1 + .../netty-codec-4.1.112.Final.jar.sha1 | 1 - .../netty-codec-4.1.114.Final.jar.sha1 | 1 + .../netty-codec-http-4.1.112.Final.jar.sha1 | 1 - .../netty-codec-http-4.1.114.Final.jar.sha1 | 1 + .../netty-codec-http2-4.1.112.Final.jar.sha1 | 1 - .../netty-codec-http2-4.1.114.Final.jar.sha1 | 1 + .../netty-codec-socks-4.1.112.Final.jar.sha1 | 1 - .../netty-codec-socks-4.1.114.Final.jar.sha1 | 1 + .../netty-common-4.1.112.Final.jar.sha1 | 1 - .../netty-common-4.1.114.Final.jar.sha1 | 1 + .../netty-handler-4.1.112.Final.jar.sha1 | 1 - .../netty-handler-4.1.114.Final.jar.sha1 | 1 + ...netty-handler-proxy-4.1.112.Final.jar.sha1 | 1 - ...netty-handler-proxy-4.1.114.Final.jar.sha1 | 1 + .../netty-resolver-4.1.112.Final.jar.sha1 | 1 - .../netty-resolver-4.1.114.Final.jar.sha1 | 1 + ...ive-boringssl-static-2.0.61.Final.jar.sha1 | 1 - ...ive-boringssl-static-2.0.66.Final.jar.sha1 | 1 + ...tty-tcnative-classes-2.0.61.Final.jar.sha1 | 1 - ...tty-tcnative-classes-2.0.66.Final.jar.sha1 | 1 + .../netty-transport-4.1.112.Final.jar.sha1 | 1 - .../netty-transport-4.1.114.Final.jar.sha1 | 1 + ...sport-classes-epoll-4.1.112.Final.jar.sha1 | 1 - ...sport-classes-epoll-4.1.114.Final.jar.sha1 | 1 + ...-epoll-4.1.112.Final-linux-x86_64.jar.sha1 | 1 - ...-epoll-4.1.114.Final-linux-x86_64.jar.sha1 | 1 + ...-native-unix-common-4.1.112.Final.jar.sha1 | 1 - ...-native-unix-common-4.1.114.Final.jar.sha1 | 1 + solr/modules/opentelemetry/build.gradle | 1 + versions.lock | 31 +++++----- versions.props | 2 +- 35 files changed, 86 insertions(+), 43 deletions(-) delete mode 100644 solr/licenses/netty-buffer-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-buffer-4.1.114.Final.jar.sha1 delete mode 100644 solr/licenses/netty-codec-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-codec-4.1.114.Final.jar.sha1 delete mode 100644 solr/licenses/netty-codec-http-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-codec-http-4.1.114.Final.jar.sha1 delete mode 100644 solr/licenses/netty-codec-http2-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-codec-http2-4.1.114.Final.jar.sha1 delete mode 100644 solr/licenses/netty-codec-socks-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-codec-socks-4.1.114.Final.jar.sha1 delete mode 100644 solr/licenses/netty-common-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-common-4.1.114.Final.jar.sha1 delete mode 100644 solr/licenses/netty-handler-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-handler-4.1.114.Final.jar.sha1 delete mode 100644 solr/licenses/netty-handler-proxy-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-handler-proxy-4.1.114.Final.jar.sha1 delete mode 100644 solr/licenses/netty-resolver-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-resolver-4.1.114.Final.jar.sha1 delete mode 100644 solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1 create mode 100644 solr/licenses/netty-tcnative-boringssl-static-2.0.66.Final.jar.sha1 delete mode 100644 solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1 create mode 100644 solr/licenses/netty-tcnative-classes-2.0.66.Final.jar.sha1 delete mode 100644 solr/licenses/netty-transport-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-transport-4.1.114.Final.jar.sha1 delete mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-transport-classes-epoll-4.1.114.Final.jar.sha1 delete mode 100644 solr/licenses/netty-transport-native-epoll-4.1.112.Final-linux-x86_64.jar.sha1 create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.114.Final-linux-x86_64.jar.sha1 delete mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.112.Final.jar.sha1 create mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.114.Final.jar.sha1 diff --git a/solr/licenses/netty-LICENSE-ASL.txt b/solr/licenses/netty-LICENSE-ASL.txt index d6456956733..62589edd12a 100644 --- a/solr/licenses/netty-LICENSE-ASL.txt +++ b/solr/licenses/netty-LICENSE-ASL.txt @@ -1,7 +1,7 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -193,7 +193,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/solr/licenses/netty-NOTICE.txt b/solr/licenses/netty-NOTICE.txt index f973663670b..953277d6594 100644 --- a/solr/licenses/netty-NOTICE.txt +++ b/solr/licenses/netty-NOTICE.txt @@ -4,7 +4,7 @@ Please visit the Netty web site for more information: - * http://netty.io/ + * https://netty.io/ Copyright 2014 The Netty Project @@ -12,7 +12,7 @@ The Netty Project licenses this file to you under the Apache License, version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at: - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT @@ -56,7 +56,7 @@ facade for Java, which can be obtained at: * LICENSE: * license/LICENSE.slf4j.txt (MIT License) * HOMEPAGE: - * http://www.slf4j.org/ + * https://www.slf4j.org/ This product contains a modified portion of 'Apache Harmony', an open source Java SE, which can be obtained at: @@ -66,7 +66,7 @@ Java SE, which can be obtained at: * LICENSE: * license/LICENSE.harmony.txt (Apache License 2.0) * HOMEPAGE: - * http://archive.apache.org/dist/harmony/ + * https://archive.apache.org/dist/harmony/ This product contains a modified portion of 'jbzip2', a Java bzip2 compression and decompression library written by Matthew J. Francis. It can be obtained at: @@ -125,6 +125,14 @@ and decompression library, which can be obtained at: * HOMEPAGE: * https://github.com/jponge/lzma-java +This product optionally depends on 'zstd-jni', a zstd-jni Java compression +and decompression library, which can be obtained at: + + * LICENSE: + * license/LICENSE.zstd-jni.txt (BSD) + * HOMEPAGE: + * https://github.com/luben/zstd-jni + This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression and decompression library written by William Kinney. It can be obtained at: @@ -148,7 +156,7 @@ equivalent functionality. It can be obtained at: * LICENSE: * license/LICENSE.bouncycastle.txt (MIT License) * HOMEPAGE: - * http://www.bouncycastle.org/ + * https://www.bouncycastle.org/ This product optionally depends on 'Snappy', a compression library produced by Google Inc, which can be obtained at: @@ -162,9 +170,9 @@ This product optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: * LICENSE: - * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1) + * license/LICENSE.jboss-marshalling.txt (Apache License 2.0) * HOMEPAGE: - * http://www.jboss.org/jbossmarshalling + * https://github.com/jboss-remoting/jboss-marshalling This product optionally depends on 'Caliper', Google's micro- benchmarking framework, which can be obtained at: @@ -180,7 +188,7 @@ framework, which can be obtained at: * LICENSE: * license/LICENSE.commons-logging.txt (Apache License 2.0) * HOMEPAGE: - * http://commons.apache.org/logging/ + * https://commons.apache.org/logging/ This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: @@ -188,7 +196,7 @@ can be obtained at: * LICENSE: * license/LICENSE.log4j.txt (Apache License 2.0) * HOMEPAGE: - * http://logging.apache.org/log4j/ + * https://logging.apache.org/log4j/ This product optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: @@ -196,7 +204,7 @@ non-blocking XML processor, which can be obtained at: * LICENSE: * license/LICENSE.aalto-xml.txt (Apache License 2.0) * HOMEPAGE: - * http://wiki.fasterxml.com/AaltoHome + * https://wiki.fasterxml.com/AaltoHome This product contains a modified version of 'HPACK', a Java implementation of the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at: @@ -206,6 +214,22 @@ the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at: * HOMEPAGE: * https://github.com/twitter/hpack +This product contains a modified version of 'HPACK', a Java implementation of +the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at: + + * LICENSE: + * license/LICENSE.hyper-hpack.txt (MIT License) + * HOMEPAGE: + * https://github.com/python-hyper/hpack/ + +This product contains a modified version of 'HPACK', a Java implementation of +the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at: + + * LICENSE: + * license/LICENSE.nghttp2-hpack.txt (MIT License) + * HOMEPAGE: + * https://github.com/nghttp2/nghttp2/ + This product contains a modified portion of 'Apache Commons Lang', a Java library provides utilities for the java.lang API, which can be obtained at: @@ -221,3 +245,20 @@ This product contains the Maven wrapper scripts from 'Maven Wrapper', that provi * license/LICENSE.mvn-wrapper.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/takari/maven-wrapper + +This product contains the dnsinfo.h header file, that provides a way to retrieve the system DNS configuration on MacOS. +This private header is also used by Apple's open source + mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/). + + * LICENSE: + * license/LICENSE.dnsinfo.txt (Apple Public Source License 2.0) + * HOMEPAGE: + * https://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h + +This product optionally depends on 'Brotli4j', Brotli compression and +decompression for Java., which can be obtained at: + + * LICENSE: + * license/LICENSE.brotli4j.txt (Apache License 2.0) + * HOMEPAGE: + * https://github.com/hyperxpro/Brotli4j diff --git a/solr/licenses/netty-buffer-4.1.112.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.112.Final.jar.sha1 deleted file mode 100644 index 0ac205b0823..00000000000 --- a/solr/licenses/netty-buffer-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bdc12df04bb6858890b8aa108060b5b365a26102 diff --git a/solr/licenses/netty-buffer-4.1.114.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..720e556e6d8 --- /dev/null +++ b/solr/licenses/netty-buffer-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +f1d77d15c0b781cd9395a2a956262766fd0c7602 diff --git a/solr/licenses/netty-codec-4.1.112.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.112.Final.jar.sha1 deleted file mode 100644 index 55360968342..00000000000 --- a/solr/licenses/netty-codec-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c87f2ec3d9a97bd2b793d16817abb2bab93a7fc3 diff --git a/solr/licenses/netty-codec-4.1.114.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..84b726e18a0 --- /dev/null +++ b/solr/licenses/netty-codec-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +5a49dfa2828d64bf756f670e63259115332744cf diff --git a/solr/licenses/netty-codec-http-4.1.112.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.112.Final.jar.sha1 deleted file mode 100644 index c5a4048f7eb..00000000000 --- a/solr/licenses/netty-codec-http-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -81af1040bfa977f98dd0e1bd9639513ea862ca04 diff --git a/solr/licenses/netty-codec-http-4.1.114.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..c7c0248da60 --- /dev/null +++ b/solr/licenses/netty-codec-http-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +fbce5a53884275662e68aaad70f88bf7e5d04164 diff --git a/solr/licenses/netty-codec-http2-4.1.112.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.112.Final.jar.sha1 deleted file mode 100644 index d8ff515db81..00000000000 --- a/solr/licenses/netty-codec-http2-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7fa28b510f0f16f4d5d7188b86bef59e048f62f9 diff --git a/solr/licenses/netty-codec-http2-4.1.114.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..47c75f00256 --- /dev/null +++ b/solr/licenses/netty-codec-http2-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +19ae07fdf99142a70338f8cda70a3d2edbc8e80a diff --git a/solr/licenses/netty-codec-socks-4.1.112.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.112.Final.jar.sha1 deleted file mode 100644 index 0b3d39a0cee..00000000000 --- a/solr/licenses/netty-codec-socks-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9aed7e78c467d06a47a45b5b27466380a6427e2f diff --git a/solr/licenses/netty-codec-socks-4.1.114.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..decacfe281e --- /dev/null +++ b/solr/licenses/netty-codec-socks-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +42b1159cac3d196f6bdbd528e29f0fab9dbaae06 diff --git a/solr/licenses/netty-common-4.1.112.Final.jar.sha1 b/solr/licenses/netty-common-4.1.112.Final.jar.sha1 deleted file mode 100644 index 1659204d787..00000000000 --- a/solr/licenses/netty-common-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b2798069092a981a832b7510d0462ee9efb7a80e diff --git a/solr/licenses/netty-common-4.1.114.Final.jar.sha1 b/solr/licenses/netty-common-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..e4304152793 --- /dev/null +++ b/solr/licenses/netty-common-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +862712e292b162c8ccaa7847a6a54df8178f77e5 diff --git a/solr/licenses/netty-handler-4.1.112.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.112.Final.jar.sha1 deleted file mode 100644 index 43be3612a0d..00000000000 --- a/solr/licenses/netty-handler-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3d5e2d5bcc6baeeb8c13a230980c6132a778e036 diff --git a/solr/licenses/netty-handler-4.1.114.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..3a44d3b3d57 --- /dev/null +++ b/solr/licenses/netty-handler-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +e56fbde4b9aa628eed15a5dbfbeb97877db88146 diff --git a/solr/licenses/netty-handler-proxy-4.1.112.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.112.Final.jar.sha1 deleted file mode 100644 index d85e58a7af2..00000000000 --- a/solr/licenses/netty-handler-proxy-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b23c87a85451b3b0e7c3e8e89698cea6831a8418 diff --git a/solr/licenses/netty-handler-proxy-4.1.114.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..49fbddcc7db --- /dev/null +++ b/solr/licenses/netty-handler-proxy-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +a01071edffb4812009312b461ce5f160cdec9b75 diff --git a/solr/licenses/netty-resolver-4.1.112.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.112.Final.jar.sha1 deleted file mode 100644 index 95eb0338e52..00000000000 --- a/solr/licenses/netty-resolver-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -58a631d9d44c4ed7cc0dcc9cffa6641da9374d72 diff --git a/solr/licenses/netty-resolver-4.1.114.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..c1135b835f7 --- /dev/null +++ b/solr/licenses/netty-resolver-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +10b23784b23d6a948930f52ba82874f1291b5873 diff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1 deleted file mode 100644 index 1c3e5f7d66f..00000000000 --- a/solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -944722ba2883fe5825a0c6b38dc727d7151a9371 diff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.66.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.66.Final.jar.sha1 new file mode 100644 index 00000000000..04aa0028843 --- /dev/null +++ b/solr/licenses/netty-tcnative-boringssl-static-2.0.66.Final.jar.sha1 @@ -0,0 +1 @@ +7b0abf028c27ce6ad0c17a443a13f175fb4eda27 diff --git a/solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1 deleted file mode 100644 index ca1be9444d7..00000000000 --- a/solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4c6ae851ed97921bc6c6b64e019c2b039f49131a diff --git a/solr/licenses/netty-tcnative-classes-2.0.66.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.66.Final.jar.sha1 new file mode 100644 index 00000000000..77a6debf6b2 --- /dev/null +++ b/solr/licenses/netty-tcnative-classes-2.0.66.Final.jar.sha1 @@ -0,0 +1 @@ +9588bd2f891157538a78d86c945aa34bf9308dda diff --git a/solr/licenses/netty-transport-4.1.112.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.112.Final.jar.sha1 deleted file mode 100644 index 5edb433d5f4..00000000000 --- a/solr/licenses/netty-transport-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -77cd136dd3843f5e7cbcf68c824975d745c49ddb diff --git a/solr/licenses/netty-transport-4.1.114.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..f74dfc80c43 --- /dev/null +++ b/solr/licenses/netty-transport-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +e0225a575f487904be8517092cbd74e01913533c diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.112.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.112.Final.jar.sha1 deleted file mode 100644 index 1364819aa58..00000000000 --- a/solr/licenses/netty-transport-classes-epoll-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -67e590356eb53c20aaabd67f61ae66f628e62e3d diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.114.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..c9046686be2 --- /dev/null +++ b/solr/licenses/netty-transport-classes-epoll-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +f442c794e6fe89e6974f058bf393353e01fb927d diff --git a/solr/licenses/netty-transport-native-epoll-4.1.112.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.112.Final-linux-x86_64.jar.sha1 deleted file mode 100644 index 9995f7b1048..00000000000 --- a/solr/licenses/netty-transport-native-epoll-4.1.112.Final-linux-x86_64.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -caed6f2ae7aebcef50098a64f55918cb8550d2d0 diff --git a/solr/licenses/netty-transport-native-epoll-4.1.114.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.114.Final-linux-x86_64.jar.sha1 new file mode 100644 index 00000000000..672f28c70a2 --- /dev/null +++ b/solr/licenses/netty-transport-native-epoll-4.1.114.Final-linux-x86_64.jar.sha1 @@ -0,0 +1 @@ +43268d2bef66e72e5a7956045a3caf8395f49ae6 diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.112.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.112.Final.jar.sha1 deleted file mode 100644 index 265f56097e8..00000000000 --- a/solr/licenses/netty-transport-native-unix-common-4.1.112.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b50ff619cdcdc48e748cba3405c9988529f28f60 diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.114.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.114.Final.jar.sha1 new file mode 100644 index 00000000000..9b40cb77ea2 --- /dev/null +++ b/solr/licenses/netty-transport-native-unix-common-4.1.114.Final.jar.sha1 @@ -0,0 +1 @@ +d1171bb99411f282068f49d780cedf8c9adeabfd diff --git a/solr/modules/opentelemetry/build.gradle b/solr/modules/opentelemetry/build.gradle index e63821d5d41..bf1bd9ee738 100644 --- a/solr/modules/opentelemetry/build.gradle +++ b/solr/modules/opentelemetry/build.gradle @@ -24,6 +24,7 @@ dependencies { implementation project(':solr:solrj') implementation platform('io.opentelemetry:opentelemetry-bom') + implementation platform('io.netty:netty-bom') implementation 'io.opentracing:opentracing-api' implementation 'io.opentelemetry:opentelemetry-api' diff --git a/versions.lock b/versions.lock index 90e3422872e..298860bb465 100644 --- a/versions.lock +++ b/versions.lock @@ -127,21 +127,22 @@ io.grpc:grpc-util:1.65.1 (2 constraints: ec1876f9) io.grpc:grpc-xds:1.65.1 (1 constraints: 1f100ba6) io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721) io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936) -io.netty:netty-buffer:4.1.112.Final (10 constraints: 329b3f3f) -io.netty:netty-codec:4.1.112.Final (5 constraints: 2346668a) -io.netty:netty-codec-http:4.1.112.Final (3 constraints: c724f93e) -io.netty:netty-codec-http2:4.1.112.Final (1 constraints: 0f0b42d5) -io.netty:netty-codec-socks:4.1.112.Final (1 constraints: 3b0fa57a) -io.netty:netty-common:4.1.112.Final (12 constraints: f8b40f68) -io.netty:netty-handler:4.1.112.Final (3 constraints: e52b7aa2) -io.netty:netty-handler-proxy:4.1.112.Final (1 constraints: 0f0b42d5) -io.netty:netty-resolver:4.1.112.Final (2 constraints: a61a1f5d) -io.netty:netty-tcnative-boringssl-static:2.0.61.Final (1 constraints: d10fc38e) -io.netty:netty-tcnative-classes:2.0.61.Final (1 constraints: d113ea5d) -io.netty:netty-transport:4.1.112.Final (9 constraints: 588dbbb9) -io.netty:netty-transport-classes-epoll:4.1.112.Final (1 constraints: d8128f30) -io.netty:netty-transport-native-epoll:4.1.112.Final (1 constraints: 0310df9d) -io.netty:netty-transport-native-unix-common:4.1.112.Final (4 constraints: ef3d2c48) +io.netty:netty-bom:4.1.114.Final (1 constraints: 8507c567) +io.netty:netty-buffer:4.1.114.Final (11 constraints: 73a6ad35) +io.netty:netty-codec:4.1.114.Final (6 constraints: 5a5150a9) +io.netty:netty-codec-http:4.1.114.Final (4 constraints: fa2f72f8) +io.netty:netty-codec-http2:4.1.114.Final (2 constraints: 3c16cf31) +io.netty:netty-codec-socks:4.1.114.Final (2 constraints: 6a1a3f4b) +io.netty:netty-common:4.1.114.Final (13 constraints: 3dc0e6cd) +io.netty:netty-handler:4.1.114.Final (4 constraints: 1637bb40) +io.netty:netty-handler-proxy:4.1.114.Final (2 constraints: 3c16cf31) +io.netty:netty-resolver:4.1.114.Final (3 constraints: d7254fb5) +io.netty:netty-tcnative-boringssl-static:2.0.66.Final (2 constraints: d11a4158) +io.netty:netty-tcnative-classes:2.0.66.Final (2 constraints: d61e8b95) +io.netty:netty-transport:4.1.114.Final (10 constraints: 97988ae2) +io.netty:netty-transport-classes-epoll:4.1.114.Final (2 constraints: 071ebe65) +io.netty:netty-transport-native-epoll:4.1.114.Final (2 constraints: 301bc584) +io.netty:netty-transport-native-unix-common:4.1.114.Final (5 constraints: 2249871c) io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692) io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc) io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595) diff --git a/versions.props b/versions.props index 8963e4cfca6..e81fe6003b6 100644 --- a/versions.props +++ b/versions.props @@ -24,7 +24,7 @@ commons-io:commons-io=2.15.1 io.dropwizard.metrics:*=4.2.26 io.grpc:grpc-*=1.65.1 io.jaegertracing:*=1.8.1 -io.netty:*=4.1.112.Final +io.netty:*=4.1.114.Final io.opentelemetry:opentelemetry-bom=1.40.0 io.opentracing:*=0.33.0 io.prometheus:*=0.16.0