From 9b948812f49cff71cd774b11b270c4ee6dfbe1e1 Mon Sep 17 00:00:00 2001 From: mateczagany Date: Wed, 19 Nov 2025 08:50:09 +0100 Subject: [PATCH 1/7] [FLINK-38694][Build/Shaded] Update Curator to 5.9.0 --- .../flink-shaded-zookeeper-35/pom.xml | 4 ++-- .../src/main/resources/META-INF/NOTICE | 6 +++--- .../flink-shaded-zookeeper-36/pom.xml | 4 ++-- .../src/main/resources/META-INF/NOTICE | 6 +++--- .../flink-shaded-zookeeper-37/pom.xml | 4 ++-- .../src/main/resources/META-INF/NOTICE | 6 +++--- .../flink-shaded-zookeeper-38/pom.xml | 4 ++-- .../src/main/resources/META-INF/NOTICE | 6 +++--- 8 files changed, 20 insertions(+), 20 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 6e25450d..da029bb1 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. 3.5.10 - 5.4.0 + 5.9.0 @@ -139,4 +139,4 @@ under the License. - \ 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 fc05ca18..6fa1de87 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.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 +- org.apache.curator:curator-client:5.9.0 +- org.apache.curator:curator-framework:5.9.0 +- org.apache.curator:curator-recipes:5.9.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 15a7cdca..90b4952d 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. 3.6.4 - 5.4.0 + 5.9.0 @@ -164,4 +164,4 @@ under the License. - \ No newline at end of file + 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 391e23da..91e39fb8 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.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 +- org.apache.curator:curator-client:5.9.0 +- org.apache.curator:curator-framework:5.9.0 +- org.apache.curator:curator-recipes:5.9.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 b0c56a06..56102d95 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. 3.7.2 - 5.4.0 + 5.9.0 @@ -149,4 +149,4 @@ under the License. - \ No newline at end of file + 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 94745616..0781dc7c 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.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 +- org.apache.curator:curator-client:5.9.0 +- org.apache.curator:curator-framework:5.9.0 +- org.apache.curator:curator-recipes:5.9.0 - org.apache.zookeeper:zookeeper-jute:3.7.2 - org.apache.zookeeper:zookeeper:3.7.2 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 eca5e0d5..3b74f916 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. 3.8.4 - 5.4.0 + 5.9.0 @@ -153,4 +153,4 @@ under the License. - \ No newline at end of file + 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 99a3f7dc..d46d0f87 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.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 +- org.apache.curator:curator-client:5.9.0 +- org.apache.curator:curator-framework:5.9.0 +- org.apache.curator:curator-recipes:5.9.0 - org.apache.zookeeper:zookeeper-jute:3.8.4 - org.apache.zookeeper:zookeeper:3.8.4 From 1de9063ec63cc94143f53579db829d05772ab24c Mon Sep 17 00:00:00 2001 From: mateczagany Date: Wed, 19 Nov 2025 08:50:58 +0100 Subject: [PATCH 2/7] [FLINK-38694][Build/Shaded] Update Zookeeper to 3.8.5 --- .../flink-shaded-zookeeper-38/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 6 +++--- 2 files changed, 4 insertions(+), 4 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 3b74f916..fc4de4bc 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. ${zookeeper.version}-21.0 - 3.8.4 + 3.8.5 5.9.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 d46d0f87..337ad145 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 @@ -7,7 +7,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:33.4.0-jre -- commons-io:commons-io:2.11.0 +- commons-io:commons-io:2.17.0 - io.dropwizard.metrics:metrics-core:4.1.12.1 - io.netty:netty-buffer:4.2.6.Final - io.netty:netty-codec-base:4.2.6.Final @@ -21,5 +21,5 @@ This project bundles the following dependencies under the Apache Software Licens - org.apache.curator:curator-client:5.9.0 - org.apache.curator:curator-framework:5.9.0 - org.apache.curator:curator-recipes:5.9.0 -- org.apache.zookeeper:zookeeper-jute:3.8.4 -- org.apache.zookeeper:zookeeper:3.8.4 +- org.apache.zookeeper:zookeeper-jute:3.8.5 +- org.apache.zookeeper:zookeeper:3.8.5 From 2c2a864abf0a8b206f9f71ebb0c1f6d93aa9924c Mon Sep 17 00:00:00 2001 From: mateczagany Date: Wed, 19 Nov 2025 08:55:51 +0100 Subject: [PATCH 3/7] [FLINK-38694][Build/Shaded] Update json-path to 2.10.0 --- flink-shaded-jackson-parent/flink-shaded-jsonpath/pom.xml | 4 ++-- .../flink-shaded-jsonpath/src/main/resources/META-INF/NOTICE | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flink-shaded-jackson-parent/flink-shaded-jsonpath/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jsonpath/pom.xml index f38d4c93..8677b7af 100644 --- a/flink-shaded-jackson-parent/flink-shaded-jsonpath/pom.xml +++ b/flink-shaded-jackson-parent/flink-shaded-jsonpath/pom.xml @@ -31,7 +31,7 @@ under the License. flink-shaded-jsonpath flink-shaded-jsonpath - 2.9.0-21.0 + 2.10.0-21.0 @@ -74,4 +74,4 @@ under the License. - \ No newline at end of file + diff --git a/flink-shaded-jackson-parent/flink-shaded-jsonpath/src/main/resources/META-INF/NOTICE b/flink-shaded-jackson-parent/flink-shaded-jsonpath/src/main/resources/META-INF/NOTICE index cd020560..9c0ca8c8 100644 --- a/flink-shaded-jackson-parent/flink-shaded-jsonpath/src/main/resources/META-INF/NOTICE +++ b/flink-shaded-jackson-parent/flink-shaded-jsonpath/src/main/resources/META-INF/NOTICE @@ -6,4 +6,4 @@ 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.jayway.jsonpath:json-path:2.9.0 +- com.jayway.jsonpath:json-path:2.10.0 diff --git a/pom.xml b/pom.xml index 46bc2430..2090ba07 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ under the License. org.apache.flink.shaded 4.2.6.Final 2.18.2 - 2.9.0 + 2.10.0 33.4.0-jre com.google.j2objc 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 6fa1de87..a03933d1 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:33.4.0-jre +- com.google.guava:guava:33.5.0-jre - 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 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 90b4952d..65dd8c86 100644 --- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml +++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml @@ -109,6 +109,10 @@ under the License. com.google.guava listenablefuture + + org.jspecify + jspecify + com.google.j2objc 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 91e39fb8..bcf6295e 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:33.4.0-jre +- com.google.guava:guava:33.5.0-jre - io.dropwizard.metrics:metrics-core:3.2.5 - io.netty:netty-buffer:4.2.6.Final - io.netty:netty-codec-base:4.2.6.Final 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 56102d95..7cac3b20 100644 --- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml +++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml @@ -94,6 +94,10 @@ under the License. com.google.guava listenablefuture + + org.jspecify + jspecify + com.google.j2objc 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 0781dc7c..9577fdd0 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:33.4.0-jre +- com.google.guava:guava:33.5.0-jre - io.dropwizard.metrics:metrics-core:4.1.12.1 - io.netty:netty-buffer:4.2.6.Final - io.netty:netty-codec-base:4.2.6.Final 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 fc4de4bc..c1deec63 100644 --- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml +++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml @@ -98,6 +98,10 @@ under the License. com.google.guava listenablefuture + + org.jspecify + jspecify + com.google.j2objc 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 337ad145..abb4dcb1 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:33.4.0-jre +- com.google.guava:guava:33.5.0-jre - commons-io:commons-io:2.17.0 - io.dropwizard.metrics:metrics-core:4.1.12.1 - io.netty:netty-buffer:4.2.6.Final diff --git a/pom.xml b/pom.xml index d1adb01c..eaba2340 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ under the License. 4.2.6.Final 2.20.1 2.10.0 - 33.4.0-jre + 33.5.0-jre