From 3bb60b7671ed786c4524268ae95242dab0533bb5 Mon Sep 17 00:00:00 2001
From: David Anderson <david@alpinegizmo.com>
Date: Wed, 15 Apr 2026 18:40:31 -0700
Subject: [PATCH 1/2] [FLINK-39443][release] Update master to 2.4-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6434cf1..00b0146 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@ under the License.
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<flink.version>2.3-SNAPSHOT</flink.version>
+		<flink.version>2.4-SNAPSHOT</flink.version>
 		<flink.shaded.version>20.0</flink.shaded.version>
 		<netty.tcnative.version>2.0.62.Final</netty.tcnative.version>
 		<java.version>1.8</java.version>

From 43c0b5ab0e9a2a92e81781cbf8b1f4c8a7d044b1 Mon Sep 17 00:00:00 2001
From: Roc Marshal <hipanyuepeng@gmail.com>
Date: Wed, 22 Apr 2026 16:02:36 +0800
Subject: [PATCH 2/2] s

Disabled the ssl
---
 .../org/apache/flink/benchmark/FlinkEnvironmentContext.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/apache/flink/benchmark/FlinkEnvironmentContext.java b/src/main/java/org/apache/flink/benchmark/FlinkEnvironmentContext.java
index c3fa19c..439da2c 100644
--- a/src/main/java/org/apache/flink/benchmark/FlinkEnvironmentContext.java
+++ b/src/main/java/org/apache/flink/benchmark/FlinkEnvironmentContext.java
@@ -35,6 +35,7 @@
 
 import java.time.Duration;
 
+import static org.apache.flink.configuration.NettyShuffleEnvironmentOptions.DATA_SSL_ENABLED;
 import static org.apache.flink.configuration.ResourceManagerOptions.REQUIREMENTS_CHECK_DELAY;
 import static org.openjdk.jmh.annotations.Scope.Thread;
 
@@ -53,6 +54,7 @@ public void setUp() throws Exception {
             throw new RuntimeException("setUp was called multiple times!");
         }
         final Configuration clusterConfig = createConfiguration();
+        clusterConfig.set(DATA_SSL_ENABLED, false);
         clusterConfig.set(RestartStrategyOptions.RESTART_STRATEGY, "none");
         clusterConfig.set(StateBackendOptions.STATE_BACKEND, "hashmap");
         miniCluster =