From a2be20b3c2b7b475da785f4920e80f6c18d3b878 Mon Sep 17 00:00:00 2001 From: includetts <117636492+includetts@users.noreply.github.com> Date: Fri, 17 Apr 2026 18:02:49 +0800 Subject: [PATCH 01/12] Update dependency versions for Aliyun Spark and credentialsfix: upgrade datasource plugin emr SDK to 2.4.1 and credentials-java to 1.0.1 --- .../dolphinscheduler-datasource-aliyunserverlessspark/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml index a4f98148e611..ce34b21f382a 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml @@ -54,13 +54,13 @@ com.aliyun emr_serverless_spark20230808 - 1.0.0 + 2.4.1 com.aliyun credentials-java - 0.3.0 + 1.0.1 From 9f5815fc7f51a6043aaa01abf2c312960214ba56 Mon Sep 17 00:00:00 2001 From: includetts <117636492+includetts@users.noreply.github.com> Date: Fri, 17 Apr 2026 18:17:13 +0800 Subject: [PATCH 02/12] fix: propagate exception cause in AliyunServerlessSparkTask catch blocks --- .../aliyunserverlessspark/AliyunServerlessSparkTask.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java index 15f5ea25a23c..ed67c35ce715 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java @@ -118,7 +118,7 @@ public void init() { buildAliyunServerlessSparkClient(accessKeyId, accessKeySecret, regionId, endpoint); } catch (Exception e) { log.error("Failed to build Aliyun-Serverless-Spark client!", e); - throw new AliyunServerlessSparkTaskException("Failed to build Aliyun-Serverless-Spark client!"); + throw new AliyunServerlessSparkTaskException("Failed to build Aliyun-Serverless-Spark client! " + e.getMessage(), e); } currentState = RunState.Submitted; @@ -154,7 +154,7 @@ public void handle(TaskCallBack taskCallBack) throws TaskException { return aliyunServerlessSparkClient.startJobRun( aliyunServerlessSparkParameters.getWorkspaceId(), startJobRunRequest); } catch (Exception e) { - throw new AliyunServerlessSparkTaskException("Failed to start job run!"); + throw new AliyunServerlessSparkTaskException("Failed to start job run! " + e.getMessage(), e); } }, retryPolicy); @@ -224,7 +224,7 @@ public void cancelApplication() throws TaskException { aliyunServerlessSparkParameters.getWorkspaceId(), jobRunId, cancelJobRunRequest); } catch (Exception e) { - throw new AliyunServerlessSparkTaskException("Failed to cancel job run!"); + throw new AliyunServerlessSparkTaskException("Failed to cancel job run! " + e.getMessage(), e); } }, retryPolicy); } From 8b3f531ec3e039fe555a3378f15e5ca389d345b8 Mon Sep 17 00:00:00 2001 From: includetts <117636492+includetts@users.noreply.github.com> Date: Fri, 17 Apr 2026 18:18:05 +0800 Subject: [PATCH 03/12] fix: upgrade task plugin credentials-java to 1.0.1 --- .../dolphinscheduler-task-aliyunserverlessspark/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml index 77337f9837f1..9ffd35807271 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml @@ -73,7 +73,7 @@ com.aliyun credentials-java - 0.3.0 + 1.0.1 From 51bab544f6b08b53ec61bea7d5210f365ceeee14 Mon Sep 17 00:00:00 2001 From: includetts <117636492+includetts@users.noreply.github.com> Date: Mon, 20 Apr 2026 10:08:16 +0800 Subject: [PATCH 04/12] refactor: use properties to manage dependency versions in datasource plugin --- .../pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml index ce34b21f382a..e8f1d8737e1a 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml @@ -30,6 +30,8 @@ datasource.aliyun.serverlessspark + 2.4.1 + 1.0.1 @@ -54,13 +56,13 @@ com.aliyun emr_serverless_spark20230808 - 2.4.1 + ${emr-serverless-spark.version} com.aliyun credentials-java - 1.0.1 + ${credentials-java.version} From bb7d91842fc4f00edbc5a0ed89130c2f3db862ab Mon Sep 17 00:00:00 2001 From: includetts <117636492+includetts@users.noreply.github.com> Date: Mon, 20 Apr 2026 10:10:40 +0800 Subject: [PATCH 05/12] refactor: use properties to manage dependency versions in task plugin --- .../dolphinscheduler-task-aliyunserverlessspark/pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml index 9ffd35807271..51809818e8d7 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml @@ -28,6 +28,8 @@ task.aliyun.serverlessspark + 2.4.1 + 1.0.1 @@ -67,13 +69,13 @@ com.aliyun emr_serverless_spark20230808 - 2.4.1 + ${emr-serverless-spark.version} com.aliyun credentials-java - 1.0.1 + ${credentials-java.version} From 7599bf43838e6549f0033ca5937f0ee3466cb488 Mon Sep 17 00:00:00 2001 From: includetts <117636492+includetts@users.noreply.github.com> Date: Mon, 20 Apr 2026 10:15:52 +0800 Subject: [PATCH 06/12] revert: remove exception cause propagation per review feedback --- .../task/aliyunserverlessspark/AliyunServerlessSparkTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java index ed67c35ce715..6781d264eb70 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java @@ -118,7 +118,7 @@ public void init() { buildAliyunServerlessSparkClient(accessKeyId, accessKeySecret, regionId, endpoint); } catch (Exception e) { log.error("Failed to build Aliyun-Serverless-Spark client!", e); - throw new AliyunServerlessSparkTaskException("Failed to build Aliyun-Serverless-Spark client! " + e.getMessage(), e); + throw new AliyunServerlessSparkTaskException("Failed to build Aliyun-Serverless-Spark client!"); } currentState = RunState.Submitted; From 7713ad8ef595e86ac594daf7620f7bf8f6190627 Mon Sep 17 00:00:00 2001 From: includetts <117636492+includetts@users.noreply.github.com> Date: Mon, 20 Apr 2026 15:10:17 +0800 Subject: [PATCH 07/12] fix e.getMessage() and e are duplicated. You just need to keep one Update exception message to include the exception object instead of the message. --- .../task/aliyunserverlessspark/AliyunServerlessSparkTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java index 6781d264eb70..8ce1b1ace88b 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java @@ -224,7 +224,7 @@ public void cancelApplication() throws TaskException { aliyunServerlessSparkParameters.getWorkspaceId(), jobRunId, cancelJobRunRequest); } catch (Exception e) { - throw new AliyunServerlessSparkTaskException("Failed to cancel job run! " + e.getMessage(), e); + throw new AliyunServerlessSparkTaskException("Failed to cancel job run! " + e); } }, retryPolicy); } From 97091165654c081d433e981e50cb30ae924c9dba Mon Sep 17 00:00:00 2001 From: includetts <117636492+includetts@users.noreply.github.com> Date: Mon, 20 Apr 2026 15:13:42 +0800 Subject: [PATCH 08/12] fixe getMessage() and e are duplicated. You just need to keep one. Remove exception message concatenation for clarity. --- .../task/aliyunserverlessspark/AliyunServerlessSparkTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java index 8ce1b1ace88b..591625eb4f54 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java @@ -154,7 +154,7 @@ public void handle(TaskCallBack taskCallBack) throws TaskException { return aliyunServerlessSparkClient.startJobRun( aliyunServerlessSparkParameters.getWorkspaceId(), startJobRunRequest); } catch (Exception e) { - throw new AliyunServerlessSparkTaskException("Failed to start job run! " + e.getMessage(), e); + throw new AliyunServerlessSparkTaskException("Failed to start job run! " , e); } }, retryPolicy); From 6b870cc261cfbe0fa64dd9d5952639f4fa264ff1 Mon Sep 17 00:00:00 2001 From: includetts <117636492+includetts@users.noreply.github.com> Date: Mon, 20 Apr 2026 15:14:41 +0800 Subject: [PATCH 09/12] Fix exception handling in cancelJobRun method --- .../task/aliyunserverlessspark/AliyunServerlessSparkTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java index 591625eb4f54..7cfd920ea661 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java @@ -224,7 +224,7 @@ public void cancelApplication() throws TaskException { aliyunServerlessSparkParameters.getWorkspaceId(), jobRunId, cancelJobRunRequest); } catch (Exception e) { - throw new AliyunServerlessSparkTaskException("Failed to cancel job run! " + e); + throw new AliyunServerlessSparkTaskException("Failed to cancel job run! " , e); } }, retryPolicy); } From 9e75422f729d877c2584b61f23805d26cd932e63 Mon Sep 17 00:00:00 2001 From: includetts <117636492+includetts@users.noreply.github.com> Date: Mon, 20 Apr 2026 17:21:11 +0800 Subject: [PATCH 10/12] Fix formatting of exception messages in AliyunServerlessSparkTask --- .../task/aliyunserverlessspark/AliyunServerlessSparkTask.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java index 7cfd920ea661..8263b3cb7fe5 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java @@ -154,7 +154,7 @@ public void handle(TaskCallBack taskCallBack) throws TaskException { return aliyunServerlessSparkClient.startJobRun( aliyunServerlessSparkParameters.getWorkspaceId(), startJobRunRequest); } catch (Exception e) { - throw new AliyunServerlessSparkTaskException("Failed to start job run! " , e); + throw new AliyunServerlessSparkTaskException("Failed to start job run! ", e); } }, retryPolicy); @@ -224,7 +224,7 @@ public void cancelApplication() throws TaskException { aliyunServerlessSparkParameters.getWorkspaceId(), jobRunId, cancelJobRunRequest); } catch (Exception e) { - throw new AliyunServerlessSparkTaskException("Failed to cancel job run! " , e); + throw new AliyunServerlessSparkTaskException("Failed to cancel job run! ", e); } }, retryPolicy); } From c02ed5076363eb7ac0b0b9eae87b0523d7eb55a3 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Sun, 3 May 2026 10:31:02 +0800 Subject: [PATCH 11/12] unified pom version --- .idea/vcs.xml | 20 +++---------------- dolphinscheduler-bom/pom.xml | 14 +++++++++++++ .../pom.xml | 4 ---- .../pom.xml | 4 ---- 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index a02c174e4bf9..d7d413a110b0 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,20 +1,4 @@ - + + - + \ No newline at end of file diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml index 22f5e23a3be2..72fd2f79348e 100644 --- a/dolphinscheduler-bom/pom.xml +++ b/dolphinscheduler-bom/pom.xml @@ -129,6 +129,8 @@ 7.0.0 3.0.0 2.11.0 + 2.4.1 + 1.0.1 @@ -959,6 +961,18 @@ test + + com.aliyun + emr_serverless_spark20230808 + ${emr-serverless-spark.version} + + + + com.aliyun + credentials-java + ${credentials-java.version} + + org.testcontainers diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml index e8f1d8737e1a..3e3155243481 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml @@ -30,8 +30,6 @@ datasource.aliyun.serverlessspark - 2.4.1 - 1.0.1 @@ -56,13 +54,11 @@ com.aliyun emr_serverless_spark20230808 - ${emr-serverless-spark.version} com.aliyun credentials-java - ${credentials-java.version} diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml index 51809818e8d7..60e74d60a235 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml @@ -28,8 +28,6 @@ task.aliyun.serverlessspark - 2.4.1 - 1.0.1 @@ -69,13 +67,11 @@ com.aliyun emr_serverless_spark20230808 - ${emr-serverless-spark.version} com.aliyun credentials-java - ${credentials-java.version} From dfb4f797f959719b18b3183dacf229bad40c45ad Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Sun, 3 May 2026 10:31:43 +0800 Subject: [PATCH 12/12] unified pom version --- .idea/vcs.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index d7d413a110b0..a02c174e4bf9 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,4 +1,20 @@ + - - - \ No newline at end of file +