This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch STORM-3947_Align_Netty_with_version_used_in_Zookeeper in repository https://gitbox.apache.org/repos/asf/storm.git
commit ae9310a7fc9def3714dc657e7aa7c425c5faa8bf Author: Richard Zowalla <[email protected]> AuthorDate: Mon Aug 14 12:37:39 2023 +0200 STORM-3947 - Align Netty with version used in Zookeeper --- DEPENDENCY-LICENSES | 40 +++++++++++++++++++++++++++++++--------- LICENSE-binary | 45 +++++++++++++++++++++++++++++++++------------ pom.xml | 2 +- storm-shaded-deps/pom.xml | 3 +-- 4 files changed, 66 insertions(+), 24 deletions(-) diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES index 26985a1e8..8ff69bb60 100644 --- a/DEPENDENCY-LICENSES +++ b/DEPENDENCY-LICENSES @@ -432,17 +432,39 @@ List of third-party dependencies grouped by their license type. * MongoDB Java Driver (org.mongodb:mongo-java-driver:3.2.0 - http://www.mongodb.org) * mqtt-client (org.fusesource.mqtt-client:mqtt-client:1.10 - http://mqtt-client.fusesource.org/mqtt-client/) * mqtt-client (org.fusesource.mqtt-client:mqtt-client:1.14 - http://mqtt-client.fusesource.org/mqtt-client/) - * Netty/All-in-One (io.netty:netty-all:4.1.30.Final - http://netty.io/netty-all/) - * Netty/Buffer (io.netty:netty-buffer:4.1.30.Final - http://netty.io/netty-buffer/) - * Netty/Codec (io.netty:netty-codec:4.1.30.Final - http://netty.io/netty-codec/) - * Netty/Common (io.netty:netty-common:4.1.30.Final - http://netty.io/netty-common/) - * Netty/Handler (io.netty:netty-handler:4.1.30.Final - http://netty.io/netty-handler/) - * Netty/Resolver (io.netty:netty-resolver:4.1.30.Final - http://netty.io/netty-resolver/) + * Netty/All-in-One (io.netty:netty-all:4.1.96.Final - https://netty.io/netty-all/) + * Netty/Buffer (io.netty:netty-buffer:4.1.96.Final - https://netty.io/netty-buffer/) + * Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.96.Final - https://netty.io/netty-codec-dns/) + * Netty/Codec/HAProxy (io.netty:netty-codec-haproxy:4.1.96.Final - https://netty.io/netty-codec-haproxy/) + * Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.96.Final - https://netty.io/netty-codec-http/) + * Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.96.Final - https://netty.io/netty-codec-http2/) + * Netty/Codec/Memcache (io.netty:netty-codec-memcache:4.1.96.Final - https://netty.io/netty-codec-memcache/) + * Netty/Codec/MQTT (io.netty:netty-codec-mqtt:4.1.96.Final - https://netty.io/netty-codec-mqtt/) + * Netty/Codec/Redis (io.netty:netty-codec-redis:4.1.96.Final - https://netty.io/netty-codec-redis/) + * Netty/Codec/SMTP (io.netty:netty-codec-smtp:4.1.96.Final - https://netty.io/netty-codec-smtp/) + * Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.96.Final - https://netty.io/netty-codec-socks/) + * Netty/Codec/Stomp (io.netty:netty-codec-stomp:4.1.96.Final - https://netty.io/netty-codec-stomp/) + * Netty/Codec/XML (io.netty:netty-codec-xml:4.1.96.Final - https://netty.io/netty-codec-xml/) + * Netty/Codec (io.netty:netty-codec:4.1.96.Final - https://netty.io/netty-codec/) + * Netty/Common (io.netty:netty-common:4.1.96.Final - https://netty.io/netty-common/) + * Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.96.Final - https://netty.io/netty-handler-proxy/) + * Netty/Handler/Ssl/Ocsp (io.netty:netty-handler-ssl-ocsp:4.1.96.Final - https://netty.io/netty-handler-ssl-ocsp/) + * Netty/Handler (io.netty:netty-handler:4.1.96.Final - https://netty.io/netty-handler/) + * Netty/Resolver/DNS/Classes/MacOS (io.netty:netty-resolver-dns-classes-macos:4.1.96.Final - https://netty.io/netty-resolver-dns-classes-macos/) + * Netty/Resolver/DNS/Native/MacOS (io.netty:netty-resolver-dns-native-macos:4.1.96.Final - https://netty.io/netty-resolver-dns-native-macos/) + * Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.96.Final - https://netty.io/netty-resolver-dns/) + * Netty/Resolver (io.netty:netty-resolver:4.1.96.Final - https://netty.io/netty-resolver/) * Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.61.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) * Netty/TomcatNative [OpenSSL - Classes] (io.netty:netty-tcnative-classes:2.0.61.Final - https://github.com/netty/netty-tcnative/netty-tcnative-classes/) - * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.30.Final - http://netty.io/netty-transport-native-epoll/) - * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.30.Final - http://netty.io/netty-transport-native-unix-common/) - * Netty/Transport (io.netty:netty-transport:4.1.30.Final - http://netty.io/netty-transport/) + * Netty/Transport/Classes/Epoll (io.netty:netty-transport-classes-epoll:4.1.96.Final - https://netty.io/netty-transport-classes-epoll/) + * Netty/Transport/Classes/KQueue (io.netty:netty-transport-classes-kqueue:4.1.96.Final - https://netty.io/netty-transport-classes-kqueue/) + * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.96.Final - https://netty.io/netty-transport-native-epoll/) + * Netty/Transport/Native/KQueue (io.netty:netty-transport-native-kqueue:4.1.96.Final - https://netty.io/netty-transport-native-kqueue/) + * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.96.Final - https://netty.io/netty-transport-native-unix-common/) + * Netty/Transport/RXTX (io.netty:netty-transport-rxtx:4.1.96.Final - https://netty.io/netty-transport-rxtx/) + * Netty/Transport/SCTP (io.netty:netty-transport-sctp:4.1.96.Final - https://netty.io/netty-transport-sctp/) + * Netty/Transport/UDT (io.netty:netty-transport-udt:4.1.96.Final - https://netty.io/netty-transport-udt/) + * Netty/Transport (io.netty:netty-transport:4.1.96.Final - https://netty.io/netty-transport/) * Netty (io.netty:netty:3.10.6.Final - http://netty.io/) * Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:7.9 - https://bitbucket.org/connect2id/nimbus-jose-jwt) * Noggit (org.noggit:noggit:0.6 - http://github.com/yonik/noggit) diff --git a/LICENSE-binary b/LICENSE-binary index 55006b565..08176229b 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -660,7 +660,6 @@ The license texts of these dependencies can be found in the licenses directory. * Maven Repository Metadata Model (org.apache.maven:maven-repository-metadata:3.6.0 - https://maven.apache.org/ref/3.6.0/maven-repository-metadata/) * Maven Artifact Resolver Provider (org.apache.maven:maven-resolver-provider:3.6.0 - https://maven.apache.org/ref/3.6.0/maven-resolver-provider/) * Maven Model (org.apache.maven:maven-model:3.6.0 - https://maven.apache.org/ref/3.6.0/maven-model/) - * Netty/All-in-One (io.netty:netty-all:4.1.30.Final - http://netty.io/netty-all/) * Maven Artifact Resolver API (org.apache.maven.resolver:maven-resolver-api:1.3.3 - https://maven.apache.org/resolver/maven-resolver-api/) * Maven Artifact Resolver SPI (org.apache.maven.resolver:maven-resolver-spi:1.3.3 - https://maven.apache.org/resolver/maven-resolver-spi/) * Maven Artifact Resolver Implementation (org.apache.maven.resolver:maven-resolver-impl:1.3.3 - https://maven.apache.org/resolver/maven-resolver-impl/) @@ -668,19 +667,41 @@ The license texts of these dependencies can be found in the licenses directory. * Plexus :: Component Annotations (org.codehaus.plexus:plexus-component-annotations:1.7.1 - http://codehaus-plexus.github.io/plexus-containers/plexus-component-annotations/) * Maven Artifact Resolver Utilities (org.apache.maven.resolver:maven-resolver-util:1.3.3 - https://maven.apache.org/resolver/maven-resolver-util/) * Maven Artifact Resolver Connector Basic (org.apache.maven.resolver:maven-resolver-connector-basic:1.3.3 - https://maven.apache.org/resolver/maven-resolver-connector-basic/) - * Netty/All-in-One (io.netty:netty-all:4.1.30.Final - http://netty.io/netty-all/) - * Netty/Buffer (io.netty:netty-buffer:4.1.30.Final - http://netty.io/netty-buffer/) - * Netty/Codec (io.netty:netty-codec:4.1.30.Final - http://netty.io/netty-codec/) - * Netty/Common (io.netty:netty-common:4.1.30.Final - http://netty.io/netty-common/) - * Netty/Handler (io.netty:netty-handler:4.1.30.Final - http://netty.io/netty-handler/) - * Netty/Resolver (io.netty:netty-resolver:4.1.30.Final - http://netty.io/netty-resolver/) - * Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.61.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) + * Netty/All-in-One (io.netty:netty-all:4.1.96.Final - https://netty.io/netty-all/) + * Netty/Buffer (io.netty:netty-buffer:4.1.96.Final - https://netty.io/netty-buffer/) + * Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.96.Final - https://netty.io/netty-codec-dns/) + * Netty/Codec/HAProxy (io.netty:netty-codec-haproxy:4.1.96.Final - https://netty.io/netty-codec-haproxy/) + * Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.96.Final - https://netty.io/netty-codec-http/) + * Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.96.Final - https://netty.io/netty-codec-http2/) + * Netty/Codec/Memcache (io.netty:netty-codec-memcache:4.1.96.Final - https://netty.io/netty-codec-memcache/) + * Netty/Codec/MQTT (io.netty:netty-codec-mqtt:4.1.96.Final - https://netty.io/netty-codec-mqtt/) + * Netty/Codec/Redis (io.netty:netty-codec-redis:4.1.96.Final - https://netty.io/netty-codec-redis/) + * Netty/Codec/SMTP (io.netty:netty-codec-smtp:4.1.96.Final - https://netty.io/netty-codec-smtp/) + * Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.96.Final - https://netty.io/netty-codec-socks/) + * Netty/Codec/Stomp (io.netty:netty-codec-stomp:4.1.96.Final - https://netty.io/netty-codec-stomp/) + * Netty/Codec/XML (io.netty:netty-codec-xml:4.1.96.Final - https://netty.io/netty-codec-xml/) + * Netty/Codec (io.netty:netty-codec:4.1.96.Final - https://netty.io/netty-codec/) + * Netty/Common (io.netty:netty-common:4.1.96.Final - https://netty.io/netty-common/) + * Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.96.Final - https://netty.io/netty-handler-proxy/) + * Netty/Handler/Ssl/Ocsp (io.netty:netty-handler-ssl-ocsp:4.1.96.Final - https://netty.io/netty-handler-ssl-ocsp/) + * Netty/Handler (io.netty:netty-handler:4.1.96.Final - https://netty.io/netty-handler/) + * Netty/Resolver/DNS/Classes/MacOS (io.netty:netty-resolver-dns-classes-macos:4.1.96.Final - https://netty.io/netty-resolver-dns-classes-macos/) + * Netty/Resolver/DNS/Native/MacOS (io.netty:netty-resolver-dns-native-macos:4.1.96.Final - https://netty.io/netty-resolver-dns-native-macos/) + * Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.96.Final - https://netty.io/netty-resolver-dns/) + * Netty/Resolver (io.netty:netty-resolver:4.1.96.Final - https://netty.io/netty-resolver/) * Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:jar:2.0.61.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) + * Netty/TomcatNative [BoringSSL - Static] (io.netty:netty-tcnative-boringssl-static:2.0.61.Final - https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) * Netty/TomcatNative [OpenSSL - Classes] (io.netty:netty-tcnative-classes:2.0.61.Final - https://github.com/netty/netty-tcnative/netty-tcnative-classes/) - * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.30.Final - http://netty.io/netty-transport-native-epoll/) - * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:jar:4.1.30.Final - http://netty.io/netty-transport-native-epoll/) - * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.30.Final - http://netty.io/netty-transport-native-unix-common/) - * Netty/Transport (io.netty:netty-transport:4.1.30.Final - http://netty.io/netty-transport/) + * Netty/Transport/Classes/Epoll (io.netty:netty-transport-classes-epoll:4.1.96.Final - https://netty.io/netty-transport-classes-epoll/) + * Netty/Transport/Classes/KQueue (io.netty:netty-transport-classes-kqueue:4.1.96.Final - https://netty.io/netty-transport-classes-kqueue/) + * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.96.Final - https://netty.io/netty-transport-native-epoll/) + * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:jar:4.1.96.Final - https://netty.io/netty-transport-native-epoll/) + * Netty/Transport/Native/KQueue (io.netty:netty-transport-native-kqueue:4.1.96.Final - https://netty.io/netty-transport-native-kqueue/) + * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.96.Final - https://netty.io/netty-transport-native-unix-common/) + * Netty/Transport/RXTX (io.netty:netty-transport-rxtx:4.1.96.Final - https://netty.io/netty-transport-rxtx/) + * Netty/Transport/SCTP (io.netty:netty-transport-sctp:4.1.96.Final - https://netty.io/netty-transport-sctp/) + * Netty/Transport/UDT (io.netty:netty-transport-udt:4.1.96.Final - https://netty.io/netty-transport-udt/) + * Netty/Transport (io.netty:netty-transport:4.1.96.Final - https://netty.io/netty-transport/) * Netty (io.netty:netty:3.6.2.Final - http://netty.io/) * Aggregate Designer Algorithm (net.hydromatic:aggdesigner-algorithm:6.0 - http://github.com/julianhyde/aggdesigner/aggdesigner-algorithm) * aircompressor (io.airlift:aircompressor:0.8 - http://github.com/airlift/aircompressor) diff --git a/pom.xml b/pom.xml index c88fb87b6..6090c7662 100644 --- a/pom.xml +++ b/pom.xml @@ -313,7 +313,7 @@ <jgrapht.version>0.9.0</jgrapht.version> <guava.version>27.0.1-jre</guava.version> <auto-service.version>1.0-rc4</auto-service.version> - <netty.version>4.1.30.Final</netty.version> + <netty.version>4.1.96.Final</netty.version> <sysout-over-slf4j.version>1.0.2</sysout-over-slf4j.version> <log4j.version>2.17.1</log4j.version> <slf4j.version>1.7.36</slf4j.version> diff --git a/storm-shaded-deps/pom.xml b/storm-shaded-deps/pom.xml index 8785ab104..aae33d735 100644 --- a/storm-shaded-deps/pom.xml +++ b/storm-shaded-deps/pom.xml @@ -201,8 +201,7 @@ <include>commons-io:commons-io</include> <include>commons-lang:commons-lang</include> <!-- Pulled in by Zookeeper --> - <include>io.netty:netty</include> - <include>io.netty:netty-all</include> + <include>io.netty:*</include> <include>org.apache.curator:*</include> <include>org.apache.httpcomponents:httpclient</include> <include>org.apache.thrift:*</include>
