Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 35 additions & 34 deletions flink-shaded-netty-4/src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,38 @@ 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.91.Final
- io.netty:netty-buffer:4.1.91.Final
- io.netty:netty-codec-dns:4.1.91.Final
- io.netty:netty-codec-haproxy:4.1.91.Final
- io.netty:netty-codec-http2:4.1.91.Final
- io.netty:netty-codec-http:4.1.91.Final
- io.netty:netty-codec-memcache:4.1.91.Final
- io.netty:netty-codec-mqtt:4.1.91.Final
- io.netty:netty-codec-redis:4.1.91.Final
- io.netty:netty-codec-smtp:4.1.91.Final
- io.netty:netty-codec-socks:4.1.91.Final
- io.netty:netty-codec-stomp:4.1.91.Final
- io.netty:netty-codec-xml:4.1.91.Final
- io.netty:netty-codec:4.1.91.Final
- io.netty:netty-common:4.1.91.Final
- io.netty:netty-handler-proxy:4.1.91.Final
- io.netty:netty-handler-ssl-ocsp:4.1.91.Final
- io.netty:netty-handler:4.1.91.Final
- io.netty:netty-resolver-dns-classes-macos:4.1.91.Final
- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.91.Final
- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.91.Final
- io.netty:netty-resolver-dns:4.1.91.Final
- io.netty:netty-resolver:4.1.91.Final
- io.netty:netty-transport-classes-epoll:4.1.91.Final
- io.netty:netty-transport-classes-kqueue:4.1.91.Final
- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.91.Final
- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.91.Final
- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.91.Final
- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.91.Final
- io.netty:netty-transport-native-unix-common:4.1.91.Final
- io.netty:netty-transport-rxtx:4.1.91.Final
- io.netty:netty-transport-sctp:4.1.91.Final
- io.netty:netty-transport-udt:4.1.91.Final
- io.netty:netty-transport:4.1.91.Final
- io.netty:netty-all:4.1.128.Final
- io.netty:netty-buffer:4.1.128.Final
- io.netty:netty-codec-dns:4.1.128.Final
- io.netty:netty-codec-haproxy:4.1.128.Final
- io.netty:netty-codec-http2:4.1.128.Final
- io.netty:netty-codec-http:4.1.128.Final
- io.netty:netty-codec-memcache:4.1.128.Final
- io.netty:netty-codec-mqtt:4.1.128.Final
- io.netty:netty-codec-redis:4.1.128.Final
- io.netty:netty-codec-smtp:4.1.128.Final
- io.netty:netty-codec-socks:4.1.128.Final
- io.netty:netty-codec-stomp:4.1.128.Final
- io.netty:netty-codec-xml:4.1.128.Final
- io.netty:netty-codec:4.1.128.Final
- io.netty:netty-common:4.1.128.Final
- io.netty:netty-handler-proxy:4.1.128.Final
- io.netty:netty-handler-ssl-ocsp:4.1.128.Final
- io.netty:netty-handler:4.1.128.Final
- io.netty:netty-resolver-dns-classes-macos:4.1.128.Final
- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.128.Final
- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.128.Final
- io.netty:netty-resolver-dns:4.1.128.Final
- io.netty:netty-resolver:4.1.128.Final
- io.netty:netty-transport-classes-epoll:4.1.128.Final
- io.netty:netty-transport-classes-kqueue:4.1.128.Final
- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.128.Final
- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.128.Final
- io.netty:netty-transport-native-epoll:linux-riscv64:4.1.128.Final
- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.128.Final
- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.128.Final
- io.netty:netty-transport-native-unix-common:4.1.128.Final
- io.netty:netty-transport-rxtx:4.1.128.Final
- io.netty:netty-transport-sctp:4.1.128.Final
- io.netty:netty-transport-udt:4.1.128.Final
- io.netty:netty-transport:4.1.128.Final
6 changes: 3 additions & 3 deletions flink-shaded-netty-tcnative-dynamic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.Final</netty.tcnative.version>
<netty.tcnative.version>2.0.74.Final</netty.tcnative.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -124,7 +124,7 @@ under the License.
<groupId>io.netty</groupId>
<artifactId>netty-tcnative</artifactId>
<version>${netty.tcnative.version}</version>
<classifier>linux-aarch_64-fedora</classifier>
<classifier>osx-aarch_64</classifier>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/native_libs</outputDirectory>
Expand All @@ -148,7 +148,7 @@ under the License.
<!-- Fix the dynamically linked native libraries in netty-tcnative -->
<unzip src="${project.build.directory}/native_libs/netty-tcnative-${netty.tcnative.version}-linux-x86_64.jar" dest="${project.build.directory}/native_libs/unpacked/" />
<unzip src="${project.build.directory}/native_libs/netty-tcnative-${netty.tcnative.version}-osx-x86_64.jar" dest="${project.build.directory}/native_libs/unpacked/" />
<unzip src="${project.build.directory}/native_libs/netty-tcnative-${netty.tcnative.version}-linux-aarch_64-fedora.jar" dest="${project.build.directory}/native_libs/unpacked/" />
<unzip src="${project.build.directory}/native_libs/netty-tcnative-${netty.tcnative.version}-osx-aarch_64.jar" dest="${project.build.directory}/native_libs/unpacked/" />
<move todir="${project.build.directory}/unpacked/META-INF/native" includeemptydirs="false">
<fileset dir="${project.build.directory}/native_libs/unpacked/META-INF/native"/>
<mapper type="glob" from="lib*" to="liborg_apache_flink_shaded_netty4_*"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ 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-classes:2.0.59.Final
- io.netty:netty-tcnative:2.0.59.Final
- io.netty:netty-tcnative:linux-aarch_64-fedora:2.0.59.Final
- io.netty:netty-tcnative:linux-x86_64-fedora:2.0.59.Final
- io.netty:netty-tcnative:linux-x86_64:2.0.59.Final
- io.netty:netty-tcnative:osx-x86_64:2.0.59.Final
- io.netty:netty-tcnative-classes:2.0.74.Final
- io.netty:netty-tcnative:2.0.74.Final
- io.netty:netty-tcnative:linux-x86_64-fedora:2.0.74.Final
- io.netty:netty-tcnative:linux-x86_64:2.0.74.Final
- io.netty:netty-tcnative:osx-x86_64:2.0.74.Final
- io.netty:netty-tcnative:osx-aarch_64:2.0.74.Final
2 changes: 1 addition & 1 deletion flink-shaded-netty-tcnative-static/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.Final</netty.tcnative.version>
<netty.tcnative.version>2.0.74.Final</netty.tcnative.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
flink-shaded-netty-openssl-static
flink-shaded-netty-tcnative-static
Copyright 2014-2021 The Apache Software Foundation

This project includes software developed at
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.59.Final
- io.netty:netty-tcnative-boringssl-static:linux-aarch_64:2.0.59.Final
- io.netty:netty-tcnative-boringssl-static:linux-x86_64:2.0.59.Final
- io.netty:netty-tcnative-boringssl-static:osx-aarch_64:2.0.59.Final
- io.netty:netty-tcnative-boringssl-static:osx-x86_64:2.0.59.Final
- io.netty:netty-tcnative-boringssl-static:windows-x86_64:2.0.59.Final
- io.netty:netty-tcnative-classes:2.0.59.Final
- io.netty:netty-tcnative-boringssl-static:2.0.74.Final
- io.netty:netty-tcnative-boringssl-static:linux-aarch_64:2.0.74.Final
- io.netty:netty-tcnative-boringssl-static:linux-x86_64:2.0.74.Final
- io.netty:netty-tcnative-boringssl-static:osx-aarch_64:2.0.74.Final
- io.netty:netty-tcnative-boringssl-static:osx-x86_64:2.0.74.Final
- io.netty:netty-tcnative-boringssl-static:windows-x86_64:2.0.74.Final
- io.netty:netty-tcnative-classes:2.0.74.Final

This project bundles the following dependencies under the OpenSSL license.
See bundled license files for details.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:31.1-jre
- io.netty:netty-buffer:4.1.91.Final
- io.netty:netty-codec:4.1.91.Final
- io.netty:netty-common:4.1.91.Final
- io.netty:netty-handler:4.1.91.Final
- io.netty:netty-resolver:4.1.91.Final
- io.netty:netty-transport-classes-epoll:4.1.91.Final
- io.netty:netty-transport-native-epoll:4.1.91.Final
- io.netty:netty-transport-native-unix-common:4.1.91.Final
- io.netty:netty-transport:4.1.91.Final
- io.netty:netty-buffer:4.1.128.Final
- io.netty:netty-codec:4.1.128.Final
- io.netty:netty-common:4.1.128.Final
- io.netty:netty-handler:4.1.128.Final
- io.netty:netty-resolver:4.1.128.Final
- io.netty:netty-transport-classes-epoll:4.1.128.Final
- io.netty:netty-transport-native-epoll:4.1.128.Final
- io.netty:netty-transport-native-unix-common:4.1.128.Final
- io.netty:netty-transport:4.1.128.Final
- org.apache.curator:curator-client:5.4.0
- org.apache.curator:curator-framework:5.4.0
- org.apache.curator:curator-recipes:5.4.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ This project bundles the following dependencies under the Apache Software Licens

- com.google.guava:guava:31.1-jre
- io.dropwizard.metrics:metrics-core:3.2.5
- io.netty:netty-buffer:4.1.91.Final
- io.netty:netty-codec:4.1.91.Final
- io.netty:netty-common:4.1.91.Final
- io.netty:netty-handler:4.1.91.Final
- io.netty:netty-resolver:4.1.91.Final
- io.netty:netty-transport-classes-epoll:4.1.91.Final
- io.netty:netty-transport-native-epoll:4.1.91.Final
- io.netty:netty-transport-native-unix-common:4.1.91.Final
- io.netty:netty-transport:4.1.91.Final
- io.netty:netty-buffer:4.1.128.Final
- io.netty:netty-codec:4.1.128.Final
- io.netty:netty-common:4.1.128.Final
- io.netty:netty-handler:4.1.128.Final
- io.netty:netty-resolver:4.1.128.Final
- io.netty:netty-transport-classes-epoll:4.1.128.Final
- io.netty:netty-transport-native-epoll:4.1.128.Final
- io.netty:netty-transport-native-unix-common:4.1.128.Final
- io.netty:netty-transport:4.1.128.Final
- org.apache.curator:curator-client:5.4.0
- org.apache.curator:curator-framework:5.4.0
- org.apache.curator:curator-recipes:5.4.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ This project bundles the following dependencies under the Apache Software Licens

- com.google.guava:guava:31.1-jre
- io.dropwizard.metrics:metrics-core:4.1.12.1
- io.netty:netty-buffer:4.1.91.Final
- io.netty:netty-codec:4.1.91.Final
- io.netty:netty-common:4.1.91.Final
- io.netty:netty-handler:4.1.91.Final
- io.netty:netty-resolver:4.1.91.Final
- io.netty:netty-transport-classes-epoll:4.1.91.Final
- io.netty:netty-transport-native-epoll:4.1.91.Final
- io.netty:netty-transport-native-unix-common:4.1.91.Final
- io.netty:netty-transport:4.1.91.Final
- io.netty:netty-buffer:4.1.128.Final
- io.netty:netty-codec:4.1.128.Final
- io.netty:netty-common:4.1.128.Final
- io.netty:netty-handler:4.1.128.Final
- io.netty:netty-resolver:4.1.128.Final
- io.netty:netty-transport-classes-epoll:4.1.128.Final
- io.netty:netty-transport-native-epoll:4.1.128.Final
- io.netty:netty-transport-native-unix-common:4.1.128.Final
- io.netty:netty-transport:4.1.128.Final
- org.apache.curator:curator-client:5.4.0
- org.apache.curator:curator-framework:5.4.0
- org.apache.curator:curator-recipes:5.4.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ This project bundles the following dependencies under the Apache Software Licens
- com.google.guava:guava:31.1-jre
- commons-io:commons-io:2.11.0
- io.dropwizard.metrics:metrics-core:4.1.12.1
- io.netty:netty-buffer:4.1.91.Final
- io.netty:netty-codec:4.1.91.Final
- io.netty:netty-common:4.1.91.Final
- io.netty:netty-handler:4.1.91.Final
- io.netty:netty-resolver:4.1.91.Final
- io.netty:netty-transport-classes-epoll:4.1.91.Final
- io.netty:netty-transport-native-epoll:4.1.91.Final
- io.netty:netty-transport-native-unix-common:4.1.91.Final
- io.netty:netty-transport:4.1.91.Final
- io.netty:netty-buffer:4.1.128.Final
- io.netty:netty-codec:4.1.128.Final
- io.netty:netty-common:4.1.128.Final
- io.netty:netty-handler:4.1.128.Final
- io.netty:netty-resolver:4.1.128.Final
- io.netty:netty-transport-classes-epoll:4.1.128.Final
- io.netty:netty-transport-native-epoll:4.1.128.Final
- io.netty:netty-transport-native-unix-common:4.1.128.Final
- io.netty:netty-transport:4.1.128.Final
- org.apache.curator:curator-client:5.4.0
- org.apache.curator:curator-framework:5.4.0
- org.apache.curator:curator-recipes:5.4.0
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ under the License.

<properties>
<shading.prefix>org.apache.flink.shaded</shading.prefix>
<netty.version>4.1.91.Final</netty.version>
<netty.version>4.1.128.Final</netty.version>
<jackson.version>2.14.2</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.
Expand Down