This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
commit efbd1b46291c45da6f8c7eb281f42dd6fbcc3544
Author: Martijn Visser <mvis...@confluent.io>
AuthorDate: Mon Mar 27 16:13:54 2023 +0200
[hotfix] Sort dependencies in NOTICE files
---
.../src/main/resources/META-INF/NOTICE | 4 ++--
.../src/main/resources/META-INF/NOTICE | 20 ++++++++++----------
.../src/main/resources/META-INF/NOTICE | 6 +++---
.../src/main/resources/META-INF/NOTICE | 4 ++--
.../src/main/resources/META-INF/NOTICE | 4 ++--
.../src/main/resources/META-INF/NOTICE | 4 ++--
.../src/main/resources/META-INF/NOTICE | 6 +++---
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/flink-shaded-asm-9/src/main/resources/META-INF/NOTICE
b/flink-shaded-asm-9/src/main/resources/META-INF/NOTICE
index 6d2f23f..1479a23 100644
--- a/flink-shaded-asm-9/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-asm-9/src/main/resources/META-INF/NOTICE
@@ -7,7 +7,7 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the BSD license.
See bundled license files for details.
-- org.ow2.asm:asm:9.3
- org.ow2.asm:asm-analysis:9.3
- org.ow2.asm:asm-commons:9.3
-- org.ow2.asm:asm-tree:9.3
\ No newline at end of file
+- org.ow2.asm:asm-tree:9.3
+- org.ow2.asm:asm:9.3
\ No newline at end of file
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 cc89ec0..8ae9206 100644
--- a/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE
@@ -8,11 +8,10 @@ This project bundles the following dependencies under the
Apache Software Licens
- 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-http: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
@@ -20,22 +19,23 @@ This project bundles the following dependencies under the
Apache Software Licens
- 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-codec: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-handler: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-resolver-dns-native-macos:osx-x86_64:4.1.82.Final
+- io.netty:netty-resolver-dns:4.1.82.Final
+- io.netty:netty-resolver: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-epoll:linux-x86_64:4.1.82.Final
- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.82.Final
+- io.netty:netty-transport-native-kqueue:osx-x86_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
+- io.netty:netty-transport-udt:4.1.82.Final
+- io.netty:netty-transport:4.1.82.Final
\ No newline at end of file
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 c5a8992..8a5bc39 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,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.54.Final
- io.netty:netty-tcnative:2.0.54.Final
- io.netty:netty-tcnative:linux-aarch_64-fedora:2.0.54.Final
-- io.netty:netty-tcnative:linux-x86_64:2.0.54.Final
- io.netty:netty-tcnative:linux-x86_64-fedora:2.0.54.Final
-- io.netty:netty-tcnative:osx-x86_64:2.0.54.Final
-- io.netty:netty-tcnative-classes:2.0.54.Final
\ No newline at end of file
+- io.netty:netty-tcnative:linux-x86_64:2.0.54.Final
+- io.netty:netty-tcnative:osx-x86_64:2.0.54.Final
\ No newline at end of file
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 097cbec..6496c86 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
@@ -12,12 +12,12 @@ This project bundles the following dependencies under the
Apache Software Licens
- 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
+- io.netty:netty-transport: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
-- org.apache.zookeeper:zookeeper:3.5.10
- org.apache.zookeeper:zookeeper-jute:3.5.10
+- org.apache.zookeeper:zookeeper:3.5.10
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 458539a..ed37f3f 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
@@ -13,12 +13,12 @@ This project bundles the following dependencies under the
Apache Software Licens
- 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
+- io.netty:netty-transport: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
-- org.apache.zookeeper:zookeeper:3.6.3
- org.apache.zookeeper:zookeeper-jute:3.6.3
+- org.apache.zookeeper:zookeeper:3.6.3
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 8908c6f..354e875 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
@@ -13,12 +13,12 @@ This project bundles the following dependencies under the
Apache Software Licens
- 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
+- io.netty:netty-transport: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
-- org.apache.zookeeper:zookeeper:3.7.1
- org.apache.zookeeper:zookeeper-jute:3.7.1
+- org.apache.zookeeper:zookeeper:3.7.1
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 3747c09..7ab4148 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
@@ -14,14 +14,14 @@ This project bundles the following dependencies under the
Apache Software Licens
- 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-tcnative:2.0.48.Final
- io.netty:netty-tcnative-classes:2.0.54.Final
-- io.netty:netty-transport:4.1.82.Final
+- io.netty:netty-tcnative:2.0.48.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
+- io.netty:netty-transport: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
-- org.apache.zookeeper:zookeeper:3.8.0
- org.apache.zookeeper:zookeeper-jute:3.8.0
+- org.apache.zookeeper:zookeeper:3.8.0
