This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 8ddfd59 [FLINK-25145][build] Drop ZK 3.4 / Support ZK 3.6
8ddfd59 is described below
commit 8ddfd590ebba7fc727e79db41b82d3d40a02b56a
Author: Chesnay Schepler <[email protected]>
AuthorDate: Sat Jan 22 11:35:22 2022 +0100
[FLINK-25145][build] Drop ZK 3.4 / Support ZK 3.6
---
flink-connectors/flink-connector-hbase-1.4/pom.xml | 11 +++++++++++
flink-connectors/flink-connector-hbase-2.2/pom.xml | 11 +++++++++++
.../flink-sql-connector-hbase-1.4/pom.xml | 11 +++++++++++
.../flink-sql-connector-hbase-2.2/pom.xml | 11 +++++++++++
flink-dist/pom.xml | 4 ++--
flink-dist/src/main/assemblies/bin.xml | 2 +-
flink-dist/src/main/assemblies/opt.xml | 2 +-
.../flink/container/FlinkContainersBuilder.java | 2 +-
flink-end-to-end-tests/run-nightly-tests.sh | 8 ++++----
.../test-scripts/test_ha_datastream.sh | 2 +-
.../test_ha_per_job_cluster_datastream.sh | 2 +-
.../main/java/org/apache/flink/orc/OrcFilters.java | 2 +-
.../DefaultLastStateConnectionStateListener.java | 4 ++--
.../LastStateConnectionStateListener.java | 4 ++--
.../checkpoint/ZooKeeperCheckpointIDCounter.java | 8 ++++----
.../ZooKeeperCheckpointRecoveryFactory.java | 2 +-
.../zookeeper/AbstractZooKeeperHaServices.java | 4 ++--
...CuratorFrameworkWithUnhandledErrorListener.java | 4 ++--
...rMultipleComponentLeaderElectionHaServices.java | 2 +-
.../jobmanager/ZooKeeperJobGraphStoreWatcher.java | 10 +++++-----
.../jobmanager/scheduler/CoLocationGroupImpl.java | 2 +-
.../ZooKeeperLeaderElectionDriver.java | 14 +++++++-------
.../ZooKeeperLeaderElectionDriverFactory.java | 2 +-
...eeperMultipleComponentLeaderElectionDriver.java | 16 ++++++++--------
...ltipleComponentLeaderElectionDriverFactory.java | 2 +-
.../ZooKeeperLeaderRetrievalDriver.java | 10 +++++-----
.../ZooKeeperLeaderRetrievalDriverFactory.java | 2 +-
.../rest/handler/job/JobExceptionsHandler.java | 2 +-
.../apache/flink/runtime/util/ZooKeeperUtils.java | 22 +++++++++++-----------
.../runtime/zookeeper/ZooKeeperSharedCount.java | 2 +-
.../runtime/zookeeper/ZooKeeperSharedValue.java | 2 +-
.../zookeeper/ZooKeeperStateHandleStore.java | 4 ++--
.../runtime/zookeeper/ZooKeeperVersionedValue.java | 2 +-
.../ZKCheckpointIDCounterMultiServersTest.java | 4 ++--
.../ZooKeeperCheckpointIDCounterITCase.java | 2 +-
.../ZooKeeperCompletedCheckpointStoreITCase.java | 2 +-
.../ZooKeeperCompletedCheckpointStoreTest.java | 2 +-
.../ZooKeeperDefaultDispatcherRunnerTest.java | 2 +-
.../zookeeper/ZooKeeperHaServicesTest.java | 6 +++---
.../ZooKeeperJobGraphStoreWatcherTest.java | 4 ++--
.../jobmanager/ZooKeeperJobGraphsStoreITCase.java | 4 ++--
...KeeperLeaderElectionConnectionHandlingTest.java | 6 +++---
.../ZooKeeperLeaderElectionTest.java | 16 ++++++++--------
...rMultipleComponentLeaderElectionDriverTest.java | 4 ++--
...eeperLeaderRetrievalConnectionHandlingTest.java | 2 +-
.../flink/runtime/util/ZooKeeperUtilsTest.java | 4 ++--
.../runtime/util/ZooKeeperUtilsTreeCacheTest.java | 8 ++++----
.../zookeeper/ZooKeeperStateHandleStoreTest.java | 2 +-
.../zookeeper/ZooKeeperTestEnvironment.java | 4 ++--
.../runtime/tasks/OneInputStreamTask.java | 2 +-
.../UnalignedCheckpointStressITCase.java | 2 +-
pom.xml | 12 ++++++------
52 files changed, 160 insertions(+), 116 deletions(-)
diff --git a/flink-connectors/flink-connector-hbase-1.4/pom.xml
b/flink-connectors/flink-connector-hbase-1.4/pom.xml
index 1dca9d4..d07448a 100644
--- a/flink-connectors/flink-connector-hbase-1.4/pom.xml
+++ b/flink-connectors/flink-connector-hbase-1.4/pom.xml
@@ -352,6 +352,17 @@ under the License.
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- HBase only works with Zookeper 3.4 -->
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.14</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<profiles>
<profile>
<id>java11</id>
diff --git a/flink-connectors/flink-connector-hbase-2.2/pom.xml
b/flink-connectors/flink-connector-hbase-2.2/pom.xml
index 46ef519..0da174f 100644
--- a/flink-connectors/flink-connector-hbase-2.2/pom.xml
+++ b/flink-connectors/flink-connector-hbase-2.2/pom.xml
@@ -424,6 +424,17 @@ under the License.
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- HBase only works with Zookeper 3.4 -->
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.14</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<profiles>
<profile>
<id>java11</id>
diff --git a/flink-connectors/flink-sql-connector-hbase-1.4/pom.xml
b/flink-connectors/flink-sql-connector-hbase-1.4/pom.xml
index 8e08cdf..78c1e5f 100644
--- a/flink-connectors/flink-sql-connector-hbase-1.4/pom.xml
+++ b/flink-connectors/flink-sql-connector-hbase-1.4/pom.xml
@@ -41,6 +41,17 @@ under the License.
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- HBase only works with Zookeper 3.4 -->
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.14</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
diff --git a/flink-connectors/flink-sql-connector-hbase-2.2/pom.xml
b/flink-connectors/flink-sql-connector-hbase-2.2/pom.xml
index 385df35..2b2873d 100644
--- a/flink-connectors/flink-sql-connector-hbase-2.2/pom.xml
+++ b/flink-connectors/flink-sql-connector-hbase-2.2/pom.xml
@@ -41,6 +41,17 @@ under the License.
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- HBase only works with Zookeper 3.4 -->
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.14</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index b7a57c7..c28ad60 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -34,7 +34,7 @@ under the License.
<packaging>jar</packaging>
<properties>
- <zookeeper.optional.version>3.5.9</zookeeper.optional.version>
+ <zookeeper.optional.version>3.6.3</zookeeper.optional.version>
</properties>
<dependencies>
@@ -664,7 +664,7 @@ under the License.
<artifactItem>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-zookeeper-3</artifactId>
-
<version>${zookeeper.optional.version}-14.0</version>
+
<version>${zookeeper.optional.version}-${flink.shaded.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
</artifactItem>
diff --git a/flink-dist/src/main/assemblies/bin.xml
b/flink-dist/src/main/assemblies/bin.xml
index eac4dcb..afd6492 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -48,7 +48,7 @@ under the License.
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<includes>
-
<include>org.apache.flink:flink-shaded-zookeeper-3:jar:${zookeeper.version}-14.0</include>
+
<include>org.apache.flink:flink-shaded-zookeeper-3:jar:${zookeeper.version}-${flink.shaded.version}</include>
</includes>
<outputFileNameMapping>flink-shaded-zookeeper-${zookeeper.version}.jar</outputFileNameMapping>
</dependencySet>
diff --git a/flink-dist/src/main/assemblies/opt.xml
b/flink-dist/src/main/assemblies/opt.xml
index 03e1996..364151b 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -126,7 +126,7 @@
</file>
<file>
-
<source>target/temporary/flink-shaded-zookeeper-3-${zookeeper.optional.version}-14.0.jar</source>
+
<source>target/temporary/flink-shaded-zookeeper-3-${zookeeper.optional.version}-${flink.shaded.version}.jar</source>
<outputDirectory>opt</outputDirectory>
<destName>flink-shaded-zookeeper-${zookeeper.optional.version}.jar</destName>
<fileMode>0644</fileMode>
diff --git
a/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/container/FlinkContainersBuilder.java
b/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/container/FlinkContainersBuilder.java
index bb9f190..e26ed61 100644
---
a/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/container/FlinkContainersBuilder.java
+++
b/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/container/FlinkContainersBuilder.java
@@ -246,7 +246,7 @@ public class FlinkContainersBuilder {
private GenericContainer<?> buildZookeeperContainer() {
return configureContainer(
- new
GenericContainer<>(DockerImageName.parse("zookeeper").withTag("3.4.14")),
+ new
GenericContainer<>(DockerImageName.parse("zookeeper").withTag("3.5.9")),
ZOOKEEPER_HOSTNAME,
"Zookeeper");
}
diff --git a/flink-end-to-end-tests/run-nightly-tests.sh
b/flink-end-to-end-tests/run-nightly-tests.sh
index bbe7149..876ed00 100755
--- a/flink-end-to-end-tests/run-nightly-tests.sh
+++ b/flink-end-to-end-tests/run-nightly-tests.sh
@@ -162,14 +162,14 @@ function run_group_1 {
run_test "Running HA dataset end-to-end test"
"$END_TO_END_DIR/test-scripts/test_ha_dataset.sh" "skip_check_exceptions"
- run_test "Running HA (hashmap, async) end-to-end test"
"$END_TO_END_DIR/test-scripts/test_ha_datastream.sh hashmap true false 3.4"
"skip_check_exceptions"
+ run_test "Running HA (hashmap, async) end-to-end test"
"$END_TO_END_DIR/test-scripts/test_ha_datastream.sh hashmap true false 3.6"
"skip_check_exceptions"
run_test "Running HA (hashmap, sync) end-to-end test"
"$END_TO_END_DIR/test-scripts/test_ha_datastream.sh hashmap false false 3.5"
"skip_check_exceptions"
- run_test "Running HA (rocks, non-incremental) end-to-end test"
"$END_TO_END_DIR/test-scripts/test_ha_datastream.sh rocks true false 3.4"
"skip_check_exceptions"
+ run_test "Running HA (rocks, non-incremental) end-to-end test"
"$END_TO_END_DIR/test-scripts/test_ha_datastream.sh rocks true false 3.6"
"skip_check_exceptions"
run_test "Running HA (rocks, incremental) end-to-end test"
"$END_TO_END_DIR/test-scripts/test_ha_datastream.sh rocks true true 3.5"
"skip_check_exceptions"
- run_test "Running HA per-job cluster (hashmap, async) end-to-end test"
"$END_TO_END_DIR/test-scripts/test_ha_per_job_cluster_datastream.sh hashmap
true false 3.4" "skip_check_exceptions"
+ run_test "Running HA per-job cluster (hashmap, async) end-to-end test"
"$END_TO_END_DIR/test-scripts/test_ha_per_job_cluster_datastream.sh hashmap
true false 3.6" "skip_check_exceptions"
run_test "Running HA per-job cluster (hashmap, sync) end-to-end test"
"$END_TO_END_DIR/test-scripts/test_ha_per_job_cluster_datastream.sh hashmap
false false 3.5" "skip_check_exceptions"
- run_test "Running HA per-job cluster (rocks, non-incremental) end-to-end
test" "$END_TO_END_DIR/test-scripts/test_ha_per_job_cluster_datastream.sh rocks
true false 3.4" "skip_check_exceptions"
+ run_test "Running HA per-job cluster (rocks, non-incremental) end-to-end
test" "$END_TO_END_DIR/test-scripts/test_ha_per_job_cluster_datastream.sh rocks
true false 3.6" "skip_check_exceptions"
run_test "Running HA per-job cluster (rocks, incremental) end-to-end test"
"$END_TO_END_DIR/test-scripts/test_ha_per_job_cluster_datastream.sh rocks true
true 3.5" "skip_check_exceptions"
}
diff --git a/flink-end-to-end-tests/test-scripts/test_ha_datastream.sh
b/flink-end-to-end-tests/test-scripts/test_ha_datastream.sh
index 3479239..ae36806 100755
--- a/flink-end-to-end-tests/test-scripts/test_ha_datastream.sh
+++ b/flink-end-to-end-tests/test-scripts/test_ha_datastream.sh
@@ -98,6 +98,6 @@ function run_ha_test() {
STATE_BACKEND_TYPE=${1:-file}
STATE_BACKEND_FILE_ASYNC=${2:-true}
STATE_BACKEND_ROCKS_INCREMENTAL=${3:-false}
-ZOOKEEPER_VERSION=${4:-3.4}
+ZOOKEEPER_VERSION=${4:-3.5}
run_test_with_timeout 900 run_ha_test 4 ${STATE_BACKEND_TYPE}
${STATE_BACKEND_FILE_ASYNC} ${STATE_BACKEND_ROCKS_INCREMENTAL}
${ZOOKEEPER_VERSION}
diff --git
a/flink-end-to-end-tests/test-scripts/test_ha_per_job_cluster_datastream.sh
b/flink-end-to-end-tests/test-scripts/test_ha_per_job_cluster_datastream.sh
index 7184920..90625c9 100755
--- a/flink-end-to-end-tests/test-scripts/test_ha_per_job_cluster_datastream.sh
+++ b/flink-end-to-end-tests/test-scripts/test_ha_per_job_cluster_datastream.sh
@@ -153,6 +153,6 @@ function run_ha_test() {
STATE_BACKEND_TYPE=${1:-file}
STATE_BACKEND_FILE_ASYNC=${2:-true}
STATE_BACKEND_ROCKS_INCREMENTAL=${3:-false}
-ZOOKEEPER_VERSION=${4:-3.4}
+ZOOKEEPER_VERSION=${4:-3.5}
run_test_with_timeout 900 run_ha_test 4 ${STATE_BACKEND_TYPE}
${STATE_BACKEND_FILE_ASYNC} ${STATE_BACKEND_ROCKS_INCREMENTAL}
${ZOOKEEPER_VERSION}
diff --git
a/flink-formats/flink-orc/src/main/java/org/apache/flink/orc/OrcFilters.java
b/flink-formats/flink-orc/src/main/java/org/apache/flink/orc/OrcFilters.java
index 9d6a940..a33b79d 100644
--- a/flink-formats/flink-orc/src/main/java/org/apache/flink/orc/OrcFilters.java
+++ b/flink-formats/flink-orc/src/main/java/org/apache/flink/orc/OrcFilters.java
@@ -28,7 +28,7 @@ import org.apache.flink.table.types.DataType;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.util.function.TriFunction;
-import org.apache.flink.shaded.curator4.com.google.common.collect.ImmutableMap;
+import org.apache.flink.shaded.curator5.com.google.common.collect.ImmutableMap;
import org.apache.hadoop.hive.common.type.HiveDecimal;
import org.apache.hadoop.hive.ql.io.sarg.PredicateLeaf;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/DefaultLastStateConnectionStateListener.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/DefaultLastStateConnectionStateListener.java
index c4f4cb1..0b9618d 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/DefaultLastStateConnectionStateListener.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/DefaultLastStateConnectionStateListener.java
@@ -18,8 +18,8 @@
package org.apache.flink.runtime.checkpoint;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionState;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionState;
import javax.annotation.Nullable;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/LastStateConnectionStateListener.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/LastStateConnectionStateListener.java
index 0ff341b..54926f0 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/LastStateConnectionStateListener.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/LastStateConnectionStateListener.java
@@ -18,8 +18,8 @@
package org.apache.flink.runtime.checkpoint;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionState;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionStateListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionState;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionStateListener;
import java.util.Optional;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounter.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounter.java
index c2806b8..9c649e6 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounter.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounter.java
@@ -23,10 +23,10 @@ import org.apache.flink.api.common.JobStatus;
import org.apache.flink.runtime.jobmanager.HighAvailabilityMode;
import org.apache.flink.runtime.util.ZooKeeperUtils;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.shared.SharedCount;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.shared.VersionedValue;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionState;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.shared.SharedCount;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.shared.VersionedValue;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java
index db4cfec..e38810d 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java
@@ -24,7 +24,7 @@ import
org.apache.flink.runtime.jobmanager.HighAvailabilityMode;
import org.apache.flink.runtime.state.SharedStateRegistryFactory;
import org.apache.flink.runtime.util.ZooKeeperUtils;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
import java.util.concurrent.Executor;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/AbstractZooKeeperHaServices.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/AbstractZooKeeperHaServices.java
index 31e2100..0b56fe2 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/AbstractZooKeeperHaServices.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/AbstractZooKeeperHaServices.java
@@ -28,8 +28,8 @@ import
org.apache.flink.runtime.highavailability.FileSystemJobResultStore;
import org.apache.flink.runtime.jobmanager.JobGraphStore;
import org.apache.flink.runtime.util.ZooKeeperUtils;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import org.apache.flink.shaded.curator4.org.apache.curator.utils.ZKPaths;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import org.apache.flink.shaded.curator5.org.apache.curator.utils.ZKPaths;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import java.io.IOException;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/CuratorFrameworkWithUnhandledErrorListener.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/CuratorFrameworkWithUnhandledErrorListener.java
index 29ad29c..2ff6028 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/CuratorFrameworkWithUnhandledErrorListener.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/CuratorFrameworkWithUnhandledErrorListener.java
@@ -20,8 +20,8 @@ package org.apache.flink.runtime.highavailability.zookeeper;
import org.apache.flink.util.Preconditions;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.api.UnhandledErrorListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.api.UnhandledErrorListener;
import java.io.Closeable;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/ZooKeeperMultipleComponentLeaderElectionHaServices.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/ZooKeeperMultipleComponentLeaderElectionHaServices.java
index b5755b9..d01bf14 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/ZooKeeperMultipleComponentLeaderElectionHaServices.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/highavailability/zookeeper/ZooKeeperMultipleComponentLeaderElectionHaServices.java
@@ -32,7 +32,7 @@ import org.apache.flink.runtime.util.ZooKeeperUtils;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.FlinkRuntimeException;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphStoreWatcher.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphStoreWatcher.java
index e6a8752..49437b9 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphStoreWatcher.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphStoreWatcher.java
@@ -20,11 +20,11 @@ package org.apache.flink.runtime.jobmanager;
import org.apache.flink.api.common.JobID;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.PathChildrenCache;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
-import org.apache.flink.shaded.curator4.org.apache.curator.utils.ZKPaths;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCache;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
+import org.apache.flink.shaded.curator5.org.apache.curator.utils.ZKPaths;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationGroupImpl.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationGroupImpl.java
index 569c52e..48d1168 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationGroupImpl.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/CoLocationGroupImpl.java
@@ -23,7 +23,7 @@ import org.apache.flink.runtime.jobgraph.JobVertexID;
import org.apache.flink.util.AbstractID;
import org.apache.flink.util.Preconditions;
-import
org.apache.flink.shaded.curator4.com.google.common.collect.ImmutableList;
+import
org.apache.flink.shaded.curator5.com.google.common.collect.ImmutableList;
import java.util.ArrayList;
import java.util.Collections;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriver.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriver.java
index 4fe02c5..7b77506 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriver.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriver.java
@@ -23,13 +23,13 @@ import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.util.ZooKeeperUtils;
import org.apache.flink.util.ExceptionUtils;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.ChildData;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.TreeCache;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.leader.LeaderLatch;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.leader.LeaderLatchListener;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionState;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionStateListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.ChildData;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCache;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.leader.LeaderLatch;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.leader.LeaderLatchListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionState;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionStateListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverFactory.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverFactory.java
index a2dce38..72175a3 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverFactory.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionDriverFactory.java
@@ -20,7 +20,7 @@ package org.apache.flink.runtime.leaderelection;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
/**
* {@link LeaderElectionDriverFactory} implementation for Zookeeper.
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriver.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriver.java
index 928bd99..ce027b9 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriver.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriver.java
@@ -23,14 +23,14 @@ import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.Preconditions;
import org.apache.flink.util.concurrent.Executors;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.ChildData;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.TreeCache;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.TreeCacheSelector;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.leader.LeaderLatch;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.leader.LeaderLatchListener;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionState;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionStateListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.ChildData;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCache;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCacheSelector;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.leader.LeaderLatch;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.leader.LeaderLatchListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionState;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionStateListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriverFactory.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriverFactory.java
index 841ebe3..ed2dffd 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriverFactory.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriverFactory.java
@@ -20,7 +20,7 @@ package org.apache.flink.runtime.leaderelection;
import org.apache.flink.util.Preconditions;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
/** Factory for {@link ZooKeeperMultipleComponentLeaderElectionDriver}. */
public class ZooKeeperMultipleComponentLeaderElectionDriverFactory
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalDriver.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalDriver.java
index 9e9c578..4718206 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalDriver.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalDriver.java
@@ -25,11 +25,11 @@ import org.apache.flink.runtime.rpc.FatalErrorHandler;
import org.apache.flink.runtime.util.ZooKeeperUtils;
import org.apache.flink.util.ExceptionUtils;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.ChildData;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.TreeCache;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionState;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionStateListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.ChildData;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCache;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionState;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionStateListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalDriverFactory.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalDriverFactory.java
index ff31840..663e425 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalDriverFactory.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalDriverFactory.java
@@ -20,7 +20,7 @@ package org.apache.flink.runtime.leaderretrieval;
import org.apache.flink.runtime.rpc.FatalErrorHandler;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
/** {@link LeaderRetrievalDriverFactory} implementation for Zookeeper. */
public class ZooKeeperLeaderRetrievalDriverFactory implements
LeaderRetrievalDriverFactory {
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandler.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandler.java
index f5df249..daf281f 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandler.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandler.java
@@ -44,7 +44,7 @@ import
org.apache.flink.runtime.webmonitor.history.JsonArchivist;
import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever;
import org.apache.flink.util.Preconditions;
-import org.apache.flink.shaded.curator4.com.google.common.collect.Iterables;
+import org.apache.flink.shaded.curator5.com.google.common.collect.Iterables;
import javax.annotation.Nullable;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/util/ZooKeeperUtils.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ZooKeeperUtils.java
index 1d8e491..c62b0c3 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/util/ZooKeeperUtils.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ZooKeeperUtils.java
@@ -56,17 +56,17 @@ import
org.apache.flink.runtime.zookeeper.ZooKeeperStateHandleStore;
import org.apache.flink.util.concurrent.Executors;
import org.apache.flink.util.function.RunnableWithException;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFrameworkFactory;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.api.ACLProvider;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.api.UnhandledErrorListener;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.imps.DefaultACLProvider;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.PathChildrenCache;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.TreeCache;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.TreeCacheListener;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.TreeCacheSelector;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.SessionConnectionStateErrorPolicy;
-import
org.apache.flink.shaded.curator4.org.apache.curator.retry.ExponentialBackoffRetry;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFrameworkFactory;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.api.ACLProvider;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.api.UnhandledErrorListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.imps.DefaultACLProvider;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCache;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCache;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCacheListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCacheSelector;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.SessionConnectionStateErrorPolicy;
+import
org.apache.flink.shaded.curator5.org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.CreateMode;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.ZooDefs;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperSharedCount.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperSharedCount.java
index 99266a0..8dfd9a0 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperSharedCount.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperSharedCount.java
@@ -20,7 +20,7 @@ package org.apache.flink.runtime.zookeeper;
import org.apache.flink.util.Preconditions;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.shared.SharedCount;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.shared.SharedCount;
import java.io.IOException;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperSharedValue.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperSharedValue.java
index feb544f..740215f 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperSharedValue.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperSharedValue.java
@@ -20,7 +20,7 @@ package org.apache.flink.runtime.zookeeper;
import org.apache.flink.util.Preconditions;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.shared.SharedValue;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.shared.SharedValue;
import java.io.IOException;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStore.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStore.java
index 25cd818..19d0f75 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStore.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStore.java
@@ -27,8 +27,8 @@ import org.apache.flink.runtime.persistence.StateHandleStore;
import org.apache.flink.runtime.state.RetrievableStateHandle;
import org.apache.flink.util.ExceptionUtils;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import org.apache.flink.shaded.curator4.org.apache.curator.utils.ZKPaths;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import org.apache.flink.shaded.curator5.org.apache.curator.utils.ZKPaths;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.CreateMode;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperVersionedValue.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperVersionedValue.java
index 1b1742e..bc42e39 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperVersionedValue.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/zookeeper/ZooKeeperVersionedValue.java
@@ -20,7 +20,7 @@ package org.apache.flink.runtime.zookeeper;
import org.apache.flink.util.Preconditions;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.shared.VersionedValue;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.shared.VersionedValue;
/**
* Wrapper class for a {@link VersionedValue} so that we don't expose a
curator dependency in our
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZKCheckpointIDCounterMultiServersTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZKCheckpointIDCounterMultiServersTest.java
index e474de3..5f303e1 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZKCheckpointIDCounterMultiServersTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZKCheckpointIDCounterMultiServersTest.java
@@ -27,8 +27,8 @@ import org.apache.flink.runtime.util.ZooKeeperUtils;
import org.apache.flink.runtime.zookeeper.ZooKeeperResource;
import org.apache.flink.util.TestLogger;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionState;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionState;
import org.junit.Rule;
import org.junit.Test;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounterITCase.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounterITCase.java
index 55ec092..a803d40 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounterITCase.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounterITCase.java
@@ -21,7 +21,7 @@ package org.apache.flink.runtime.checkpoint;
import org.apache.flink.api.common.JobStatus;
import org.apache.flink.runtime.zookeeper.ZooKeeperTestEnvironment;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
import org.junit.AfterClass;
import org.junit.Before;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java
index 65a435b..7d11cf4 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java
@@ -32,7 +32,7 @@ import org.apache.flink.util.clock.ManualClock;
import org.apache.flink.util.concurrent.Executors;
import org.apache.flink.util.concurrent.ManuallyTriggeredScheduledExecutor;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
import org.junit.AfterClass;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreTest.java
index e56f0a3..ee4f46c 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreTest.java
@@ -37,7 +37,7 @@ import
org.apache.flink.runtime.zookeeper.ZooKeeperStateHandleStore;
import org.apache.flink.util.TestLogger;
import org.apache.flink.util.concurrent.Executors;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
import org.hamcrest.Matchers;
import org.junit.ClassRule;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/ZooKeeperDefaultDispatcherRunnerTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/ZooKeeperDefaultDispatcherRunnerTest.java
index ca45d4e..1617a3c 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/ZooKeeperDefaultDispatcherRunnerTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/runner/ZooKeeperDefaultDispatcherRunnerTest.java
@@ -59,7 +59,7 @@ import org.apache.flink.testutils.TestingUtils;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.TestLogger;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
import org.junit.After;
import org.junit.Before;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/zookeeper/ZooKeeperHaServicesTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/zookeeper/ZooKeeperHaServicesTest.java
index b95fb74..770984c 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/zookeeper/ZooKeeperHaServicesTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/zookeeper/ZooKeeperHaServicesTest.java
@@ -34,9 +34,9 @@ import org.apache.flink.util.TestLogger;
import org.apache.flink.util.concurrent.Executors;
import org.apache.flink.util.function.ThrowingConsumer;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFrameworkFactory;
-import org.apache.flink.shaded.curator4.org.apache.curator.retry.RetryNTimes;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.flink.shaded.curator5.org.apache.curator.retry.RetryNTimes;
import org.junit.AfterClass;
import org.junit.Before;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphStoreWatcherTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphStoreWatcherTest.java
index e8a2f9f..fd19143 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphStoreWatcherTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphStoreWatcherTest.java
@@ -33,8 +33,8 @@ import org.apache.flink.runtime.zookeeper.ZooKeeperResource;
import org.apache.flink.runtime.zookeeper.ZooKeeperStateHandleStore;
import org.apache.flink.util.TestLogger;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.PathChildrenCache;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCache;
import org.junit.Before;
import org.junit.Rule;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphsStoreITCase.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphsStoreITCase.java
index ad5bcf8..989ee91 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphsStoreITCase.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphsStoreITCase.java
@@ -33,8 +33,8 @@ import
org.apache.flink.runtime.zookeeper.ZooKeeperTestEnvironment;
import org.apache.flink.util.InstantiationUtil;
import org.apache.flink.util.TestLogger;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.PathChildrenCache;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCache;
import org.junit.AfterClass;
import org.junit.Before;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionConnectionHandlingTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionConnectionHandlingTest.java
index 1f49f2c..e84cfc9 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionConnectionHandlingTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionConnectionHandlingTest.java
@@ -28,9 +28,9 @@ import org.apache.flink.runtime.zookeeper.ZooKeeperResource;
import org.apache.flink.util.TestLogger;
import org.apache.flink.util.function.BiConsumerWithException;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionState;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.state.ConnectionStateListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionState;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.state.ConnectionStateListener;
import org.junit.Before;
import org.junit.Rule;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionTest.java
index 45196b6..f6ae64b 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionTest.java
@@ -36,14 +36,14 @@ import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.FlinkRuntimeException;
import org.apache.flink.util.TestLogger;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFrameworkFactory;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.api.ACLProvider;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.api.CreateBuilder;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.ChildData;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.NodeCache;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.NodeCacheListener;
-import
org.apache.flink.shaded.curator4.org.apache.curator.retry.ExponentialBackoffRetry;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFrameworkFactory;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.api.ACLProvider;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.api.CreateBuilder;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.ChildData;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.NodeCache;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.NodeCacheListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.CreateMode;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.data.ACL;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriverTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriverTest.java
index 3fb38d7..140576d 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriverTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/ZooKeeperMultipleComponentLeaderElectionDriverTest.java
@@ -32,8 +32,8 @@ import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.TestLoggerExtension;
import org.apache.flink.util.function.RunnableWithException;
-import org.apache.flink.shaded.curator4.com.google.common.collect.Iterables;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import org.apache.flink.shaded.curator5.com.google.common.collect.Iterables;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalConnectionHandlingTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalConnectionHandlingTest.java
index 2ff9053..9629080 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalConnectionHandlingTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderretrieval/ZooKeeperLeaderRetrievalConnectionHandlingTest.java
@@ -29,7 +29,7 @@ import org.apache.flink.runtime.util.ZooKeeperUtils;
import org.apache.flink.util.Preconditions;
import org.apache.flink.util.TestLogger;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
import org.apache.curator.test.TestingServer;
import org.junit.After;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTest.java
index 83d4b8a..18ce166 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTest.java
@@ -22,8 +22,8 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.HighAvailabilityOptions;
import org.apache.flink.util.TestLogger;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFrameworkFactory;
-import
org.apache.flink.shaded.curator4.org.apache.curator.retry.ExponentialBackoffRetry;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFrameworkFactory;
+import
org.apache.flink.shaded.curator5.org.apache.curator.retry.ExponentialBackoffRetry;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTreeCacheTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTreeCacheTest.java
index 73a8d9b..c492253 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTreeCacheTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ZooKeeperUtilsTreeCacheTest.java
@@ -25,10 +25,10 @@ import
org.apache.flink.runtime.highavailability.zookeeper.CuratorFrameworkWithU
import org.apache.flink.runtime.rest.util.NoOpFatalErrorHandler;
import org.apache.flink.util.TestLogger;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.TreeCache;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.TreeCacheEvent;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.TreeCacheListener;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCache;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCacheEvent;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.recipes.cache.TreeCacheListener;
import org.apache.flink.shaded.guava30.com.google.common.io.Closer;
import org.apache.curator.test.TestingServer;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStoreTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStoreTest.java
index 8dee950..986b26c 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStoreTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperStateHandleStoreTest.java
@@ -33,7 +33,7 @@ import org.apache.flink.runtime.util.ZooKeeperUtils;
import org.apache.flink.util.InstantiationUtil;
import org.apache.flink.util.TestLogger;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperTestEnvironment.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperTestEnvironment.java
index c23feda..c8d7edf 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperTestEnvironment.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/zookeeper/ZooKeeperTestEnvironment.java
@@ -24,8 +24,8 @@ import
org.apache.flink.runtime.highavailability.zookeeper.CuratorFrameworkWithU
import org.apache.flink.runtime.util.ExitJVMFatalErrorHandler;
import org.apache.flink.runtime.util.ZooKeeperUtils;
-import
org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
-import org.apache.flink.shaded.curator4.org.apache.curator.utils.ZKPaths;
+import
org.apache.flink.shaded.curator5.org.apache.curator.framework.CuratorFramework;
+import org.apache.flink.shaded.curator5.org.apache.curator.utils.ZKPaths;
import org.apache.flink.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.apache.curator.test.TestingCluster;
diff --git
a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java
b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java
index 8743ebd..1e445d0 100644
---
a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java
+++
b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java
@@ -45,7 +45,7 @@ import
org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
import org.apache.flink.streaming.runtime.watermarkstatus.StatusWatermarkValve;
import org.apache.flink.streaming.runtime.watermarkstatus.WatermarkStatus;
-import org.apache.flink.shaded.curator4.com.google.common.collect.Iterables;
+import org.apache.flink.shaded.curator5.com.google.common.collect.Iterables;
import javax.annotation.Nullable;
diff --git
a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java
b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java
index 91ddada..ef71605 100644
---
a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java
+++
b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java
@@ -83,7 +83,7 @@ import java.util.stream.Stream;
import static
org.apache.flink.configuration.CheckpointingOptions.CHECKPOINTS_DIRECTORY;
import static
org.apache.flink.configuration.CheckpointingOptions.MAX_RETAINED_CHECKPOINTS;
-import static
org.apache.flink.shaded.curator4.org.apache.curator.shaded.com.google.common.base.Preconditions.checkState;
+import static
org.apache.flink.shaded.curator5.org.apache.curator.shaded.com.google.common.base.Preconditions.checkState;
import static
org.apache.flink.shaded.guava30.com.google.common.collect.Iterables.getOnlyElement;
import static org.apache.flink.test.util.TestUtils.submitJobAndWaitForResult;
diff --git a/pom.xml b/pom.xml
index 44eef02..00771eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,9 +120,9 @@ under the License.
<scala.version>2.12.7</scala.version>
<scala.binary.version>2.12</scala.binary.version>
<chill.version>0.7.6</chill.version>
- <zookeeper.version>3.4.14</zookeeper.version>
- <!-- Only the curator2 TestingServer works with ZK 3.4 -->
- <curator.version>2.12.0</curator.version>
+ <!-- keep FlinkContainersBuilder#buildZookeeperContainer() in
sync -->
+ <zookeeper.version>3.5.9</zookeeper.version>
+ <curator.version>5.2.0</curator.version>
<prometheus.version>0.8.1</prometheus.version>
<avro.version>1.10.0</avro.version>
<javax.activation.api.version>1.2.0</javax.activation.api.version>
@@ -434,7 +434,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-zookeeper-3</artifactId>
- <version>${zookeeper.version}-14.0</version>
+
<version>${zookeeper.version}-${flink.shaded.version}</version>
</dependency>
<!-- This manages the 'javax.annotation' annotations
(JSR305) -->
@@ -724,10 +724,10 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <!-- Netty is only needed for ZK
servers, not clients -->
<exclusion>
+ <!-- Netty is an optional
dependency, that we currently do not make use of. -->
<groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<!-- jline is optional for ZK console
shell -->
<exclusion>
