You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2023/03/30 18:13:04 UTC
[flink-shaded] branch master updated (ba56570 -> 0bb56dc)
This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
from ba56570 [FLINK-30232][Build/Shaded] Include all (including previously missing ARM64) platforms while shading Netty Tcnative Dynamic
new efbd1b4 [hotfix] Sort dependencies in NOTICE files
new d00429a [FLINK-30772][Build/Shaded] Update Netty to 4.1.90.Final
new b09266f [FLINK-30772][Build/Shaded] Update Jackson to 2.14.2
new b5c59db [FLINK-30772][Build/Shaded] Update Netty TCNative to 2.0.59.Final
new 9b1265f [FLINK-30772][Build/Shaded] Update Swagger to 2.2.8
new 14142c3 [FLINK-30772][Build/Shaded] Update Zookeeper 3.6 to 3.6.4
new 1da20d4 [FLINK-30772][Build/Shaded] Update Snakeyaml to 2.0
new 2822733 [FLINK-30772][Build/Shaded] Update Guava to 31.1-jre
new d68885c [FLINK-30772][Build/Shaded] Update Zookeeper 3.8 to 3.8.1
new c567aa7 [FLINK-30772][Build/Shaded] Update Curator to 5.4.0
new b7ac6ad [FLINK-30772][Build/Shaded] Update ASM to 9.5
new c37343c [FLINK-30772][Build/Shaded] Rename Guava module from flink-shaded-guava-30 to flink-shaded-guava-31
new 0bb56dc [hotfix] Fix incorrect shaded name for Libnetty library
The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
flink-shaded-asm-9/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 8 +--
.../pom.xml | 8 +--
.../src/main/resources/META-INF/NOTICE | 2 +-
.../flink-shaded-jackson-2/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 16 +++---
.../pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 8 +--
flink-shaded-jackson-parent/pom.xml | 2 +-
flink-shaded-netty-4/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 67 +++++++++++-----------
flink-shaded-netty-tcnative-dynamic/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 12 ++--
flink-shaded-netty-tcnative-static/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 14 ++---
flink-shaded-swagger/pom.xml | 4 +-
.../src/main/resources/META-INF/NOTICE | 12 ++--
.../flink-shaded-zookeeper-35/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 28 ++++-----
.../flink-shaded-zookeeper-36/pom.xml | 4 +-
.../src/main/resources/META-INF/NOTICE | 30 +++++-----
.../flink-shaded-zookeeper-37/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 28 ++++-----
.../flink-shaded-zookeeper-38/pom.xml | 4 +-
.../src/main/resources/META-INF/NOTICE | 32 +++++------
pom.xml | 6 +-
26 files changed, 150 insertions(+), 151 deletions(-)
rename {flink-shaded-guava-30 => flink-shaded-guava-31}/pom.xml (95%)
rename {flink-shaded-guava-30 => flink-shaded-guava-31}/src/main/resources/META-INF/NOTICE (80%)
[flink-shaded] 02/13: [FLINK-30772][Build/Shaded] Update Netty to 4.1.90.Final
Posted by ma...@apache.org.
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 d00429a35fdd5b781bcf26d99f2c7cf8ff80f8f7
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Mon Mar 27 16:15:16 2023 +0200
[FLINK-30772][Build/Shaded] Update Netty to 4.1.90.Final
---
.../src/main/resources/META-INF/NOTICE | 67 +++++++++++-----------
.../src/main/resources/META-INF/NOTICE | 18 +++---
.../src/main/resources/META-INF/NOTICE | 18 +++---
.../src/main/resources/META-INF/NOTICE | 18 +++---
.../src/main/resources/META-INF/NOTICE | 18 +++---
pom.xml | 2 +-
6 files changed, 71 insertions(+), 70 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 8ae9206..34bd8eb 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,37 @@ 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.82.Final
-- io.netty:netty-buffer: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-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
-- 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-codec:4.1.82.Final
-- io.netty:netty-common:4.1.82.Final
-- io.netty:netty-handler-proxy: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-aarch_64: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-aarch_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
-- io.netty:netty-transport:4.1.82.Final
\ No newline at end of file
+- io.netty:netty-all:4.1.90.Final
+- io.netty:netty-buffer:4.1.90.Final
+- io.netty:netty-codec-dns:4.1.90.Final
+- io.netty:netty-codec-haproxy:4.1.90.Final
+- io.netty:netty-codec-http2:4.1.90.Final
+- io.netty:netty-codec-http:4.1.90.Final
+- io.netty:netty-codec-memcache:4.1.90.Final
+- io.netty:netty-codec-mqtt:4.1.90.Final
+- io.netty:netty-codec-redis:4.1.90.Final
+- io.netty:netty-codec-smtp:4.1.90.Final
+- io.netty:netty-codec-socks:4.1.90.Final
+- io.netty:netty-codec-stomp:4.1.90.Final
+- io.netty:netty-codec-xml:4.1.90.Final
+- io.netty:netty-codec:4.1.90.Final
+- io.netty:netty-common:4.1.90.Final
+- io.netty:netty-handler-proxy:4.1.90.Final
+- io.netty:netty-handler-ssl-ocsp:4.1.90.Final
+- io.netty:netty-handler:4.1.90.Final
+- io.netty:netty-resolver-dns-classes-macos:4.1.90.Final
+- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.90.Final
+- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.90.Final
+- io.netty:netty-resolver-dns:4.1.90.Final
+- io.netty:netty-resolver:4.1.90.Final
+- io.netty:netty-transport-classes-epoll:4.1.90.Final
+- io.netty:netty-transport-classes-kqueue:4.1.90.Final
+- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.90.Final
+- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.90.Final
+- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.90.Final
+- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.90.Final
+- io.netty:netty-transport-native-unix-common:4.1.90.Final
+- io.netty:netty-transport-rxtx:4.1.90.Final
+- io.netty:netty-transport-sctp:4.1.90.Final
+- io.netty:netty-transport-udt:4.1.90.Final
+- io.netty:netty-transport:4.1.90.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 6496c86..c539afb 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.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-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
+- io.netty:netty-buffer:4.1.90.Final
+- io.netty:netty-codec:4.1.90.Final
+- io.netty:netty-common:4.1.90.Final
+- io.netty:netty-handler:4.1.90.Final
+- io.netty:netty-resolver:4.1.90.Final
+- io.netty:netty-transport-classes-epoll:4.1.90.Final
+- io.netty:netty-transport-native-epoll:4.1.90.Final
+- io.netty:netty-transport-native-unix-common:4.1.90.Final
+- io.netty:netty-transport:4.1.90.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 ed37f3f..d6a4976 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.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-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
+- io.netty:netty-buffer:4.1.90.Final
+- io.netty:netty-codec:4.1.90.Final
+- io.netty:netty-common:4.1.90.Final
+- io.netty:netty-handler:4.1.90.Final
+- io.netty:netty-resolver:4.1.90.Final
+- io.netty:netty-transport-classes-epoll:4.1.90.Final
+- io.netty:netty-transport-native-epoll:4.1.90.Final
+- io.netty:netty-transport-native-unix-common:4.1.90.Final
+- io.netty:netty-transport:4.1.90.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-37/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE
index 354e875..1480e2e 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 @@ This project bundles the following dependencies under the Apache Software Licens
- com.google.guava:guava:27.0.1-jre
- io.dropwizard.metrics:metrics-core:4.1.12.1
-- 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-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
+- io.netty:netty-buffer:4.1.90.Final
+- io.netty:netty-codec:4.1.90.Final
+- io.netty:netty-common:4.1.90.Final
+- io.netty:netty-handler:4.1.90.Final
+- io.netty:netty-resolver:4.1.90.Final
+- io.netty:netty-transport-classes-epoll:4.1.90.Final
+- io.netty:netty-transport-native-epoll:4.1.90.Final
+- io.netty:netty-transport-native-unix-common:4.1.90.Final
+- io.netty:netty-transport:4.1.90.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-38/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE
index 7ab4148..030e89b 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,17 +9,17 @@ This project bundles the following dependencies under the Apache Software Licens
- com.google.guava:guava:27.0.1-jre
- commons-io:commons-io:2.11.0
- io.dropwizard.metrics:metrics-core:4.1.12.1
-- 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-buffer:4.1.90.Final
+- io.netty:netty-codec:4.1.90.Final
+- io.netty:netty-common:4.1.90.Final
+- io.netty:netty-handler:4.1.90.Final
+- io.netty:netty-resolver:4.1.90.Final
- io.netty:netty-tcnative-classes:2.0.54.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
+- io.netty:netty-transport-classes-epoll:4.1.90.Final
+- io.netty:netty-transport-native-epoll:4.1.90.Final
+- io.netty:netty-transport-native-unix-common:4.1.90.Final
+- io.netty:netty-transport:4.1.90.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 7eb4ae7..f2764d8 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.82.Final</netty.version>
+ <netty.version>4.1.90.Final</netty.version>
<jackson.version>2.13.4.20221013</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.
[flink-shaded] 06/13: [FLINK-30772][Build/Shaded] Update Zookeeper 3.6 to 3.6.4
Posted by ma...@apache.org.
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 14142c380007836d68247471ddb73e053d15895c
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Mon Mar 27 16:19:37 2023 +0200
[FLINK-30772][Build/Shaded] Update Zookeeper 3.6 to 3.6.4
---
flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml | 2 +-
.../flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
index d60aa6c..f116f34 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
@@ -33,7 +33,7 @@ under the License.
<version>${zookeeper.version}-17.0</version>
<properties>
- <zookeeper.version>3.6.3</zookeeper.version>
+ <zookeeper.version>3.6.4</zookeeper.version>
<curator.version>5.3.0</curator.version>
</properties>
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 d6a4976..82f1c92 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
@@ -20,5 +20,5 @@ This project bundles the following dependencies under the Apache Software Licens
- 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-jute:3.6.3
-- org.apache.zookeeper:zookeeper:3.6.3
+- org.apache.zookeeper:zookeeper-jute:3.6.4
+- org.apache.zookeeper:zookeeper:3.6.4
[flink-shaded] 11/13: [FLINK-30772][Build/Shaded] Update ASM to 9.5
Posted by ma...@apache.org.
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 b7ac6ad55c110ebba48417522d4f2defca10ac95
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Tue Mar 28 14:04:06 2023 +0200
[FLINK-30772][Build/Shaded] Update ASM to 9.5
---
flink-shaded-asm-9/pom.xml | 2 +-
flink-shaded-asm-9/src/main/resources/META-INF/NOTICE | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/flink-shaded-asm-9/pom.xml b/flink-shaded-asm-9/pom.xml
index 2345380..06971a9 100644
--- a/flink-shaded-asm-9/pom.xml
+++ b/flink-shaded-asm-9/pom.xml
@@ -35,7 +35,7 @@ under the License.
<properties>
<asm.major.version>9</asm.major.version>
- <asm.version>${asm.major.version}.3</asm.version>
+ <asm.version>${asm.major.version}.5</asm.version>
</properties>
<dependencies>
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 1479a23..de43b3f 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-analysis:9.3
-- org.ow2.asm:asm-commons:9.3
-- org.ow2.asm:asm-tree:9.3
-- org.ow2.asm:asm:9.3
\ No newline at end of file
+- org.ow2.asm:asm-analysis:9.5
+- org.ow2.asm:asm-commons:9.5
+- org.ow2.asm:asm-tree:9.5
+- org.ow2.asm:asm:9.5
\ No newline at end of file
[flink-shaded] 07/13: [FLINK-30772][Build/Shaded] Update Snakeyaml to 2.0
Posted by ma...@apache.org.
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 1da20d4df35af41b7042fbf8e5e23bc570897603
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Mon Mar 27 16:20:15 2023 +0200
[FLINK-30772][Build/Shaded] Update Snakeyaml to 2.0
---
.../flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE | 2 +-
flink-shaded-swagger/pom.xml | 2 +-
flink-shaded-swagger/src/main/resources/META-INF/NOTICE | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE b/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
index e3b8e06..70935cb 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
@@ -13,4 +13,4 @@ This project bundles the following dependencies under the Apache Software Licens
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2
- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2
- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2
-- org.yaml:snakeyaml:1.31
+- org.yaml:snakeyaml:1.33
diff --git a/flink-shaded-swagger/pom.xml b/flink-shaded-swagger/pom.xml
index 537ccb8..9932afb 100644
--- a/flink-shaded-swagger/pom.xml
+++ b/flink-shaded-swagger/pom.xml
@@ -51,7 +51,7 @@ under the License.
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.31</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
diff --git a/flink-shaded-swagger/src/main/resources/META-INF/NOTICE b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
index 39bd459..f31aff4 100644
--- a/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
@@ -13,7 +13,7 @@ This project bundles the following dependencies under the Apache Software Licens
- io.swagger.core.v3:swagger-models:2.2.8
- jakarta.validation:jakarta.validation-api:2.0.2
- org.apache.commons:commons-lang3:3.12.0
-- org.yaml:snakeyaml:1.31
+- org.yaml:snakeyaml:2.0
This project bundles the following dependencies under the Eclipse Distribution License 1.0 (https://www.eclipse.org/org/documents/edl-v10.php)
[flink-shaded] 03/13: [FLINK-30772][Build/Shaded] Update Jackson to 2.14.2
Posted by ma...@apache.org.
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 b09266f1befca067b8090177fbc1b0f46cf21d0d
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Mon Mar 27 16:16:51 2023 +0200
[FLINK-30772][Build/Shaded] Update Jackson to 2.14.2
---
flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 14 +++++++-------
.../flink-shaded-jackson-module-jsonSchema-2/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 8 ++++----
flink-shaded-jackson-parent/pom.xml | 2 +-
flink-shaded-swagger/src/main/resources/META-INF/NOTICE | 4 ++--
pom.xml | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
index 1f989e2..a4c35b5 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-parent</artifactId>
- <version>2.13.4-17.0</version>
+ <version>2.14.2-17.0</version>
</parent>
<artifactId>flink-shaded-jackson${flink.ci.license.suffix}</artifactId>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE b/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
index 8cdf5a3..e3b8e06 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
@@ -6,11 +6,11 @@ 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.fasterxml.jackson.core:jackson-annotations:2.13.4
-- com.fasterxml.jackson.core:jackson-core:2.13.4
-- com.fasterxml.jackson.core:jackson-databind:2.13.4.2
-- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.13.4
-- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.4
-- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4
-- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4
+- com.fasterxml.jackson.core:jackson-annotations:2.14.2
+- com.fasterxml.jackson.core:jackson-core:2.14.2
+- com.fasterxml.jackson.core:jackson-databind:2.14.2
+- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.14.2
+- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2
+- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2
+- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2
- org.yaml:snakeyaml:1.31
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
index 83ece4c..ff88a40 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-parent</artifactId>
- <version>2.13.4-17.0</version>
+ <version>2.14.2-17.0</version>
</parent>
<artifactId>flink-shaded-jackson-module-jsonSchema${flink.ci.license.suffix}</artifactId>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE
index 54b7275..c406f21 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE
@@ -6,8 +6,8 @@ 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.fasterxml.jackson.core:jackson-annotations:2.13.4
-- com.fasterxml.jackson.core:jackson-core:2.13.4
-- com.fasterxml.jackson.core:jackson-databind:2.13.4.2
-- com.fasterxml.jackson.module:jackson-module-jsonSchema:2.13.4
+- com.fasterxml.jackson.core:jackson-annotations:2.14.2
+- com.fasterxml.jackson.core:jackson-core:2.14.2
+- com.fasterxml.jackson.core:jackson-databind:2.14.2
+- com.fasterxml.jackson.module:jackson-module-jsonSchema:2.14.2
- javax.validation:validation-api:1.1.0.Final
\ No newline at end of file
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml
index 0e2f1e1..9b0819b 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -31,7 +31,7 @@ under the License.
<artifactId>flink-shaded-jackson-parent</artifactId>
<name>flink-shaded-jackson-parent</name>
<packaging>pom</packaging>
- <version>2.13.4-17.0</version>
+ <version>2.14.2-17.0</version>
<modules>
<module>flink-shaded-jackson-2</module>
diff --git a/flink-shaded-swagger/src/main/resources/META-INF/NOTICE b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
index ce945bf..f185267 100644
--- a/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
@@ -6,8 +6,8 @@ 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.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.4
-- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4
+- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2
+- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2
- io.swagger.core.v3:swagger-annotations:2.2.2
- io.swagger.core.v3:swagger-core:2.2.2
- io.swagger.core.v3:swagger-models:2.2.2
diff --git a/pom.xml b/pom.xml
index f2764d8..c824972 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@ under the License.
<properties>
<shading.prefix>org.apache.flink.shaded</shading.prefix>
<netty.version>4.1.90.Final</netty.version>
- <jackson.version>2.13.4.20221013</jackson.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.
This property can be used by modules to add a suffix to the artifactId to match the directory name on CI
[flink-shaded] 05/13: [FLINK-30772][Build/Shaded] Update Swagger to 2.2.8
Posted by ma...@apache.org.
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 9b1265fdcf0a80aca134a4e0ed381d897fe805bc
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Mon Mar 27 16:18:59 2023 +0200
[FLINK-30772][Build/Shaded] Update Swagger to 2.2.8
---
flink-shaded-swagger/pom.xml | 2 +-
flink-shaded-swagger/src/main/resources/META-INF/NOTICE | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/flink-shaded-swagger/pom.xml b/flink-shaded-swagger/pom.xml
index 8a73dee..537ccb8 100644
--- a/flink-shaded-swagger/pom.xml
+++ b/flink-shaded-swagger/pom.xml
@@ -36,7 +36,7 @@ under the License.
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core</artifactId>
- <version>2.2.2</version>
+ <version>2.2.8</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/flink-shaded-swagger/src/main/resources/META-INF/NOTICE b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
index f185267..39bd459 100644
--- a/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
@@ -8,9 +8,9 @@ This project bundles the following dependencies under the Apache Software Licens
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2
- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2
-- io.swagger.core.v3:swagger-annotations:2.2.2
-- io.swagger.core.v3:swagger-core:2.2.2
-- io.swagger.core.v3:swagger-models:2.2.2
+- io.swagger.core.v3:swagger-annotations:2.2.8
+- io.swagger.core.v3:swagger-core:2.2.8
+- io.swagger.core.v3:swagger-models:2.2.8
- jakarta.validation:jakarta.validation-api:2.0.2
- org.apache.commons:commons-lang3:3.12.0
- org.yaml:snakeyaml:1.31
[flink-shaded] 04/13: [FLINK-30772][Build/Shaded] Update Netty TCNative to 2.0.59.Final
Posted by ma...@apache.org.
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 b5c59db3b6c2bdefb0bcb4a7495880d5ef9ab3b8
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Mon Mar 27 16:18:17 2023 +0200
[FLINK-30772][Build/Shaded] Update Netty TCNative to 2.0.59.Final
---
flink-shaded-netty-tcnative-dynamic/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 12 ++++++------
flink-shaded-netty-tcnative-static/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 14 +++++++-------
.../src/main/resources/META-INF/NOTICE | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/flink-shaded-netty-tcnative-dynamic/pom.xml b/flink-shaded-netty-tcnative-dynamic/pom.xml
index 341d059..d723db1 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.54.Final</netty.tcnative.version>
+ <netty.tcnative.version>2.0.59.Final</netty.tcnative.version>
</properties>
<dependencies>
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 8a5bc39..d913569 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-fedora:2.0.54.Final
-- 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
+- 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
\ No newline at end of file
diff --git a/flink-shaded-netty-tcnative-static/pom.xml b/flink-shaded-netty-tcnative-static/pom.xml
index fbc5919..dfab65a 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.54.Final</netty.tcnative.version>
+ <netty.tcnative.version>2.0.59.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 105aa63..bb3e6a9 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,13 +6,13 @@ 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.54.Final
-- io.netty:netty-tcnative-boringssl-static:linux-aarch_64:2.0.54.Final
-- io.netty:netty-tcnative-boringssl-static:linux-x86_64:2.0.54.Final
-- io.netty:netty-tcnative-boringssl-static:osx-aarch_64:2.0.54.Final
-- io.netty:netty-tcnative-boringssl-static:osx-x86_64:2.0.54.Final
-- io.netty:netty-tcnative-boringssl-static:windows-x86_64:2.0.54.Final
-- io.netty:netty-tcnative-classes:2.0.54.Final
+- 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
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-38/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE
index 030e89b..9a9711a 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,7 +14,7 @@ This project bundles the following dependencies under the Apache Software Licens
- io.netty:netty-common:4.1.90.Final
- io.netty:netty-handler:4.1.90.Final
- io.netty:netty-resolver:4.1.90.Final
-- io.netty:netty-tcnative-classes:2.0.54.Final
+- io.netty:netty-tcnative-classes:2.0.59.Final
- io.netty:netty-tcnative:2.0.48.Final
- io.netty:netty-transport-classes-epoll:4.1.90.Final
- io.netty:netty-transport-native-epoll:4.1.90.Final
[flink-shaded] 09/13: [FLINK-30772][Build/Shaded] Update Zookeeper 3.8 to 3.8.1
Posted by ma...@apache.org.
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 d68885c61387f19b4407e67afd21edccd932e623
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Mon Mar 27 16:26:33 2023 +0200
[FLINK-30772][Build/Shaded] Update Zookeeper 3.8 to 3.8.1
---
flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml | 2 +-
.../flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
index b498588..14d32c3 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
@@ -33,7 +33,7 @@ under the License.
<version>${zookeeper.version}-17.0</version>
<properties>
- <zookeeper.version>3.8.0</zookeeper.version>
+ <zookeeper.version>3.8.1</zookeeper.version>
<curator.version>5.3.0</curator.version>
</properties>
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 4a07f6a..306fb3e 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,8 +14,6 @@ This project bundles the following dependencies under the Apache Software Licens
- io.netty:netty-common:4.1.90.Final
- io.netty:netty-handler:4.1.90.Final
- io.netty:netty-resolver:4.1.90.Final
-- io.netty:netty-tcnative-classes:2.0.59.Final
-- io.netty:netty-tcnative:2.0.48.Final
- io.netty:netty-transport-classes-epoll:4.1.90.Final
- io.netty:netty-transport-native-epoll:4.1.90.Final
- io.netty:netty-transport-native-unix-common:4.1.90.Final
@@ -23,5 +21,5 @@ This project bundles the following dependencies under the Apache Software Licens
- 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-jute:3.8.0
-- org.apache.zookeeper:zookeeper:3.8.0
+- org.apache.zookeeper:zookeeper-jute:3.8.1
+- org.apache.zookeeper:zookeeper:3.8.1
[flink-shaded] 10/13: [FLINK-30772][Build/Shaded] Update Curator to 5.4.0
Posted by ma...@apache.org.
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 c567aa7d8f183e7264c1a08c675f511e8f8b075a
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Mon Mar 27 16:29:15 2023 +0200
[FLINK-30772][Build/Shaded] Update Curator to 5.4.0
---
flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml | 2 +-
.../flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE | 6 +++---
flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml | 2 +-
.../flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE | 6 +++---
flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml | 2 +-
.../flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE | 6 +++---
flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml | 2 +-
.../flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE | 6 +++---
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml
index b4e5bf0..70cf8a1 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml
@@ -34,7 +34,7 @@ under the License.
<properties>
<zookeeper.version>3.5.10</zookeeper.version>
- <curator.version>5.3.0</curator.version>
+ <curator.version>5.4.0</curator.version>
</properties>
<dependencies>
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 fcb4d65..745ce52 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
@@ -16,8 +16,8 @@ This project bundles the following dependencies under the Apache Software Licens
- io.netty:netty-transport-native-epoll:4.1.90.Final
- io.netty:netty-transport-native-unix-common:4.1.90.Final
- io.netty:netty-transport:4.1.90.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.curator:curator-client:5.4.0
+- org.apache.curator:curator-framework:5.4.0
+- org.apache.curator:curator-recipes:5.4.0
- 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/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
index f116f34..1d5fc45 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
@@ -34,7 +34,7 @@ under the License.
<properties>
<zookeeper.version>3.6.4</zookeeper.version>
- <curator.version>5.3.0</curator.version>
+ <curator.version>5.4.0</curator.version>
</properties>
<dependencies>
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 9b0522e..7ca80a1 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
@@ -17,8 +17,8 @@ This project bundles the following dependencies under the Apache Software Licens
- io.netty:netty-transport-native-epoll:4.1.90.Final
- io.netty:netty-transport-native-unix-common:4.1.90.Final
- io.netty:netty-transport:4.1.90.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.curator:curator-client:5.4.0
+- org.apache.curator:curator-framework:5.4.0
+- org.apache.curator:curator-recipes:5.4.0
- org.apache.zookeeper:zookeeper-jute:3.6.4
- org.apache.zookeeper:zookeeper:3.6.4
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml
index f9589eb..e0109ca 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml
@@ -34,7 +34,7 @@ under the License.
<properties>
<zookeeper.version>3.7.1</zookeeper.version>
- <curator.version>5.3.0</curator.version>
+ <curator.version>5.4.0</curator.version>
</properties>
<dependencies>
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 b0dd1ca..1932f9a 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
@@ -17,8 +17,8 @@ This project bundles the following dependencies under the Apache Software Licens
- io.netty:netty-transport-native-epoll:4.1.90.Final
- io.netty:netty-transport-native-unix-common:4.1.90.Final
- io.netty:netty-transport:4.1.90.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.curator:curator-client:5.4.0
+- org.apache.curator:curator-framework:5.4.0
+- org.apache.curator:curator-recipes:5.4.0
- 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/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
index 14d32c3..f594a56 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
@@ -34,7 +34,7 @@ under the License.
<properties>
<zookeeper.version>3.8.1</zookeeper.version>
- <curator.version>5.3.0</curator.version>
+ <curator.version>5.4.0</curator.version>
</properties>
<dependencies>
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 306fb3e..46f7d87 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
@@ -18,8 +18,8 @@ This project bundles the following dependencies under the Apache Software Licens
- io.netty:netty-transport-native-epoll:4.1.90.Final
- io.netty:netty-transport-native-unix-common:4.1.90.Final
- io.netty:netty-transport:4.1.90.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.curator:curator-client:5.4.0
+- org.apache.curator:curator-framework:5.4.0
+- org.apache.curator:curator-recipes:5.4.0
- org.apache.zookeeper:zookeeper-jute:3.8.1
- org.apache.zookeeper:zookeeper:3.8.1
[flink-shaded] 12/13: [FLINK-30772][Build/Shaded] Rename Guava module from flink-shaded-guava-30 to flink-shaded-guava-31
Posted by ma...@apache.org.
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 c37343c80e8f82ff9473fc978597a40314b9b864
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Tue Mar 28 11:07:43 2023 +0200
[FLINK-30772][Build/Shaded] Rename Guava module from flink-shaded-guava-30 to flink-shaded-guava-31
---
{flink-shaded-guava-30 => flink-shaded-guava-31}/pom.xml | 6 +++---
.../src/main/resources/META-INF/NOTICE | 0
pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/flink-shaded-guava-30/pom.xml b/flink-shaded-guava-31/pom.xml
similarity index 96%
rename from flink-shaded-guava-30/pom.xml
rename to flink-shaded-guava-31/pom.xml
index 5600c00..2f05dc7 100644
--- a/flink-shaded-guava-30/pom.xml
+++ b/flink-shaded-guava-31/pom.xml
@@ -29,7 +29,7 @@ under the License.
</parent>
<artifactId>flink-shaded-guava${flink.ci.license.suffix}</artifactId>
- <name>flink-shaded-guava-30</name>
+ <name>flink-shaded-guava-31</name>
<version>${guava.version}-17.0</version>
<packaging>jar</packaging>
@@ -57,7 +57,7 @@ under the License.
<profile>
<id>license-check</id>
<properties>
- <flink.ci.license.suffix>-30</flink.ci.license.suffix>
+ <flink.ci.license.suffix>-31</flink.ci.license.suffix>
</properties>
</profile>
</profiles>
@@ -85,7 +85,7 @@ under the License.
<relocations>
<relocation>
<pattern>com.google</pattern>
- <shadedPattern>${shading.prefix}.guava30.com.google</shadedPattern>
+ <shadedPattern>${shading.prefix}.guava31.com.google</shadedPattern>
</relocation>
</relocations>
</configuration>
diff --git a/flink-shaded-guava-30/src/main/resources/META-INF/NOTICE b/flink-shaded-guava-31/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from flink-shaded-guava-30/src/main/resources/META-INF/NOTICE
rename to flink-shaded-guava-31/src/main/resources/META-INF/NOTICE
diff --git a/pom.xml b/pom.xml
index c824972..9c8dda4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@ under the License.
<modules>
<module>flink-shaded-force-shading</module>
<module>flink-shaded-asm-9</module>
- <module>flink-shaded-guava-30</module>
+ <module>flink-shaded-guava-31</module>
<module>flink-shaded-netty-4</module>
<module>flink-shaded-netty-tcnative-dynamic</module>
<module>flink-shaded-jackson-parent</module>
[flink-shaded] 01/13: [hotfix] Sort dependencies in NOTICE files
Posted by ma...@apache.org.
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 <mv...@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
[flink-shaded] 08/13: [FLINK-30772][Build/Shaded] Update Guava to 31.1-jre
Posted by ma...@apache.org.
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 2822733762a49b535279d6c2bdb9e083fbc2480c
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Mon Mar 27 16:20:43 2023 +0200
[FLINK-30772][Build/Shaded] Update Guava to 31.1-jre
---
flink-shaded-guava-30/pom.xml | 2 +-
flink-shaded-guava-30/src/main/resources/META-INF/NOTICE | 2 +-
.../flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE | 2 +-
.../flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE | 2 +-
.../flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE | 2 +-
.../flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/flink-shaded-guava-30/pom.xml b/flink-shaded-guava-30/pom.xml
index 4e75b2c..5600c00 100644
--- a/flink-shaded-guava-30/pom.xml
+++ b/flink-shaded-guava-30/pom.xml
@@ -35,7 +35,7 @@ under the License.
<packaging>jar</packaging>
<properties>
- <guava.version>30.1.1-jre</guava.version>
+ <guava.version>31.1-jre</guava.version>
</properties>
<dependencies>
diff --git a/flink-shaded-guava-30/src/main/resources/META-INF/NOTICE b/flink-shaded-guava-30/src/main/resources/META-INF/NOTICE
index a127561..5477b7d 100644
--- a/flink-shaded-guava-30/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-guava-30/src/main/resources/META-INF/NOTICE
@@ -6,5 +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)
-- com.google.guava:guava:30.1.1-jre
+- com.google.guava:guava:31.1-jre
- com.google.guava:failureaccess:1.0.1
\ 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 c539afb..fcb4d65 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
@@ -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)
-- com.google.guava:guava:27.0.1-jre
+- com.google.guava:guava:31.1-jre
- io.netty:netty-buffer:4.1.90.Final
- io.netty:netty-codec:4.1.90.Final
- io.netty:netty-common:4.1.90.Final
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 82f1c92..9b0522e 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
@@ -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)
-- com.google.guava:guava:27.0.1-jre
+- com.google.guava:guava:31.1-jre
- io.dropwizard.metrics:metrics-core:3.2.5
- io.netty:netty-buffer:4.1.90.Final
- io.netty:netty-codec:4.1.90.Final
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 1480e2e..b0dd1ca 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
@@ -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)
-- com.google.guava:guava:27.0.1-jre
+- com.google.guava:guava:31.1-jre
- io.dropwizard.metrics:metrics-core:4.1.12.1
- io.netty:netty-buffer:4.1.90.Final
- io.netty:netty-codec:4.1.90.Final
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 9a9711a..4a07f6a 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
@@ -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)
-- com.google.guava:guava:27.0.1-jre
+- 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.90.Final
[flink-shaded] 13/13: [hotfix] Fix incorrect shaded name for Libnetty library
Posted by ma...@apache.org.
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 0bb56dc446c097dec42102f6ec6bb89960ab3e42
Author: Martijn Visser <mv...@confluent.io>
AuthorDate: Thu Mar 30 10:07:56 2023 +0200
[hotfix] Fix incorrect shaded name for Libnetty library
---
flink-shaded-netty-4/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index d223cc8..1a5cd6b 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -94,7 +94,7 @@ under the License.
<echo message="renaming the complete libnetty library" />
<move todir="${project.build.directory}/unpacked/META-INF/native" includeemptydirs="false">
<fileset dir="${project.build.directory}/unpacked/META-INF/native"/>
- <mapper type="glob" from="libnetty*" to="liborg_apache_flink_shaded_netty*"/>
+ <mapper type="glob" from="libnetty*" to="liborg_apache_flink_shaded_netty4_netty*"/>
</move>
<echo message="repackaging netty jar" />
<jar destfile="${project.build.directory}/${artifactId}-${version}.jar" basedir="${project.build.directory}/unpacked" />