This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
commit ffcc8fcf6d10f48643e0d07bc0d1675aec6f1541 Author: Chesnay Schepler <[email protected]> AuthorDate: Mon Sep 26 14:32:38 2022 +0200 [FLINK-29418][netty] Upgrade 4.1.70 -> 4.1.82 --- .../src/main/resources/META-INF/NOTICE | 66 +++++++++++----------- flink-shaded-netty-tcnative-dynamic/pom.xml | 3 +- .../src/main/resources/META-INF/NOTICE | 3 +- flink-shaded-netty-tcnative-static/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 18 +++--- .../src/main/resources/META-INF/NOTICE | 18 +++--- pom.xml | 2 +- 8 files changed, 58 insertions(+), 56 deletions(-) diff --git a/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE b/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE index eeeb18b..cc89ec0 100644 --- a/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE +++ b/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE @@ -6,36 +6,36 @@ The Apache Software Foundation (http://www.apache.org/). This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- io.netty:netty-all:4.1.70.Final -- io.netty:netty-buffer:4.1.70.Final -- io.netty:netty-codec:4.1.70.Final -- io.netty:netty-codec-dns:4.1.70.Final -- io.netty:netty-codec-haproxy:4.1.70.Final -- io.netty:netty-codec-http:4.1.70.Final -- io.netty:netty-codec-http2:4.1.70.Final -- io.netty:netty-codec-memcache:4.1.70.Final -- io.netty:netty-codec-mqtt:4.1.70.Final -- io.netty:netty-codec-redis:4.1.70.Final -- io.netty:netty-codec-smtp:4.1.70.Final -- io.netty:netty-codec-socks:4.1.70.Final -- io.netty:netty-codec-stomp:4.1.70.Final -- io.netty:netty-codec-xml:4.1.70.Final -- io.netty:netty-common:4.1.70.Final -- io.netty:netty-handler:4.1.70.Final -- io.netty:netty-handler-proxy:4.1.70.Final -- io.netty:netty-resolver:4.1.70.Final -- io.netty:netty-resolver-dns:4.1.70.Final -- io.netty:netty-resolver-dns-classes-macos:4.1.70.Final -- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.70.Final -- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.70.Final -- io.netty:netty-transport:4.1.70.Final -- io.netty:netty-transport-classes-epoll:4.1.70.Final -- io.netty:netty-transport-classes-kqueue:4.1.70.Final -- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.70.Final -- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.70.Final -- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.70.Final -- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.70.Final -- io.netty:netty-transport-native-unix-common:4.1.70.Final -- io.netty:netty-transport-rxtx:4.1.70.Final -- io.netty:netty-transport-sctp:4.1.70.Final -- io.netty:netty-transport-udt:4.1.70.Final \ No newline at end of file +- io.netty:netty-all:4.1.82.Final +- io.netty:netty-buffer:4.1.82.Final +- io.netty:netty-codec:4.1.82.Final +- io.netty:netty-codec-dns:4.1.82.Final +- io.netty:netty-codec-haproxy:4.1.82.Final +- io.netty:netty-codec-http:4.1.82.Final +- io.netty:netty-codec-http2:4.1.82.Final +- io.netty:netty-codec-memcache:4.1.82.Final +- io.netty:netty-codec-mqtt:4.1.82.Final +- io.netty:netty-codec-redis:4.1.82.Final +- io.netty:netty-codec-smtp:4.1.82.Final +- io.netty:netty-codec-socks:4.1.82.Final +- io.netty:netty-codec-stomp:4.1.82.Final +- io.netty:netty-codec-xml:4.1.82.Final +- io.netty:netty-common:4.1.82.Final +- io.netty:netty-handler:4.1.82.Final +- io.netty:netty-handler-proxy:4.1.82.Final +- io.netty:netty-resolver:4.1.82.Final +- io.netty:netty-resolver-dns:4.1.82.Final +- io.netty:netty-resolver-dns-classes-macos:4.1.82.Final +- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.82.Final +- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.82.Final +- io.netty:netty-transport:4.1.82.Final +- io.netty:netty-transport-classes-epoll:4.1.82.Final +- io.netty:netty-transport-classes-kqueue:4.1.82.Final +- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.82.Final +- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.82.Final +- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.82.Final +- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.82.Final +- io.netty:netty-transport-native-unix-common:4.1.82.Final +- io.netty:netty-transport-rxtx:4.1.82.Final +- io.netty:netty-transport-sctp:4.1.82.Final +- io.netty:netty-transport-udt:4.1.82.Final \ No newline at end of file diff --git a/flink-shaded-netty-tcnative-dynamic/pom.xml b/flink-shaded-netty-tcnative-dynamic/pom.xml index 8e416e6..98989d7 100644 --- a/flink-shaded-netty-tcnative-dynamic/pom.xml +++ b/flink-shaded-netty-tcnative-dynamic/pom.xml @@ -34,7 +34,7 @@ under the License. <properties> <!-- This is based on the "tcnative.version" property in the netty root pom--> - <netty.tcnative.version>2.0.44.Final</netty.tcnative.version> + <netty.tcnative.version>2.0.54.Final</netty.tcnative.version> </properties> <dependencies> @@ -64,6 +64,7 @@ under the License. <artifactSet> <includes> <include>io.netty:netty-tcnative</include> + <include>io.netty:netty-tcnative-classes</include> </includes> </artifactSet> <relocations> diff --git a/flink-shaded-netty-tcnative-dynamic/src/main/resources/META-INF/NOTICE b/flink-shaded-netty-tcnative-dynamic/src/main/resources/META-INF/NOTICE index bf35481..4793f7a 100644 --- a/flink-shaded-netty-tcnative-dynamic/src/main/resources/META-INF/NOTICE +++ b/flink-shaded-netty-tcnative-dynamic/src/main/resources/META-INF/NOTICE @@ -6,4 +6,5 @@ The Apache Software Foundation (http://www.apache.org/). This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- io.netty:netty-tcnative:2.0.44.Final +- io.netty:netty-tcnative:2.0.54.Final +- io.netty:netty-tcnative-classes:2.0.54.Final diff --git a/flink-shaded-netty-tcnative-static/pom.xml b/flink-shaded-netty-tcnative-static/pom.xml index d81b0eb..e591b6e 100644 --- a/flink-shaded-netty-tcnative-static/pom.xml +++ b/flink-shaded-netty-tcnative-static/pom.xml @@ -34,7 +34,7 @@ under the License. <properties> <!-- This is based on the "tcnative.version" property in the netty root pom--> - <netty.tcnative.version>2.0.44.Final</netty.tcnative.version> + <netty.tcnative.version>2.0.54.Final</netty.tcnative.version> </properties> <dependencies> diff --git a/flink-shaded-netty-tcnative-static/src/main/resources/META-INF/NOTICE b/flink-shaded-netty-tcnative-static/src/main/resources/META-INF/NOTICE index b8c76aa..5ec09d0 100644 --- a/flink-shaded-netty-tcnative-static/src/main/resources/META-INF/NOTICE +++ b/flink-shaded-netty-tcnative-static/src/main/resources/META-INF/NOTICE @@ -6,7 +6,7 @@ The Apache Software Foundation (http://www.apache.org/). This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- io.netty:netty-tcnative-boringssl-static:2.0.44.Final +- io.netty:netty-tcnative-boringssl-static:2.0.54.Final This project bundles the following dependencies under the OpenSSL license. See bundled license files for details. diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE index 32a223d..097cbec 100644 --- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE +++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE @@ -7,15 +7,15 @@ The Apache Software Foundation (http://www.apache.org/). This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - com.google.guava:guava:27.0.1-jre -- io.netty:netty-buffer:4.1.70.Final -- io.netty:netty-codec:4.1.70.Final -- io.netty:netty-common:4.1.70.Final -- io.netty:netty-handler:4.1.70.Final -- io.netty:netty-resolver:4.1.70.Final -- io.netty:netty-transport:4.1.70.Final -- io.netty:netty-transport-classes-epoll:4.1.70.Final -- io.netty:netty-transport-native-epoll:4.1.70.Final -- io.netty:netty-transport-native-unix-common:4.1.70.Final +- io.netty:netty-buffer:4.1.82.Final +- io.netty:netty-codec:4.1.82.Final +- io.netty:netty-common:4.1.82.Final +- io.netty:netty-handler:4.1.82.Final +- io.netty:netty-resolver:4.1.82.Final +- io.netty:netty-transport:4.1.82.Final +- io.netty:netty-transport-classes-epoll:4.1.82.Final +- io.netty:netty-transport-native-epoll:4.1.82.Final +- io.netty:netty-transport-native-unix-common:4.1.82.Final - org.apache.curator:curator-client:5.3.0 - org.apache.curator:curator-framework:5.3.0 - org.apache.curator:curator-recipes:5.3.0 diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE index 1a87e24..458539a 100644 --- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE +++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE @@ -8,15 +8,15 @@ This project bundles the following dependencies under the Apache Software Licens - com.google.guava:guava:27.0.1-jre - io.dropwizard.metrics:metrics-core:3.2.5 -- io.netty:netty-buffer:4.1.70.Final -- io.netty:netty-codec:4.1.70.Final -- io.netty:netty-common:4.1.70.Final -- io.netty:netty-handler:4.1.70.Final -- io.netty:netty-resolver:4.1.70.Final -- io.netty:netty-transport:4.1.70.Final -- io.netty:netty-transport-classes-epoll:4.1.70.Final -- io.netty:netty-transport-native-epoll:4.1.70.Final -- io.netty:netty-transport-native-unix-common:4.1.70.Final +- io.netty:netty-buffer:4.1.82.Final +- io.netty:netty-codec:4.1.82.Final +- io.netty:netty-common:4.1.82.Final +- io.netty:netty-handler:4.1.82.Final +- io.netty:netty-resolver:4.1.82.Final +- io.netty:netty-transport:4.1.82.Final +- io.netty:netty-transport-classes-epoll:4.1.82.Final +- io.netty:netty-transport-native-epoll:4.1.82.Final +- io.netty:netty-transport-native-unix-common:4.1.82.Final - org.apache.curator:curator-client:5.3.0 - org.apache.curator:curator-framework:5.3.0 - org.apache.curator:curator-recipes:5.3.0 diff --git a/pom.xml b/pom.xml index 5dacfde..8412077 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ under the License. <properties> <shading.prefix>org.apache.flink.shaded</shading.prefix> - <netty.version>4.1.70.Final</netty.version> + <netty.version>4.1.82.Final</netty.version> <jackson.version>2.13.4</jackson.version> <!-- The license check requires the artifactId to match the directory that the module resides in. This is not the case for several modules in flink-shaded for legacy reasons.
