[FLINK-38320] Upgrade Netty version to 4.2.4.Final (#150)
* [FLINK-38320] Upgrade Netty version to 4.2.4.Final
* [FLINK-38320] Fix updated NOTICE file
* [FLINK-38320] Update Netty to 4.2.6.Final
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index c02e9e5..a63a967 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -70,11 +70,35 @@
</includes>
</artifactSet>
<relocations>
+ <!-- Netty JARs contain a directory called license that conflicts with the LICENSE file
+ on case-insensitive filesystems. -->
+ <relocation>
+ <pattern>META-INF/license</pattern>
+ <shadedPattern>META-INF/licenses</shadedPattern>
+ </relocation>
<relocation>
<pattern>io.netty</pattern>
<shadedPattern>${shading.prefix}.netty4.io.netty</shadedPattern>
</relocation>
</relocations>
+ <filters>
+ <filter>
+ <artifact>io.netty:*</artifact>
+ <excludes>
+ <!-- The contents of the original Netty NOTICE.txt file was manually copied to
+ this module's NOTICE file after updating references to BoringSSL and
+ updating license paths. -->
+ <exclude>META-INF/NOTICE.txt</exclude>
+ <!-- Netty forgot to update BoringSSL license to Apache 2.0, instead it
+ includes a BSD-like license, which is not right for the version of
+ BoringSSL used. See https://github.com/netty/netty/issues/15653 for more
+ details. -->
+ <exclude>META-INF/license/LICENSE.boringssl.txt</exclude>
+ <!-- This is the same Apache 2.0 license as Flink has. -->
+ <exclude>META-INF/LICENSE.txt</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
</executions>
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 35a1211..be51a36 100644
--- a/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE
@@ -6,37 +6,330 @@
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.100.Final
-- io.netty:netty-buffer:4.1.100.Final
-- io.netty:netty-codec-dns:4.1.100.Final
-- io.netty:netty-codec-haproxy:4.1.100.Final
-- io.netty:netty-codec-http2:4.1.100.Final
-- io.netty:netty-codec-http:4.1.100.Final
-- io.netty:netty-codec-memcache:4.1.100.Final
-- io.netty:netty-codec-mqtt:4.1.100.Final
-- io.netty:netty-codec-redis:4.1.100.Final
-- io.netty:netty-codec-smtp:4.1.100.Final
-- io.netty:netty-codec-socks:4.1.100.Final
-- io.netty:netty-codec-stomp:4.1.100.Final
-- io.netty:netty-codec-xml:4.1.100.Final
-- io.netty:netty-codec:4.1.100.Final
-- io.netty:netty-common:4.1.100.Final
-- io.netty:netty-handler-proxy:4.1.100.Final
-- io.netty:netty-handler-ssl-ocsp:4.1.100.Final
-- io.netty:netty-handler:4.1.100.Final
-- io.netty:netty-resolver-dns-classes-macos:4.1.100.Final
-- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.100.Final
-- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.100.Final
-- io.netty:netty-resolver-dns:4.1.100.Final
-- io.netty:netty-resolver:4.1.100.Final
-- io.netty:netty-transport-classes-epoll:4.1.100.Final
-- io.netty:netty-transport-classes-kqueue:4.1.100.Final
-- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.100.Final
-- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.100.Final
-- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.100.Final
-- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.100.Final
-- io.netty:netty-transport-native-unix-common:4.1.100.Final
-- io.netty:netty-transport-rxtx:4.1.100.Final
-- io.netty:netty-transport-sctp:4.1.100.Final
-- io.netty:netty-transport-udt:4.1.100.Final
-- io.netty:netty-transport:4.1.100.Final
\ No newline at end of file
+- io.netty:netty-all:4.2.6.Final
+- io.netty:netty-buffer:4.2.6.Final
+- io.netty:netty-codec-base:4.2.6.Final
+- io.netty:netty-codec-compression:4.2.6.Final
+- io.netty:netty-codec-classes-quic:4.2.6.Final
+- io.netty:netty-codec-dns:4.2.6.Final
+- io.netty:netty-codec-haproxy:4.2.6.Final
+- io.netty:netty-codec-http3:4.2.6.Final
+- io.netty:netty-codec-http2:4.2.6.Final
+- io.netty:netty-codec-http:4.2.6.Final
+- io.netty:netty-codec-marshalling:4.2.6.Final
+- io.netty:netty-codec-memcache:4.2.6.Final
+- io.netty:netty-codec-mqtt:4.2.6.Final
+- io.netty:netty-codec-native-quic:linux-x86_64:4.2.6.Final
+- io.netty:netty-codec-native-quic:linux-aarch_64:4.2.6.Final
+- io.netty:netty-codec-native-quic:osx-x86_64:4.2.6.Final
+- io.netty:netty-codec-native-quic:osx-aarch_64:4.2.6.Final
+- io.netty:netty-codec-native-quic:windows-x86_64:4.2.6.Final
+- io.netty:netty-codec-redis:4.2.6.Final
+- io.netty:netty-codec-protobuf:4.2.6.Final
+- io.netty:netty-codec-smtp:4.2.6.Final
+- io.netty:netty-codec-socks:4.2.6.Final
+- io.netty:netty-codec-stomp:4.2.6.Final
+- io.netty:netty-codec-xml:4.2.6.Final
+- io.netty:netty-codec:4.2.6.Final
+- io.netty:netty-common:4.2.6.Final
+- io.netty:netty-handler-proxy:4.2.6.Final
+- io.netty:netty-handler-ssl-ocsp:4.2.6.Final
+- io.netty:netty-handler:4.2.6.Final
+- io.netty:netty-resolver-dns-classes-macos:4.2.6.Final
+- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.2.6.Final
+- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.2.6.Final
+- io.netty:netty-resolver-dns:4.2.6.Final
+- io.netty:netty-resolver:4.2.6.Final
+- io.netty:netty-transport-classes-epoll:4.2.6.Final
+- io.netty:netty-transport-classes-io_uring:4.2.6.Final
+- io.netty:netty-transport-classes-kqueue:4.2.6.Final
+- io.netty:netty-transport-native-epoll:linux-aarch_64:4.2.6.Final
+- io.netty:netty-transport-native-epoll:linux-x86_64:4.2.6.Final
+- io.netty:netty-transport-native-epoll:linux-riscv64:4.2.6.Final
+- io.netty:netty-transport-native-io_uring:linux-x86_64:4.2.6.Final
+- io.netty:netty-transport-native-io_uring:linux-aarch_64:4.2.6.Final
+- io.netty:netty-transport-native-io_uring:linux-riscv64:4.2.6.Final
+- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.2.6.Final
+- io.netty:netty-transport-native-kqueue:osx-x86_64:4.2.6.Final
+- io.netty:netty-transport-native-unix-common:4.2.6.Final
+- io.netty:netty-transport-rxtx:4.2.6.Final
+- io.netty:netty-transport-sctp:4.2.6.Final
+- io.netty:netty-transport-udt:4.2.6.Final
+- io.netty:netty-transport:4.2.6.Final
+
+ The Netty Project
+ =================
+
+Please visit the Netty web site for more information:
+
+ * https://netty.io/
+
+Copyright 2014 The Netty Project
+
+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:
+
+ 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
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+
+Also, please refer to each LICENSE.<component>.txt file, which is located in
+the 'licenses' directory of the distribution file, for the license terms of the
+components that this product depends on.
+
+-------------------------------------------------------------------------------
+This product contains the extensions to Java Collections Framework which has
+been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
+
+ * LICENSE:
+ * licenses/LICENSE.jsr166y.txt (Public Domain)
+ * HOMEPAGE:
+ * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
+ * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
+
+This product contains a modified version of Robert Harder's Public Domain
+Base64 Encoder and Decoder, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.base64.txt (Public Domain)
+ * HOMEPAGE:
+ * http://iharder.sourceforge.net/current/java/base64/
+
+This product contains a modified portion of 'Webbit', an event based
+WebSocket and HTTP server, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.webbit.txt (BSD License)
+ * HOMEPAGE:
+ * https://github.com/joewalnes/webbit
+
+This product contains a modified portion of 'SLF4J', a simple logging
+facade for Java, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.slf4j.txt (MIT License)
+ * HOMEPAGE:
+ * https://www.slf4j.org/
+
+This product contains a modified portion of 'Apache Harmony', an open source
+Java SE, which can be obtained at:
+
+ * NOTICE:
+ * licenses/NOTICE.harmony.txt
+ * LICENSE:
+ * licenses/LICENSE.harmony.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * 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:
+
+ * LICENSE:
+ * licenses/LICENSE.jbzip2.txt (MIT License)
+ * HOMEPAGE:
+ * https://code.google.com/p/jbzip2/
+
+This product contains a modified portion of 'libdivsufsort', a C API library to construct
+the suffix array and the Burrows-Wheeler transformed string for any input string of
+a constant-size alphabet written by Yuta Mori. It can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.libdivsufsort.txt (MIT License)
+ * HOMEPAGE:
+ * https://github.com/y-256/libdivsufsort
+
+This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
+ which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.jctools.txt (ASL2 License)
+ * HOMEPAGE:
+ * https://github.com/JCTools/JCTools
+
+This product optionally depends on 'JZlib', a re-implementation of zlib in
+pure Java, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.jzlib.txt (BSD style License)
+ * HOMEPAGE:
+ * http://www.jcraft.com/jzlib/
+
+This product optionally depends on 'Compress-LZF', a Java library for encoding and
+decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.compress-lzf.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://github.com/ning/compress
+
+This product optionally depends on 'lz4', a LZ4 Java compression
+and decompression library written by Adrien Grand. It can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.lz4.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://github.com/jpountz/lz4-java
+
+This product optionally depends on 'lzma-java', a LZMA Java compression
+and decompression library, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.lzma-java.txt (Apache License 2.0)
+ * 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:
+ * licenses/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:
+
+ * LICENSE:
+ * licenses/LICENSE.jfastlz.txt (MIT License)
+ * HOMEPAGE:
+ * https://code.google.com/p/jfastlz/
+
+This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data
+interchange format, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.protobuf.txt (New BSD License)
+ * HOMEPAGE:
+ * https://github.com/google/protobuf
+
+This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
+a temporary self-signed X.509 certificate when the JVM does not provide the
+equivalent functionality. It can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.bouncycastle.txt (MIT License)
+ * HOMEPAGE:
+ * https://www.bouncycastle.org/
+
+This product optionally depends on 'Snappy', a compression library produced
+by Google Inc, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.snappy.txt (New BSD License)
+ * HOMEPAGE:
+ * https://github.com/google/snappy
+
+This product optionally depends on 'JBoss Marshalling', an alternative Java
+serialization API, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.jboss-marshalling.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://github.com/jboss-remoting/jboss-marshalling
+
+This product optionally depends on 'Caliper', Google's micro-
+benchmarking framework, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.caliper.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://github.com/google/caliper
+
+This product optionally depends on 'Apache Commons Logging', a logging
+framework, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.commons-logging.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://commons.apache.org/logging/
+
+This product optionally depends on 'Apache Log4J', a logging framework, which
+can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE.log4j.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * 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:
+
+ * LICENSE:
+ * licenses/LICENSE.aalto-xml.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * 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:
+
+ * LICENSE:
+ * licenses/LICENSE.hpack.txt (Apache License 2.0)
+ * 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:
+ * licenses/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:
+ * licenses/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:
+
+ * LICENSE:
+ * licenses/LICENSE.commons-lang.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://commons.apache.org/proper/commons-lang/
+
+This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
+
+ * LICENSE:
+ * licenses/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:
+ * licenses/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:
+ * licenses/LICENSE.brotli4j.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://github.com/hyperxpro/Brotli4j
+
+This product is statically linked against Quiche.
+
+ * LICENSE:
+ * licenses/LICENSE.quiche.txt (BSD2)
+ * HOMEPAGE:
+ * https://github.com/cloudflare/quiche
+
+This product is statically linked against boringssl.
+
+ * LICENSE
+ * licenses/LICENSE.boringssl.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://boringssl.googlesource.com/boringssl/
diff --git a/flink-shaded-netty-4/src/main/resources/META-INF/licenses/LICENSE.boringssl.txt b/flink-shaded-netty-4/src/main/resources/META-INF/licenses/LICENSE.boringssl.txt
new file mode 100644
index 0000000..37a5b74
--- /dev/null
+++ b/flink-shaded-netty-4/src/main/resources/META-INF/licenses/LICENSE.boringssl.txt
@@ -0,0 +1,238 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+Licenses for support code
+-------------------------
+
+Parts of the TLS test suite are under the Go license. This code is not included
+in BoringSSL (i.e. libcrypto and libssl) when compiled, however, so
+distributing code linked against BoringSSL does not trigger this license:
+
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/flink-shaded-netty-tcnative-dynamic/pom.xml b/flink-shaded-netty-tcnative-dynamic/pom.xml
index 370d8a8..0413e20 100644
--- a/flink-shaded-netty-tcnative-dynamic/pom.xml
+++ b/flink-shaded-netty-tcnative-dynamic/pom.xml
@@ -34,7 +34,7 @@
<properties>
<!-- This is based on the "tcnative.version" property in the netty root pom-->
- <netty.tcnative.version>2.0.62.Final</netty.tcnative.version>
+ <netty.tcnative.version>2.0.74.Final</netty.tcnative.version>
</properties>
<dependencies>
@@ -124,7 +124,7 @@
<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>
@@ -148,7 +148,7 @@
<!-- 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_*"/>
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 e14fe15..81ca16e 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
@@ -1,4 +1,4 @@
-flink-shaded-netty-openssl-static
+flink-shaded-netty-tcnative-dynamic
Copyright 2014-2023 The Apache Software Foundation
This project includes software developed at
@@ -6,9 +6,9 @@
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.62.Final
-- io.netty:netty-tcnative:2.0.62.Final
-- io.netty:netty-tcnative:linux-aarch_64-fedora:2.0.62.Final
-- io.netty:netty-tcnative:linux-x86_64-fedora:2.0.62.Final
-- io.netty:netty-tcnative:linux-x86_64:2.0.62.Final
-- io.netty:netty-tcnative:osx-x86_64:2.0.62.Final
\ No newline at end of file
+- 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
diff --git a/flink-shaded-netty-tcnative-static/pom.xml b/flink-shaded-netty-tcnative-static/pom.xml
index d9671ac..0926003 100644
--- a/flink-shaded-netty-tcnative-static/pom.xml
+++ b/flink-shaded-netty-tcnative-static/pom.xml
@@ -34,7 +34,7 @@
<properties>
<!-- This is based on the "tcnative.version" property in the netty root pom-->
- <netty.tcnative.version>2.0.62.Final</netty.tcnative.version>
+ <netty.tcnative.version>2.0.74.Final</netty.tcnative.version>
</properties>
<dependencies>
@@ -68,11 +68,39 @@
</includes>
</artifactSet>
<relocations>
+ <!-- Netty JARs contain a directory called license that conflicts with the LICENSE file
+ on case-insensitive filesystems. -->
+ <relocation>
+ <pattern>META-INF/license</pattern>
+ <shadedPattern>META-INF/licenses</shadedPattern>
+ </relocation>
<relocation>
<pattern>io.netty</pattern>
<shadedPattern>${shading.prefix}.netty4.io.netty</shadedPattern>
</relocation>
</relocations>
+ <filters>
+ <filter>
+ <artifact>io.netty:*</artifact>
+ <excludes>
+ <!-- The contents of the original Netty NOTICE.txt file was manually copied to
+ this module's NOTICE file after updating references to BoringSSL and
+ updating license paths. NetBSD license was also removed. -->
+ <exclude>META-INF/NOTICE.txt</exclude>
+ <!-- Netty forgot to update BoringSSL license to Apache 2.0, instead it
+ includes a BSD-like license, which is not right for the version of
+ BoringSSL used. See https://github.com/netty/netty/issues/15653 for more
+ details. -->
+ <exclude>META-INF/license/LICENSE.boringssl.txt</exclude>
+ <!-- There are a few lines of code Netty took from NetBSD, but they are not part
+ of the normal release, so it's safe to exclude this license.
+ See https://github.com/netty/netty-jni-util/issues/20 for more details. -->
+ <exclude>META-INF/license/LICENSE.aix-netbsd.txt</exclude>
+ <!-- This is the same Apache 2.0 license as Flink has. -->
+ <exclude>META-INF/LICENSE.txt</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
</executions>
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 07b0e30..76c7924 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
@@ -1,4 +1,4 @@
-flink-shaded-netty-openssl-static
+flink-shaded-netty-tcnative-static
Copyright 2014-2023 The Apache Software Foundation
This project includes software developed at
@@ -6,15 +6,54 @@
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.62.Final
-- io.netty:netty-tcnative-boringssl-static:linux-aarch_64:2.0.62.Final
-- io.netty:netty-tcnative-boringssl-static:linux-x86_64:2.0.62.Final
-- io.netty:netty-tcnative-boringssl-static:osx-aarch_64:2.0.62.Final
-- io.netty:netty-tcnative-boringssl-static:osx-x86_64:2.0.62.Final
-- io.netty:netty-tcnative-boringssl-static:windows-x86_64:2.0.62.Final
-- io.netty:netty-tcnative-classes:2.0.62.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.
+ The Netty Project
+ =================
-- BoringSSL (statically linked native libraries)
+Please visit the Netty web site for more information:
+
+ * http://netty.io/
+
+Copyright 2016 The Netty Project
+
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+
+-------------------------------------------------------------------------------
+This product contains a forked and modified version of Tomcat Native
+
+ * LICENSE:
+ * licenses/LICENSE.tomcat-native.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * http://tomcat.apache.org/native-doc/
+ * https://svn.apache.org/repos/asf/tomcat/native/
+
+This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
+
+ * LICENSE:
+ * licenses/LICENSE.mvn-wrapper.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://github.com/takari/maven-wrapper
+
+This product contains code from boringssl.
+
+ * LICENSE
+ * licenses/LICENSE.boringssl.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://boringssl.googlesource.com/boringssl/
diff --git a/flink-shaded-netty-tcnative-static/src/main/resources/META-INF/licenses/LICENSE.boringssl.txt b/flink-shaded-netty-tcnative-static/src/main/resources/META-INF/licenses/LICENSE.boringssl.txt
new file mode 100644
index 0000000..37a5b74
--- /dev/null
+++ b/flink-shaded-netty-tcnative-static/src/main/resources/META-INF/licenses/LICENSE.boringssl.txt
@@ -0,0 +1,238 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+Licenses for support code
+-------------------------
+
+Parts of the TLS test suite are under the Go license. This code is not included
+in BoringSSL (i.e. libcrypto and libssl) when compiled, however, so
+distributing code linked against BoringSSL does not trigger this license:
+
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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 96bdff5..fc05ca1 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 @@
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:33.4.0-jre
-- io.netty:netty-buffer:4.1.100.Final
-- io.netty:netty-codec:4.1.100.Final
-- io.netty:netty-common:4.1.100.Final
-- io.netty:netty-handler:4.1.100.Final
-- io.netty:netty-resolver:4.1.100.Final
-- io.netty:netty-transport-classes-epoll:4.1.100.Final
-- io.netty:netty-transport-native-epoll:4.1.100.Final
-- io.netty:netty-transport-native-unix-common:4.1.100.Final
-- io.netty:netty-transport:4.1.100.Final
+- io.netty:netty-buffer:4.2.6.Final
+- io.netty:netty-codec-base:4.2.6.Final
+- io.netty:netty-common:4.2.6.Final
+- io.netty:netty-handler:4.2.6.Final
+- io.netty:netty-resolver:4.2.6.Final
+- io.netty:netty-transport-classes-epoll:4.2.6.Final
+- io.netty:netty-transport-native-epoll:4.2.6.Final
+- io.netty:netty-transport-native-unix-common:4.2.6.Final
+- io.netty:netty-transport:4.2.6.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
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 8592c90..391e23d 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 @@
- com.google.guava:guava:33.4.0-jre
- io.dropwizard.metrics:metrics-core:3.2.5
-- io.netty:netty-buffer:4.1.100.Final
-- io.netty:netty-codec:4.1.100.Final
-- io.netty:netty-common:4.1.100.Final
-- io.netty:netty-handler:4.1.100.Final
-- io.netty:netty-resolver:4.1.100.Final
-- io.netty:netty-transport-classes-epoll:4.1.100.Final
-- io.netty:netty-transport-native-epoll:4.1.100.Final
-- io.netty:netty-transport-native-unix-common:4.1.100.Final
-- io.netty:netty-transport:4.1.100.Final
+- io.netty:netty-buffer:4.2.6.Final
+- io.netty:netty-codec-base:4.2.6.Final
+- io.netty:netty-common:4.2.6.Final
+- io.netty:netty-handler:4.2.6.Final
+- io.netty:netty-resolver:4.2.6.Final
+- io.netty:netty-transport-classes-epoll:4.2.6.Final
+- io.netty:netty-transport-native-epoll:4.2.6.Final
+- io.netty:netty-transport-native-unix-common:4.2.6.Final
+- io.netty:netty-transport:4.2.6.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
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE
index da066eb..9474561 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE
@@ -8,15 +8,15 @@
- com.google.guava:guava:33.4.0-jre
- io.dropwizard.metrics:metrics-core:4.1.12.1
-- io.netty:netty-buffer:4.1.100.Final
-- io.netty:netty-codec:4.1.100.Final
-- io.netty:netty-common:4.1.100.Final
-- io.netty:netty-handler:4.1.100.Final
-- io.netty:netty-resolver:4.1.100.Final
-- io.netty:netty-transport-classes-epoll:4.1.100.Final
-- io.netty:netty-transport-native-epoll:4.1.100.Final
-- io.netty:netty-transport-native-unix-common:4.1.100.Final
-- io.netty:netty-transport:4.1.100.Final
+- io.netty:netty-buffer:4.2.6.Final
+- io.netty:netty-codec-base:4.2.6.Final
+- io.netty:netty-common:4.2.6.Final
+- io.netty:netty-handler:4.2.6.Final
+- io.netty:netty-resolver:4.2.6.Final
+- io.netty:netty-transport-classes-epoll:4.2.6.Final
+- io.netty:netty-transport-native-epoll:4.2.6.Final
+- io.netty:netty-transport-native-unix-common:4.2.6.Final
+- io.netty:netty-transport:4.2.6.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
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE
index 6170415..99a3f7d 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE
@@ -9,15 +9,15 @@
- com.google.guava:guava:33.4.0-jre
- commons-io:commons-io:2.11.0
- io.dropwizard.metrics:metrics-core:4.1.12.1
-- io.netty:netty-buffer:4.1.100.Final
-- io.netty:netty-codec:4.1.100.Final
-- io.netty:netty-common:4.1.100.Final
-- io.netty:netty-handler:4.1.100.Final
-- io.netty:netty-resolver:4.1.100.Final
-- io.netty:netty-transport-classes-epoll:4.1.100.Final
-- io.netty:netty-transport-native-epoll:4.1.100.Final
-- io.netty:netty-transport-native-unix-common:4.1.100.Final
-- io.netty:netty-transport:4.1.100.Final
+- io.netty:netty-buffer:4.2.6.Final
+- io.netty:netty-codec-base:4.2.6.Final
+- io.netty:netty-common:4.2.6.Final
+- io.netty:netty-handler:4.2.6.Final
+- io.netty:netty-resolver:4.2.6.Final
+- io.netty:netty-transport-classes-epoll:4.2.6.Final
+- io.netty:netty-transport-native-epoll:4.2.6.Final
+- io.netty:netty-transport-native-unix-common:4.2.6.Final
+- io.netty:netty-transport:4.2.6.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
diff --git a/pom.xml b/pom.xml
index ccfec4d..bae1117 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<properties>
<shading.prefix>org.apache.flink.shaded</shading.prefix>
- <netty.version>4.1.100.Final</netty.version>
+ <netty.version>4.2.6.Final</netty.version>
<jackson.version>2.18.2</jackson.version>
<jsonpath.version>2.9.0</jsonpath.version>
<guava.version>33.4.0-jre</guava.version>
@@ -79,6 +79,7 @@
<module>flink-shaded-guava-33</module>
<module>flink-shaded-netty-4</module>
<module>flink-shaded-netty-tcnative-dynamic</module>
+ <module>flink-shaded-netty-tcnative-static</module>
<module>flink-shaded-jackson-parent</module>
<module>flink-shaded-zookeeper-parent</module>
<module>flink-shaded-swagger</module>
