From 9887ee61cbf68442e0cd1c50f1998ed1fffaa0fb Mon Sep 17 00:00:00 2001 From: binitshrest Date: Thu, 5 Sep 2024 17:40:29 +0530 Subject: [PATCH 01/34] Removed Spring-boot-starter-cache dependencies --- .../dao/mapper/WorkflowDefinitionLogMapper.java | 7 ++----- .../datasource/api/datasource/BaseDataSourceParamDTO.java | 2 +- .../src/main/resources/application.yaml | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java index 64afb292bec9..83ebb6f31b74 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java @@ -23,9 +23,6 @@ import java.util.List; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.Cacheable; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -33,7 +30,7 @@ /** * workflow definition log mapper interface */ -@CacheConfig(cacheNames = "processDefinition", keyGenerator = "cacheKeyGenerator") +// @CacheConfig(cacheNames = "processDefinition", keyGenerator = "cacheKeyGenerator") public interface WorkflowDefinitionLogMapper extends BaseMapper { /** @@ -43,7 +40,7 @@ public interface WorkflowDefinitionLogMapper extends BaseMapper Date: Thu, 5 Sep 2024 17:40:29 +0530 Subject: [PATCH 02/34] Removed Spring-boot-starter-cache dependencies --- .../dao/mapper/WorkflowDefinitionLogMapper.java | 7 ++----- .../datasource/api/datasource/BaseDataSourceParamDTO.java | 2 +- .../src/main/resources/application.yaml | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java index 64afb292bec9..83ebb6f31b74 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java @@ -23,9 +23,6 @@ import java.util.List; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.Cacheable; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -33,7 +30,7 @@ /** * workflow definition log mapper interface */ -@CacheConfig(cacheNames = "processDefinition", keyGenerator = "cacheKeyGenerator") +// @CacheConfig(cacheNames = "processDefinition", keyGenerator = "cacheKeyGenerator") public interface WorkflowDefinitionLogMapper extends BaseMapper { /** @@ -43,7 +40,7 @@ public interface WorkflowDefinitionLogMapper extends BaseMapper Date: Fri, 6 Sep 2024 11:30:31 +0530 Subject: [PATCH 03/34] Removed cacheable and cacheconfig of spring-boot-starter-cache --- .../dao/mapper/WorkflowDefinitionLogMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java index 514ff6ba0869..e050d0fd6024 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkflowDefinitionLogMapper.java @@ -30,7 +30,7 @@ /** * workflow definition log mapper interface */ -// @CacheConfig(cacheNames = "processDefinition", keyGenerator = "cacheKeyGenerator") + public interface WorkflowDefinitionLogMapper extends BaseMapper { /** @@ -40,7 +40,7 @@ public interface WorkflowDefinitionLogMapper extends BaseMapper Date: Fri, 6 Sep 2024 14:11:29 +0530 Subject: [PATCH 04/34] Removed cacheable and cacheconfig of removed spring-boot-starter-cache from ds-master --- dolphinscheduler-master/pom.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dolphinscheduler-master/pom.xml b/dolphinscheduler-master/pom.xml index 43aeb53a20c5..b25fd5ae1c07 100644 --- a/dolphinscheduler-master/pom.xml +++ b/dolphinscheduler-master/pom.xml @@ -89,21 +89,6 @@ dolphinscheduler-eventbus ${project.version} - - - org.springframework.boot - spring-boot-starter-cache - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - - org.codehaus.janino janino From e4f4a8dd13537276c62574586e661d9b4f5efa67 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Fri, 6 Sep 2024 14:22:29 +0530 Subject: [PATCH 05/34] Removed cacheable and cacheconfig of removed spring-boot-starter-cache dependencies --- dolphinscheduler-dist/release-docs/LICENSE | 1 - tools/dependencies/known-dependencies.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index a4cdfeadabbc..68f5db94ab9f 100644 --- a/dolphinscheduler-dist/release-docs/LICENSE +++ b/dolphinscheduler-dist/release-docs/LICENSE @@ -379,7 +379,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt. spring-boot-starter-logging 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-logging/2.7.3, Apache 2.0 spring-boot-starter-quartz 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-quartz/2.7.3, Apache 2.0 spring-boot-starter-web 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web/2.7.3, Apache 2.0 - spring-boot-starter-cache 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-cache/2.7.3, Apache 2.0 spring-context 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-context/5.3.22, Apache 2.0 spring-context-support 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-context-support/5.3.13, Apache 2.0 spring-core 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-core/5.3.22, Apache 2.0 diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index c6780804d4f1..3bb604c4dcb4 100644 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -291,7 +291,6 @@ spring-boot-configuration-processor-2.6.1.jar spring-boot-starter-2.7.3.jar spring-boot-starter-actuator-2.7.3.jar spring-boot-starter-aop-2.7.3.jar -spring-boot-starter-cache-2.7.3.jar spring-boot-starter-jdbc-2.7.3.jar spring-boot-starter-jetty-2.7.3.jar spring-boot-starter-json-2.7.3.jar From 8c0ae9e28674f683004057d02ef59a2513166e6c Mon Sep 17 00:00:00 2001 From: binitshrest Date: Mon, 9 Sep 2024 18:48:24 +0530 Subject: [PATCH 06/34] Removed cacheable and cacheconfig of removed spring-boot-starter-cache dependencies --- dolphinscheduler-api/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index 40d556a17ed3..413f6c24eb54 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -121,10 +121,6 @@ org.springframework.boot spring-boot-starter-tomcat - - org.apache.logging.log4j - log4j-to-slf4j - From cc81bbb257b5e3c0965ca954c1d2aa14855837a3 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Mon, 9 Sep 2024 19:04:54 +0530 Subject: [PATCH 07/34] Removed cacheable and cacheconfig of removed spring-boot-starter-cache dependencies --- dolphinscheduler-bom/pom.xml | 4 ---- dolphinscheduler-dao/pom.xml | 12 ++++-------- .../dolphinscheduler-datasource-hive/pom.xml | 4 ---- dolphinscheduler-dist/release-docs/LICENSE | 1 - dolphinscheduler-master/pom.xml | 1 + dolphinscheduler-meter/pom.xml | 4 ---- .../dolphinscheduler-registry-jdbc/pom.xml | 6 ------ .../dolphinscheduler-task-api/pom.xml | 4 ---- dolphinscheduler-worker/pom.xml | 4 ---- 9 files changed, 5 insertions(+), 35 deletions(-) diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml index b7efb4815cf1..b6a0066d0981 100644 --- a/dolphinscheduler-bom/pom.xml +++ b/dolphinscheduler-bom/pom.xml @@ -927,10 +927,6 @@ org.apache.logging.log4j log4j-core - - org.apache.logging.log4j - log4j-api - diff --git a/dolphinscheduler-dao/pom.xml b/dolphinscheduler-dao/pom.xml index f46817c0cc0c..bd06e3267e0e 100644 --- a/dolphinscheduler-dao/pom.xml +++ b/dolphinscheduler-dao/pom.xml @@ -63,10 +63,6 @@ org.springframework.boot spring-boot-starter-tomcat - - org.apache.logging.log4j - log4j-to-slf4j - @@ -82,10 +78,10 @@ com.baomidou mybatis-plus-boot-starter - - org.apache.logging.log4j - log4j-to-slf4j - + + + + diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml index bcc11a66181b..0891f88cc234 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml @@ -296,10 +296,6 @@ javax.servlet jsp-api - - org.apache.logging.log4j - log4j-api - org.apache.logging.log4j log4j-core diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index 68f5db94ab9f..f030f7dfc17a 100644 --- a/dolphinscheduler-dist/release-docs/LICENSE +++ b/dolphinscheduler-dist/release-docs/LICENSE @@ -338,7 +338,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt. kerby-xdr 1.0.1: https://mvnrepository.com/artifact/org.apache.kerby/kerby-xdr/1.0.1, Apache 2.0 libfb303 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libfb303/0.9.3, Apache 2.0 libthrift 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libthrift/0.9.3, Apache 2.0 - log4j-api 2.11.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/2.11.2, Apache 2.0 log4j-core-2.11.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/2.11.2, Apache 2.0 log4j-1.2-api 2.17.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api/2.17.2, Apache 2.0 lz4 1.3.0: https://mvnrepository.com/artifact/net.jpountz.lz4/lz4/1.3.0, Apache 2.0 diff --git a/dolphinscheduler-master/pom.xml b/dolphinscheduler-master/pom.xml index b25fd5ae1c07..17a276e670db 100644 --- a/dolphinscheduler-master/pom.xml +++ b/dolphinscheduler-master/pom.xml @@ -89,6 +89,7 @@ dolphinscheduler-eventbus ${project.version} + org.codehaus.janino janino diff --git a/dolphinscheduler-meter/pom.xml b/dolphinscheduler-meter/pom.xml index af3771972113..5b66bcda76e1 100644 --- a/dolphinscheduler-meter/pom.xml +++ b/dolphinscheduler-meter/pom.xml @@ -66,10 +66,6 @@ org.springframework.boot spring-boot-starter-tomcat - - org.apache.logging.log4j - log4j-to-slf4j - diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml index aa592b9da450..baeb25b77976 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml @@ -65,12 +65,6 @@ com.baomidou mybatis-plus-boot-starter - - - org.apache.logging.log4j - log4j-to-slf4j - - diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml index 7c8f24c71715..d3c5783b6048 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml @@ -263,10 +263,6 @@ javax.servlet jsp-api - - org.apache.logging.log4j - log4j-api - org.apache.logging.log4j log4j-core diff --git a/dolphinscheduler-worker/pom.xml b/dolphinscheduler-worker/pom.xml index fd67751ff2fc..1089d849eacb 100644 --- a/dolphinscheduler-worker/pom.xml +++ b/dolphinscheduler-worker/pom.xml @@ -162,10 +162,6 @@ org.springframework.boot spring-boot-starter-tomcat - - org.apache.logging.log4j - log4j-to-slf4j - From 1ab0f9f57a5e82234ec4d22ebc0920245f26589a Mon Sep 17 00:00:00 2001 From: binitshrest Date: Sun, 15 Sep 2024 17:22:23 +0530 Subject: [PATCH 08/34] Revert "Reverting some codes that is bugging" This reverts commit cc81bbb257b5e3c0965ca954c1d2aa14855837a3. --- dolphinscheduler-bom/pom.xml | 4 ++++ dolphinscheduler-dao/pom.xml | 12 ++++++++---- .../dolphinscheduler-datasource-hive/pom.xml | 4 ++++ dolphinscheduler-dist/release-docs/LICENSE | 1 + dolphinscheduler-master/pom.xml | 1 - dolphinscheduler-meter/pom.xml | 4 ++++ .../dolphinscheduler-registry-jdbc/pom.xml | 6 ++++++ .../dolphinscheduler-task-api/pom.xml | 4 ++++ dolphinscheduler-worker/pom.xml | 4 ++++ 9 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml index b6a0066d0981..b7efb4815cf1 100644 --- a/dolphinscheduler-bom/pom.xml +++ b/dolphinscheduler-bom/pom.xml @@ -927,6 +927,10 @@ org.apache.logging.log4j log4j-core + + org.apache.logging.log4j + log4j-api + diff --git a/dolphinscheduler-dao/pom.xml b/dolphinscheduler-dao/pom.xml index bd06e3267e0e..f46817c0cc0c 100644 --- a/dolphinscheduler-dao/pom.xml +++ b/dolphinscheduler-dao/pom.xml @@ -63,6 +63,10 @@ org.springframework.boot spring-boot-starter-tomcat + + org.apache.logging.log4j + log4j-to-slf4j + @@ -78,10 +82,10 @@ com.baomidou mybatis-plus-boot-starter - - - - + + org.apache.logging.log4j + log4j-to-slf4j + diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml index 0891f88cc234..bcc11a66181b 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml @@ -296,6 +296,10 @@ javax.servlet jsp-api + + org.apache.logging.log4j + log4j-api + org.apache.logging.log4j log4j-core diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index f030f7dfc17a..68f5db94ab9f 100644 --- a/dolphinscheduler-dist/release-docs/LICENSE +++ b/dolphinscheduler-dist/release-docs/LICENSE @@ -338,6 +338,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. kerby-xdr 1.0.1: https://mvnrepository.com/artifact/org.apache.kerby/kerby-xdr/1.0.1, Apache 2.0 libfb303 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libfb303/0.9.3, Apache 2.0 libthrift 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libthrift/0.9.3, Apache 2.0 + log4j-api 2.11.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/2.11.2, Apache 2.0 log4j-core-2.11.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/2.11.2, Apache 2.0 log4j-1.2-api 2.17.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api/2.17.2, Apache 2.0 lz4 1.3.0: https://mvnrepository.com/artifact/net.jpountz.lz4/lz4/1.3.0, Apache 2.0 diff --git a/dolphinscheduler-master/pom.xml b/dolphinscheduler-master/pom.xml index 17a276e670db..b25fd5ae1c07 100644 --- a/dolphinscheduler-master/pom.xml +++ b/dolphinscheduler-master/pom.xml @@ -89,7 +89,6 @@ dolphinscheduler-eventbus ${project.version} - org.codehaus.janino janino diff --git a/dolphinscheduler-meter/pom.xml b/dolphinscheduler-meter/pom.xml index 5b66bcda76e1..af3771972113 100644 --- a/dolphinscheduler-meter/pom.xml +++ b/dolphinscheduler-meter/pom.xml @@ -66,6 +66,10 @@ org.springframework.boot spring-boot-starter-tomcat + + org.apache.logging.log4j + log4j-to-slf4j + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml index baeb25b77976..aa592b9da450 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml @@ -65,6 +65,12 @@ com.baomidou mybatis-plus-boot-starter + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml index d3c5783b6048..7c8f24c71715 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml @@ -263,6 +263,10 @@ javax.servlet jsp-api + + org.apache.logging.log4j + log4j-api + org.apache.logging.log4j log4j-core diff --git a/dolphinscheduler-worker/pom.xml b/dolphinscheduler-worker/pom.xml index 1089d849eacb..fd67751ff2fc 100644 --- a/dolphinscheduler-worker/pom.xml +++ b/dolphinscheduler-worker/pom.xml @@ -162,6 +162,10 @@ org.springframework.boot spring-boot-starter-tomcat + + org.apache.logging.log4j + log4j-to-slf4j + From 1ac7f40c4068b06d3d702e9413540f8de51f9691 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Mon, 16 Sep 2024 12:12:42 +0530 Subject: [PATCH 09/34] Revert "Reverting some codes that is bugging" This reverts commit cc81bbb257b5e3c0965ca954c1d2aa14855837a3. --- .../datasource/BaseDataSourceParamDTO.java | 2 +- dolphinscheduler-ui/pnpm-lock.yaml | 24 ++++--------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/BaseDataSourceParamDTO.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/BaseDataSourceParamDTO.java index a32c812cbc96..f0c0a16ae829 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/BaseDataSourceParamDTO.java +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/BaseDataSourceParamDTO.java @@ -117,7 +117,7 @@ public void setHostAndPortByAddress(String address) { } this.host = String.join(Constants.COMMA, hosts); - this.port = (Integer) Integer.parseInt(portString); + this.port = Integer.parseInt(portString); } public String getDatabase() { diff --git a/dolphinscheduler-ui/pnpm-lock.yaml b/dolphinscheduler-ui/pnpm-lock.yaml index 3fc9f1c79d1c..ad56c68e3471 100644 --- a/dolphinscheduler-ui/pnpm-lock.yaml +++ b/dolphinscheduler-ui/pnpm-lock.yaml @@ -1,20 +1,4 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -lockfileVersion: 5.4 +lockfileVersion: 5.3 specifiers: '@antv/layout': 0.1.31 @@ -73,7 +57,7 @@ dependencies: echarts: 5.4.2 js-cookie: 3.0.5 lodash: 4.17.21 - monaco-editor: 0.34.1 + monaco-editor: 0.50.0 naive-ui: 2.33.5_vue@3.3.4 nprogress: 0.2.0 pinia: 2.1.4_typescript@4.9.5+vue@3.3.4 @@ -2724,8 +2708,8 @@ packages: ml-array-rescale: 1.3.7 dev: false - /monaco-editor/0.34.1: - resolution: {integrity: sha512-FKc80TyiMaruhJKKPz5SpJPIjL+dflGvz4CpuThaPMc94AyN7SeC9HQ8hrvaxX7EyHdJcUY5i4D0gNyJj1vSZQ==} + /monaco-editor/0.50.0: + resolution: {integrity: sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==} dev: false /mousetrap/1.6.5: From 11d10509dbf49c6ee3599f069c23caf0d0baf867 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Wed, 9 Oct 2024 12:00:31 +0530 Subject: [PATCH 10/34] renewed monaco-editor version --- dolphinscheduler-ui/pnpm-lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-ui/pnpm-lock.yaml b/dolphinscheduler-ui/pnpm-lock.yaml index ad56c68e3471..adc9fa643fcc 100644 --- a/dolphinscheduler-ui/pnpm-lock.yaml +++ b/dolphinscheduler-ui/pnpm-lock.yaml @@ -57,7 +57,7 @@ dependencies: echarts: 5.4.2 js-cookie: 3.0.5 lodash: 4.17.21 - monaco-editor: 0.50.0 + monaco-editor: 0.34.1 naive-ui: 2.33.5_vue@3.3.4 nprogress: 0.2.0 pinia: 2.1.4_typescript@4.9.5+vue@3.3.4 From 11f5d16bbef33686a007c6958f889c4e92c95b24 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Wed, 9 Oct 2024 12:14:45 +0530 Subject: [PATCH 11/34] added some changes that was removed earlier --- dolphinscheduler-api/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index 76e377c45f4e..7afcf6b89494 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -121,6 +121,10 @@ org.springframework.boot spring-boot-starter-tomcat + + org.apache.logging.log4j + log4j-to-slf4j + From 2f4f8ed59130cbee8596859abd23d2b3ff2b0924 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Wed, 9 Oct 2024 12:17:52 +0530 Subject: [PATCH 12/34] reviewed some changes --- .../src/main/resources/application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-standalone-server/src/main/resources/application.yaml b/dolphinscheduler-standalone-server/src/main/resources/application.yaml index 830949ff20bf..97b9b6d22d0c 100644 --- a/dolphinscheduler-standalone-server/src/main/resources/application.yaml +++ b/dolphinscheduler-standalone-server/src/main/resources/application.yaml @@ -1,4 +1,4 @@ - # +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. From a166d16d2c6bf9f6bf0eb9b03a2c09660a0951b4 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Wed, 9 Oct 2024 12:26:02 +0530 Subject: [PATCH 13/34] reviewed some changes and updated it --- dolphinscheduler-ui/pnpm-lock.yaml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-ui/pnpm-lock.yaml b/dolphinscheduler-ui/pnpm-lock.yaml index adc9fa643fcc..fab34bfaafc3 100644 --- a/dolphinscheduler-ui/pnpm-lock.yaml +++ b/dolphinscheduler-ui/pnpm-lock.yaml @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. lockfileVersion: 5.3 specifiers: @@ -2708,8 +2724,8 @@ packages: ml-array-rescale: 1.3.7 dev: false - /monaco-editor/0.50.0: - resolution: {integrity: sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==} + /monaco-editor/0.34.1: + resolution: {integrity: sha512-FKc80TyiMaruhJKKPz5SpJPIjL+dflGvz4CpuThaPMc94AyN7SeC9HQ8hrvaxX7EyHdJcUY5i4D0gNyJj1vSZQ==} dev: false /mousetrap/1.6.5: From 346b0f05226d10073a9b93e6ad25422388de8320 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Wed, 9 Oct 2024 13:17:27 +0530 Subject: [PATCH 14/34] changes made that was asked --- dolphinscheduler-ui/pnpm-lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-ui/pnpm-lock.yaml b/dolphinscheduler-ui/pnpm-lock.yaml index fab34bfaafc3..3fc9f1c79d1c 100644 --- a/dolphinscheduler-ui/pnpm-lock.yaml +++ b/dolphinscheduler-ui/pnpm-lock.yaml @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -lockfileVersion: 5.3 +lockfileVersion: 5.4 specifiers: '@antv/layout': 0.1.31 From e6506cafdc1be2f07066cd05fd5c1f0db4327ea7 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Thu, 10 Oct 2024 13:37:03 +0530 Subject: [PATCH 15/34] read the documentatation of tools->release and implemented --- tools/release/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/release/README.md b/tools/release/README.md index 4e8718f98544..cb2d35c3d487 100644 --- a/tools/release/README.md +++ b/tools/release/README.md @@ -21,8 +21,8 @@ You can create new token in [create token](https://docs.github.com/en/authentica it is only need all permission under `repo` ```shell -export GH_ACCESS_TOKEN="" -export GH_REPO_MILESTONE="" +export GH_ACCESS_TOKEN=$(grep GH_ACCESS_TOKEN .env.txt | cut -d '=' -f 2) +export GH_REPO_MILESTONE=$(grep GH_REPO_MILESTONE .env.txt | cut -d '=' -f 2) ``` ### Help From 1d11fe7636b6365e24adbcb0d1be2c47fa0b0ff0 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Thu, 10 Oct 2024 16:30:25 +0530 Subject: [PATCH 16/34] kept some files in gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index fcf292d66eda..38702b3fdd43 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,6 @@ dolphinscheduler-master/logs dolphinscheduler-api/logs __pycache__ ds_schema_check_test +.env.txt +venv +myenv From 670f1b8053c4b0436d730689aedab2670b525091 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Thu, 10 Oct 2024 18:06:38 +0530 Subject: [PATCH 17/34] changing readme file --- tools/release/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/release/README.md b/tools/release/README.md index cb2d35c3d487..4e8718f98544 100644 --- a/tools/release/README.md +++ b/tools/release/README.md @@ -21,8 +21,8 @@ You can create new token in [create token](https://docs.github.com/en/authentica it is only need all permission under `repo` ```shell -export GH_ACCESS_TOKEN=$(grep GH_ACCESS_TOKEN .env.txt | cut -d '=' -f 2) -export GH_REPO_MILESTONE=$(grep GH_REPO_MILESTONE .env.txt | cut -d '=' -f 2) +export GH_ACCESS_TOKEN="" +export GH_REPO_MILESTONE="" ``` ### Help From 0da86b4f58eccd3203019f1214c4f818ebe1d2de Mon Sep 17 00:00:00 2001 From: binitshrest Date: Fri, 11 Oct 2024 08:36:37 +0530 Subject: [PATCH 18/34] made changes --- tools/release/release.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/release/release.py b/tools/release/release.py index 32b6f86a3833..20d746ed0348 100644 --- a/tools/release/release.py +++ b/tools/release/release.py @@ -26,6 +26,7 @@ from github.user import User + def get_changelog(access_token: str, milestone: str) -> str: """Get changelog in specific milestone from GitHub Restful API.""" pr = PullRequest(token=access_token) From fd3a408029e859fc3d2115f8fced441bb7c49648 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Fri, 11 Oct 2024 08:38:09 +0530 Subject: [PATCH 19/34] made changes --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 38702b3fdd43..75b6983a4684 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,4 @@ dolphinscheduler-master/logs dolphinscheduler-api/logs __pycache__ ds_schema_check_test -.env.txt -venv -myenv + From 3b9c48a548df3528ae80de36ec196e1829e75cbf Mon Sep 17 00:00:00 2001 From: binitshrest Date: Fri, 11 Oct 2024 08:41:18 +0530 Subject: [PATCH 20/34] removed extra lines --- .gitignore | 3 +-- tools/release/release.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75b6983a4684..a51f36e3a7e8 100644 --- a/.gitignore +++ b/.gitignore @@ -54,5 +54,4 @@ dolphinscheduler-worker/logs dolphinscheduler-master/logs dolphinscheduler-api/logs __pycache__ -ds_schema_check_test - +ds_schema_check_test \ No newline at end of file diff --git a/tools/release/release.py b/tools/release/release.py index 20d746ed0348..32b6f86a3833 100644 --- a/tools/release/release.py +++ b/tools/release/release.py @@ -26,7 +26,6 @@ from github.user import User - def get_changelog(access_token: str, milestone: str) -> str: """Get changelog in specific milestone from GitHub Restful API.""" pr = PullRequest(token=access_token) From de40cb0f6b9c1f639dd3508fee8f60e7681c81e6 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Fri, 11 Oct 2024 12:09:23 +0530 Subject: [PATCH 21/34] removed log4j-api mvn repo from dol-dist>release-docs>licence --- dolphinscheduler-dist/release-docs/LICENSE | 2 -- 1 file changed, 2 deletions(-) diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index a9c0a2ee1b27..e0967136168d 100644 --- a/dolphinscheduler-dist/release-docs/LICENSE +++ b/dolphinscheduler-dist/release-docs/LICENSE @@ -338,8 +338,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt. kerby-xdr 1.0.1: https://mvnrepository.com/artifact/org.apache.kerby/kerby-xdr/1.0.1, Apache 2.0 libfb303 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libfb303/0.9.3, Apache 2.0 libthrift 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libthrift/0.9.3, Apache 2.0 - log4j-api 2.11.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/2.11.2, Apache 2.0 - log4j-core-2.11.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/2.11.2, Apache 2.0 log4j-1.2-api 2.17.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api/2.17.2, Apache 2.0 lz4 1.3.0: https://mvnrepository.com/artifact/net.jpountz.lz4/lz4/1.3.0, Apache 2.0 mybatis 3.5.10 https://mvnrepository.com/artifact/org.mybatis/mybatis/3.5.10, Apache 2.0 From 0fcd236ed06e865fb28bde63b79b078e71d5446c Mon Sep 17 00:00:00 2001 From: binitshrest Date: Fri, 11 Oct 2024 23:30:56 +0530 Subject: [PATCH 22/34] Removed log4j-api and log4j-to-slf4j from microbench pom.xml i.e transitive dependency --- dolphinscheduler-microbench/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dolphinscheduler-microbench/pom.xml b/dolphinscheduler-microbench/pom.xml index ae5e62f61041..539294797fe0 100644 --- a/dolphinscheduler-microbench/pom.xml +++ b/dolphinscheduler-microbench/pom.xml @@ -51,6 +51,12 @@ org.apache.dolphinscheduler dolphinscheduler-extract-base + + + org.apache.logging.log4j + log4j-to-slf4j + + From a8da591ee9dec0da42fcc2affbe0ac1c4c09a4ea Mon Sep 17 00:00:00 2001 From: binitshrest Date: Sun, 13 Oct 2024 15:29:07 +0530 Subject: [PATCH 23/34] exlcuded all the transitive dependency that has log4j-api and log4j-to-slf4j --- .../dolphinscheduler-extract-master/pom.xml | 10 ++++++++++ .../dolphinscheduler-extract-worker/pom.xml | 20 +++++++++++++++++++ dolphinscheduler-master/pom.xml | 6 ++++++ .../dolphinscheduler-registry-etcd/pom.xml | 10 ++++++++++ .../dolphinscheduler-registry-it/pom.xml | 10 ++++++++++ .../dolphinscheduler-registry-jdbc/pom.xml | 10 ++++++++++ .../pom.xml | 10 ++++++++++ .../dolphinscheduler-storage-abs/pom.xml | 6 ++++++ .../dolphinscheduler-storage-cos/pom.xml | 6 ++++++ .../dolphinscheduler-storage-gcs/pom.xml | 10 ++++++++++ .../dolphinscheduler-storage-hdfs/pom.xml | 10 ++++++++++ .../dolphinscheduler-storage-obs/pom.xml | 10 ++++++++++ .../dolphinscheduler-storage-oss/pom.xml | 10 ++++++++++ .../dolphinscheduler-storage-s3/pom.xml | 10 ++++++++++ pom.xml | 20 +++++++++++++++++++ 15 files changed, 158 insertions(+) diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml index 955bcd0a1217..f12d94001364 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml @@ -39,6 +39,16 @@ org.apache.dolphinscheduler dolphinscheduler-extract-base ${project.version} + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + org.apache.dolphinscheduler diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml index 0a42b73a1da7..319b4b921553 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml @@ -34,10 +34,30 @@ org.apache.dolphinscheduler dolphinscheduler-extract-common ${project.version} + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + org.apache.dolphinscheduler dolphinscheduler-extract-base + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-master/pom.xml b/dolphinscheduler-master/pom.xml index ec844ecabd96..1cf68d216fc4 100644 --- a/dolphinscheduler-master/pom.xml +++ b/dolphinscheduler-master/pom.xml @@ -268,6 +268,12 @@ org.springframework.boot spring-boot-starter-test test + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml index 0f5c4d1494ff..4ab6c9b49a73 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml @@ -74,6 +74,16 @@ org.springframework.boot spring-boot-starter-test test + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml index 7f4b97d3efe5..95cc0a3e479a 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml @@ -35,6 +35,16 @@ org.springframework.boot spring-boot-starter-test test + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml index a11724a26191..d2697cc31512 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml @@ -97,6 +97,16 @@ org.springframework.boot spring-boot-starter-test test + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml index 1d93ae87f1fc..1887fd59f4c0 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml @@ -96,6 +96,16 @@ org.springframework.boot spring-boot-starter-test test + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml index 84475e67da64..1eeb10452126 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml @@ -43,6 +43,12 @@ dolphinscheduler-common ${project.version} provided + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-cos/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-cos/pom.xml index 5558c7addaf1..f38d5f2712d3 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-cos/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-cos/pom.xml @@ -36,6 +36,12 @@ dolphinscheduler-common ${project.version} provided + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml index 3daffaf74620..0e65c5169095 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml @@ -43,6 +43,16 @@ dolphinscheduler-common ${project.version} provided + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml index 5551d5eb94bf..a87ca40c1292 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml @@ -50,6 +50,16 @@ dolphinscheduler-common ${project.version} provided + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml index 0d22f45a13c8..4ac7ffab9894 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml @@ -43,6 +43,16 @@ dolphinscheduler-common ${project.version} provided + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml index b95492b4da47..7818afa0fd8a 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml @@ -43,6 +43,16 @@ dolphinscheduler-common ${project.version} provided + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml index e0cf69435d0a..6e419aadd407 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml @@ -50,6 +50,16 @@ dolphinscheduler-common ${project.version} provided + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/pom.xml b/pom.xml index c833b2deabd9..62fec72f7e3f 100755 --- a/pom.xml +++ b/pom.xml @@ -146,6 +146,16 @@ org.apache.dolphinscheduler dolphinscheduler-common ${project.version} + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + org.apache.dolphinscheduler @@ -250,6 +260,16 @@ org.apache.dolphinscheduler dolphinscheduler-extract-base ${project.version} + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + org.apache.dolphinscheduler From 3d13f4aa33c11de83e981d305facdeab859c2170 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Sun, 13 Oct 2024 16:12:45 +0530 Subject: [PATCH 24/34] add some changes --- .../dolphinscheduler-registry-etcd/pom.xml | 18 +++++++++--------- .../dolphinscheduler-registry-jdbc/pom.xml | 18 +++++++++--------- .../pom.xml | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml index 4ab6c9b49a73..10a5ac816913 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml @@ -75,15 +75,15 @@ spring-boot-starter-test test - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml index d2697cc31512..bb38d118f720 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml @@ -98,15 +98,15 @@ spring-boot-starter-test test - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml index 1887fd59f4c0..36b6e3b52155 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml @@ -97,15 +97,15 @@ spring-boot-starter-test test - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-to-slf4j + + From dce08958a8a1e20805da3b1f9384ddfbcdf5ecf3 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Mon, 14 Oct 2024 07:26:51 +0530 Subject: [PATCH 25/34] optimize codes --- install.sh | 473 +++++++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 20 +++ 2 files changed, 493 insertions(+) create mode 100644 install.sh diff --git a/install.sh b/install.sh new file mode 100644 index 000000000000..7fecde01cb0c --- /dev/null +++ b/install.sh @@ -0,0 +1,473 @@ +#!/bin/bash + +# Basic environment variables +RAINBOND_VERSION=${VERSION:-'v5.17.3'} +IMGHUB_MIRROR=${IMGHUB_MIRROR:-'registry.cn-hangzhou.aliyuncs.com/goodrain'} + +# Define colorful stdout +RED='\033[0;31m' +GREEN='\033[32;1m' +YELLOW='\033[33;1m' +NC='\033[0m' +TIME="+%Y-%m-%d %H:%M:%S" + +######################################## +# Information collection +# Automatically collect the install details. +# Help us improve the success rate of installation. +######################################## + +function send_msg() { + dest_url="https://log.rainbond.com" + #msg=${1:-"Terminating by userself."} + if [ -z "$1" ]; then + msg="Terminating by userself." + else + msg=$(echo $1 | tr '"' " " | tr "'" " ") + fi + # send a message to remote url + curl --silent -H "Content-Type: application/json" -X POST "$dest_url/dindlog" \ + -d "{\"message\":\"$msg\", \"os_info\":\"${OS_INFO}\", \"eip\":\"$EIP\", \"uuid\":\"${UUID}\"}" 2>&1 >/dev/null || : + + if [ "$msg" == "Terminating by userself." ]; then + exit 1 + fi +} + +function send_info() { + info=$1 + echo -e "${GREEN}$(date "$TIME") INFO: $info${NC}" + send_msg "$info" +} + +function send_warn() { + warn=$1 + echo -e "${YELLOW}$(date "$TIME") WARN: $warn${NC}" + send_msg "$warn" +} + +function send_error() { + error=$1 + echo -e "${RED}$(date "$TIME") ERROR: $error${NC}" + send_msg "$error" +} + +# Trap SIGINT signal when detect Ctrl + C +trap send_msg SIGINT + +######################################## +# OS Detect +# Automatically check the operating system type. +# Return Linux or Darwin. +######################################## + +OS_TYPE=$(uname -s) +if [ "${OS_TYPE}" == "Linux" ]; then + MD5_CMD="md5sum" + if find /lib/modules/$(uname -r) -type f -name '*.ko*' | grep iptable_raw; then + if ! lsmod | grep iptable_raw; then + echo iptable_raw >/etc/modules-load.d/iptable_raw.conf + modprobe iptable_raw + fi + fi +elif [ "${OS_TYPE}" == "Darwin" ]; then + MD5_CMD="md5" +else + if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_error "${OS_TYPE} 操作系统暂不支持" + exit 1 + else + send_error "Rainbond do not support ${OS_TYPE} OS" + exit 1 + fi +fi + +OS_INFO=$(uname -a) +UUID=$(echo $OS_INFO | ${MD5_CMD} | cut -b 1-32) + +################ Start ################# +if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_info "欢迎您安装 Rainbond, 如果您安装遇到问题, 请反馈到 https://www.rainbond.com/community/support" +else + send_info "Welcome to install Rainbond, If you install problem, please feedback to https://www.rainbond.com/community/support" +fi + +######################################## +# Envrionment Check +# Check docker is running or not. +# Check ports can be use or not. +# If not, quit. +######################################## + +if ! (docker info &>/dev/null); then + if (which docker &>/dev/null); then + if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_error "未检测到 Docker 守护进程, 请先启动 Docker.\n\t- Linux 系统请执行 'systemctl start docker' 启动 Docker.\n\t- MacOS 系统请先启动 Docker Desktop APP.\n\t- 然后重新执行本脚本." + exit 1 + else + send_error "Ops! Docker daemon is not running. Start docker first please.\n\t- For Linux, exec 'systemctl start docker' start docker.\n\t- For MacOS, start the Docker Desktop APP.\n\t- And re-exec this script." + exit 1 + fi + elif [ "${OS_TYPE}" = "Linux" ]; then + if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_warn "未检测到 Docker 环境, 即将自动安装 Docker...\n" + else + send_warn "Ops! Docker has not been installed.\nDocker is going to be automatically installed...\n" + fi + sleep 3 + curl -sfL https://get.rainbond.com/install_docker | bash + if [ "$?" != "0" ]; then + if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_error "自动安装 Docker 失败！请自行手动安装 Docker 后重新执行本脚本." + exit 1 + else + send_error "Ops! Automatic docker installation failed." + exit 1 + fi + fi + elif [ "${OS_TYPE}" = "Darwin" ]; then + if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_warn "未检测到 Docker 环境, 请先安装 Docker Desktop APP, 然后重新执行本脚本." + exit 1 + else + send_warn "Ops! Docker has not been installed.\nPlease visit the following website to get the latest Docker Desktop APP.\n\thttps://www.docker.com/products/docker-desktop/" + exit 1 + fi + fi +else + if docker ps -a | grep rainbond-allinone 2>&1 >/dev/null; then + if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_error "rainbond-allinone 容器已存在.\n\t- 确保 rainbond-allinone 是否在运行.\n\t- 尝试执行 'docker start rainbond-allinone' 命令启动.\n\t- 或者你可以选择删除该容器 'docker rm -f rainbond-allinone'" + exit 1 + else + send_error "Ops! rainbond-allinone container already exists.\n\t- Ensure if rainbond-allinone is running.\n\t- Try to exec 'docker start rainbond-allinone' to start it.\n\t- Or you can remove it by 'docker rm -f rainbond-allinone'" + exit 1 + fi + fi +fi + +ports=(80 443 6060 7070) +for port in ${ports[@]}; do + if (curl -s 127.0.0.1:$port >/dev/null); then + if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_error "$port 端口已被占用." + exit 1 + else + send_error "Ops! Port $port has been used." + exit 1 + fi + fi +done + +######################################## +# Arch Detect +# Automatically check the CPU architecture type. +# Return amd64 or arm64. +######################################## + +if [ $(arch) = "x86_64" ] || [ $(arch) = "amd64" ]; then + ARCH_TYPE=amd64 +elif [ $(arch) = "aarch64" ] || [ $(arch) = "arm64" ]; then + ARCH_TYPE=arm64 +elif [ $(arch) = "i386" ]; then + ARCH_TYPE=amd64 + if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_warn "检测到 i386, 我们把它当做 x86_64(amd64). 如果您使用的是 M1 芯片的 MacOS, 确保您禁用了 Rosetta. \n\t 请参阅: https://github.com/goodrain/rainbond/issues/1439 " + else + send_warn "i386 has been detect, we'll treat it like x86_64(amd64). If you are using the M1 chip MacOS,make sure your terminal has Rosetta disabled.\n\t Have a look : https://github.com/goodrain/rainbond/issues/1439 " + fi +else + if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_error "Rainbond 目前还不支持 $(arch) 架构" + exit 1 + else + send_error "Rainbond do not support $(arch) architecture" + exit 1 + fi +fi + +######################################## +# EIP Detect +# Automatically check the IP address. +# User customization is also supported. +######################################## + +# Choose tool for IP detect. +if which ip >/dev/null; then + IF_NUM=$(ip -4 a | egrep -v "docker0|flannel|cni|calico|kube" | grep inet | wc -l) + IPS=$(ip -4 a | egrep -v "docker0|flannel|cni|calico|kube" | grep inet | awk '{print $2}' | awk -F '/' '{print $1}' | tr '\n' ' ') +elif which ifconfig >/dev/null; then + IF_NUM=$(ifconfig | grep -w inet | awk '{print $2}' | wc -l) + IPS=$(ifconfig | grep -w inet | awk '{print $2}') +elif which ipconfig >/dev/null; then + # TODO + IF_NUM=$(ipconfig ifcount) + IPS="" +else + IF_NUM=0 + IPS="" +fi + +# Func for verify the result entered. +function verify_eip() { + local result=$2 + local max=$1 + if [ -z $result ]; then + echo -e "${YELLOW}Do not enter null values${NC}" + return 1 + # Regular matching IPv4 + elif [[ $result =~ ^([0-9]{1,2}|1[0-9][0-9]|2[0-4][0-9]|25[0-5]).([0-9]{1,2}|1[0-9][0-9]|2[0-4][0-9]|25[0-5]).([0-9]{1,2}|1[0-9][0-9]|2[0-4][0-9]|25[0-5]).([0-9]{1,2}|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$ ]]; then + export EIP=$result + return 0 + # Regular matching positive integer + elif [[ $result =~ \d? ]]; then + if [ $result -gt 0 ] && [ $result -le $max ]; then + export EIP=${ip_list[$result - 1]} + return 0 + else + return 1 + fi + else + return 1 + fi +} + +# The user chooses the IP address to use +if [ -n "$IPS" ]; then + # Convert to indexed array + declare -a ip_list=$(echo \($IPS\)) + + # Gave some tips + if [ "$LANG" == "zh_CN.UTF-8" ]; then + echo -e ${GREEN} + cat <&1) +send_info "$docker_run_meg" +sleep 3 + +# Verify startup +container_id=$(docker ps -a | grep rainbond-allinone | awk '{print $1}') +if docker ps | grep rainbond-allinone 2>&1 >/dev/null; then + if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_info "Rainbond dind allinone 启动成功，容器 ID 为: $container_id. 请观察 rainbond-allinone 容器启动日志.\n" + else + send_info "Rainbond dind allinone container startup succeeded with $container_id. Please observe rainbond-allinone container startup logs.\n" + fi +else + if [ "$LANG" == "zh_CN.UTF-8" ]; then + send_warn "Rainbond dind allinone 容器启动失败. 请查看 rainbond-allinone 容器启动日志.\n" + else + send_warn "Ops! Rainbond dind allinone container startup failed. please observe rainbond-allinone container startup logs.\n" + fi + send_msg "$(docker logs rainbond-allinone)" # Msg maybe too lang +fi + +sleep 3 +# Follow logs stdout +docker logs -f rainbond-allinone \ No newline at end of file diff --git a/pom.xml b/pom.xml index c833b2deabd9..3815ba691d50 100755 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,16 @@ org.apache.dolphinscheduler dolphinscheduler-master ${project.version} + + + org.apache.logging.log4j + log4j-to-slf4j + + + log4j + log4j + + org.apache.dolphinscheduler @@ -146,6 +156,16 @@ org.apache.dolphinscheduler dolphinscheduler-common ${project.version} + + + org.apache.logging.log4j + log4j-to-slf4j + + + log4j + log4j + + org.apache.dolphinscheduler From fc0b7f2013e926fcae8a482fa17aca8ef4d321b9 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Mon, 14 Oct 2024 07:46:48 +0530 Subject: [PATCH 26/34] changes made --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3815ba691d50..b9764a991366 100755 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ dolphinscheduler-ui ${project.version} - + org.apache.dolphinscheduler dolphinscheduler-yarn-aop From de811eeb13e31c593823587e34a9e6644ce2da87 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Mon, 14 Oct 2024 07:58:07 +0530 Subject: [PATCH 27/34] made some changes --- install.sh | 473 ----------------------------------------------------- 1 file changed, 473 deletions(-) delete mode 100644 install.sh diff --git a/install.sh b/install.sh deleted file mode 100644 index 7fecde01cb0c..000000000000 --- a/install.sh +++ /dev/null @@ -1,473 +0,0 @@ -#!/bin/bash - -# Basic environment variables -RAINBOND_VERSION=${VERSION:-'v5.17.3'} -IMGHUB_MIRROR=${IMGHUB_MIRROR:-'registry.cn-hangzhou.aliyuncs.com/goodrain'} - -# Define colorful stdout -RED='\033[0;31m' -GREEN='\033[32;1m' -YELLOW='\033[33;1m' -NC='\033[0m' -TIME="+%Y-%m-%d %H:%M:%S" - -######################################## -# Information collection -# Automatically collect the install details. -# Help us improve the success rate of installation. -######################################## - -function send_msg() { - dest_url="https://log.rainbond.com" - #msg=${1:-"Terminating by userself."} - if [ -z "$1" ]; then - msg="Terminating by userself." - else - msg=$(echo $1 | tr '"' " " | tr "'" " ") - fi - # send a message to remote url - curl --silent -H "Content-Type: application/json" -X POST "$dest_url/dindlog" \ - -d "{\"message\":\"$msg\", \"os_info\":\"${OS_INFO}\", \"eip\":\"$EIP\", \"uuid\":\"${UUID}\"}" 2>&1 >/dev/null || : - - if [ "$msg" == "Terminating by userself." ]; then - exit 1 - fi -} - -function send_info() { - info=$1 - echo -e "${GREEN}$(date "$TIME") INFO: $info${NC}" - send_msg "$info" -} - -function send_warn() { - warn=$1 - echo -e "${YELLOW}$(date "$TIME") WARN: $warn${NC}" - send_msg "$warn" -} - -function send_error() { - error=$1 - echo -e "${RED}$(date "$TIME") ERROR: $error${NC}" - send_msg "$error" -} - -# Trap SIGINT signal when detect Ctrl + C -trap send_msg SIGINT - -######################################## -# OS Detect -# Automatically check the operating system type. -# Return Linux or Darwin. -######################################## - -OS_TYPE=$(uname -s) -if [ "${OS_TYPE}" == "Linux" ]; then - MD5_CMD="md5sum" - if find /lib/modules/$(uname -r) -type f -name '*.ko*' | grep iptable_raw; then - if ! lsmod | grep iptable_raw; then - echo iptable_raw >/etc/modules-load.d/iptable_raw.conf - modprobe iptable_raw - fi - fi -elif [ "${OS_TYPE}" == "Darwin" ]; then - MD5_CMD="md5" -else - if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_error "${OS_TYPE} 操作系统暂不支持" - exit 1 - else - send_error "Rainbond do not support ${OS_TYPE} OS" - exit 1 - fi -fi - -OS_INFO=$(uname -a) -UUID=$(echo $OS_INFO | ${MD5_CMD} | cut -b 1-32) - -################ Start ################# -if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_info "欢迎您安装 Rainbond, 如果您安装遇到问题, 请反馈到 https://www.rainbond.com/community/support" -else - send_info "Welcome to install Rainbond, If you install problem, please feedback to https://www.rainbond.com/community/support" -fi - -######################################## -# Envrionment Check -# Check docker is running or not. -# Check ports can be use or not. -# If not, quit. -######################################## - -if ! (docker info &>/dev/null); then - if (which docker &>/dev/null); then - if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_error "未检测到 Docker 守护进程, 请先启动 Docker.\n\t- Linux 系统请执行 'systemctl start docker' 启动 Docker.\n\t- MacOS 系统请先启动 Docker Desktop APP.\n\t- 然后重新执行本脚本." - exit 1 - else - send_error "Ops! Docker daemon is not running. Start docker first please.\n\t- For Linux, exec 'systemctl start docker' start docker.\n\t- For MacOS, start the Docker Desktop APP.\n\t- And re-exec this script." - exit 1 - fi - elif [ "${OS_TYPE}" = "Linux" ]; then - if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_warn "未检测到 Docker 环境, 即将自动安装 Docker...\n" - else - send_warn "Ops! Docker has not been installed.\nDocker is going to be automatically installed...\n" - fi - sleep 3 - curl -sfL https://get.rainbond.com/install_docker | bash - if [ "$?" != "0" ]; then - if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_error "自动安装 Docker 失败！请自行手动安装 Docker 后重新执行本脚本." - exit 1 - else - send_error "Ops! Automatic docker installation failed." - exit 1 - fi - fi - elif [ "${OS_TYPE}" = "Darwin" ]; then - if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_warn "未检测到 Docker 环境, 请先安装 Docker Desktop APP, 然后重新执行本脚本." - exit 1 - else - send_warn "Ops! Docker has not been installed.\nPlease visit the following website to get the latest Docker Desktop APP.\n\thttps://www.docker.com/products/docker-desktop/" - exit 1 - fi - fi -else - if docker ps -a | grep rainbond-allinone 2>&1 >/dev/null; then - if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_error "rainbond-allinone 容器已存在.\n\t- 确保 rainbond-allinone 是否在运行.\n\t- 尝试执行 'docker start rainbond-allinone' 命令启动.\n\t- 或者你可以选择删除该容器 'docker rm -f rainbond-allinone'" - exit 1 - else - send_error "Ops! rainbond-allinone container already exists.\n\t- Ensure if rainbond-allinone is running.\n\t- Try to exec 'docker start rainbond-allinone' to start it.\n\t- Or you can remove it by 'docker rm -f rainbond-allinone'" - exit 1 - fi - fi -fi - -ports=(80 443 6060 7070) -for port in ${ports[@]}; do - if (curl -s 127.0.0.1:$port >/dev/null); then - if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_error "$port 端口已被占用." - exit 1 - else - send_error "Ops! Port $port has been used." - exit 1 - fi - fi -done - -######################################## -# Arch Detect -# Automatically check the CPU architecture type. -# Return amd64 or arm64. -######################################## - -if [ $(arch) = "x86_64" ] || [ $(arch) = "amd64" ]; then - ARCH_TYPE=amd64 -elif [ $(arch) = "aarch64" ] || [ $(arch) = "arm64" ]; then - ARCH_TYPE=arm64 -elif [ $(arch) = "i386" ]; then - ARCH_TYPE=amd64 - if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_warn "检测到 i386, 我们把它当做 x86_64(amd64). 如果您使用的是 M1 芯片的 MacOS, 确保您禁用了 Rosetta. \n\t 请参阅: https://github.com/goodrain/rainbond/issues/1439 " - else - send_warn "i386 has been detect, we'll treat it like x86_64(amd64). If you are using the M1 chip MacOS,make sure your terminal has Rosetta disabled.\n\t Have a look : https://github.com/goodrain/rainbond/issues/1439 " - fi -else - if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_error "Rainbond 目前还不支持 $(arch) 架构" - exit 1 - else - send_error "Rainbond do not support $(arch) architecture" - exit 1 - fi -fi - -######################################## -# EIP Detect -# Automatically check the IP address. -# User customization is also supported. -######################################## - -# Choose tool for IP detect. -if which ip >/dev/null; then - IF_NUM=$(ip -4 a | egrep -v "docker0|flannel|cni|calico|kube" | grep inet | wc -l) - IPS=$(ip -4 a | egrep -v "docker0|flannel|cni|calico|kube" | grep inet | awk '{print $2}' | awk -F '/' '{print $1}' | tr '\n' ' ') -elif which ifconfig >/dev/null; then - IF_NUM=$(ifconfig | grep -w inet | awk '{print $2}' | wc -l) - IPS=$(ifconfig | grep -w inet | awk '{print $2}') -elif which ipconfig >/dev/null; then - # TODO - IF_NUM=$(ipconfig ifcount) - IPS="" -else - IF_NUM=0 - IPS="" -fi - -# Func for verify the result entered. -function verify_eip() { - local result=$2 - local max=$1 - if [ -z $result ]; then - echo -e "${YELLOW}Do not enter null values${NC}" - return 1 - # Regular matching IPv4 - elif [[ $result =~ ^([0-9]{1,2}|1[0-9][0-9]|2[0-4][0-9]|25[0-5]).([0-9]{1,2}|1[0-9][0-9]|2[0-4][0-9]|25[0-5]).([0-9]{1,2}|1[0-9][0-9]|2[0-4][0-9]|25[0-5]).([0-9]{1,2}|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$ ]]; then - export EIP=$result - return 0 - # Regular matching positive integer - elif [[ $result =~ \d? ]]; then - if [ $result -gt 0 ] && [ $result -le $max ]; then - export EIP=${ip_list[$result - 1]} - return 0 - else - return 1 - fi - else - return 1 - fi -} - -# The user chooses the IP address to use -if [ -n "$IPS" ]; then - # Convert to indexed array - declare -a ip_list=$(echo \($IPS\)) - - # Gave some tips - if [ "$LANG" == "zh_CN.UTF-8" ]; then - echo -e ${GREEN} - cat <&1) -send_info "$docker_run_meg" -sleep 3 - -# Verify startup -container_id=$(docker ps -a | grep rainbond-allinone | awk '{print $1}') -if docker ps | grep rainbond-allinone 2>&1 >/dev/null; then - if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_info "Rainbond dind allinone 启动成功，容器 ID 为: $container_id. 请观察 rainbond-allinone 容器启动日志.\n" - else - send_info "Rainbond dind allinone container startup succeeded with $container_id. Please observe rainbond-allinone container startup logs.\n" - fi -else - if [ "$LANG" == "zh_CN.UTF-8" ]; then - send_warn "Rainbond dind allinone 容器启动失败. 请查看 rainbond-allinone 容器启动日志.\n" - else - send_warn "Ops! Rainbond dind allinone container startup failed. please observe rainbond-allinone container startup logs.\n" - fi - send_msg "$(docker logs rainbond-allinone)" # Msg maybe too lang -fi - -sleep 3 -# Follow logs stdout -docker logs -f rainbond-allinone \ No newline at end of file From 0f52a15ed12f1d086e07886087754dc5457b7d09 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Mon, 14 Oct 2024 08:10:43 +0530 Subject: [PATCH 28/34] made some changes --- pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index f8830e0a0f4a..c23a8f4844f4 100755 --- a/pom.xml +++ b/pom.xml @@ -159,21 +159,12 @@ org.apache.logging.log4j -<<<<<<< HEAD log4j-api org.apache.logging.log4j log4j-to-slf4j -======= - log4j-to-slf4j - - - log4j - log4j - ->>>>>>> optimize-branch From 99321f6d79d1d46544125e150a215e7430ffa465 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Mon, 14 Oct 2024 08:23:49 +0530 Subject: [PATCH 29/34] removed duplicate codes --- .../dolphinscheduler-extract-master/pom.xml | 10 ---------- .../dolphinscheduler-extract-worker/pom.xml | 20 ------------------- dolphinscheduler-microbench/pom.xml | 6 ------ .../dolphinscheduler-storage-abs/pom.xml | 6 ------ .../dolphinscheduler-storage-cos/pom.xml | 6 ------ .../dolphinscheduler-storage-gcs/pom.xml | 10 ---------- .../dolphinscheduler-storage-hdfs/pom.xml | 10 ---------- .../dolphinscheduler-storage-obs/pom.xml | 10 ---------- .../dolphinscheduler-storage-oss/pom.xml | 10 ---------- .../dolphinscheduler-storage-s3/pom.xml | 10 ---------- 10 files changed, 98 deletions(-) diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml index f12d94001364..955bcd0a1217 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml @@ -39,16 +39,6 @@ org.apache.dolphinscheduler dolphinscheduler-extract-base ${project.version} - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - org.apache.dolphinscheduler diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml index 319b4b921553..0a42b73a1da7 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml @@ -34,30 +34,10 @@ org.apache.dolphinscheduler dolphinscheduler-extract-common ${project.version} - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - org.apache.dolphinscheduler dolphinscheduler-extract-base - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - diff --git a/dolphinscheduler-microbench/pom.xml b/dolphinscheduler-microbench/pom.xml index 539294797fe0..ae5e62f61041 100644 --- a/dolphinscheduler-microbench/pom.xml +++ b/dolphinscheduler-microbench/pom.xml @@ -51,12 +51,6 @@ org.apache.dolphinscheduler dolphinscheduler-extract-base - - - org.apache.logging.log4j - log4j-to-slf4j - - diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml index 1eeb10452126..84475e67da64 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml @@ -43,12 +43,6 @@ dolphinscheduler-common ${project.version} provided - - - org.apache.logging.log4j - log4j-to-slf4j - - diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-cos/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-cos/pom.xml index f38d5f2712d3..5558c7addaf1 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-cos/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-cos/pom.xml @@ -36,12 +36,6 @@ dolphinscheduler-common ${project.version} provided - - - org.apache.logging.log4j - log4j-to-slf4j - - diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml index 0e65c5169095..3daffaf74620 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml @@ -43,16 +43,6 @@ dolphinscheduler-common ${project.version} provided - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml index a87ca40c1292..5551d5eb94bf 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml @@ -50,16 +50,6 @@ dolphinscheduler-common ${project.version} provided - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml index 4ac7ffab9894..0d22f45a13c8 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml @@ -43,16 +43,6 @@ dolphinscheduler-common ${project.version} provided - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml index 7818afa0fd8a..b95492b4da47 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml @@ -43,16 +43,6 @@ dolphinscheduler-common ${project.version} provided - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml index 6e419aadd407..e0cf69435d0a 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml @@ -50,16 +50,6 @@ dolphinscheduler-common ${project.version} provided - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - From cddfa315f56c44e2244acb879ef6d6df3f16bdf1 Mon Sep 17 00:00:00 2001 From: Binit Shrestha <53391715+binitshrest@users.noreply.github.com> Date: Mon, 14 Oct 2024 08:27:49 +0530 Subject: [PATCH 30/34] Update pom.xml --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index c23a8f4844f4..80560f8334b9 100755 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,6 @@ dolphinscheduler-ui ${project.version} - org.apache.dolphinscheduler dolphinscheduler-yarn-aop From af490e2a1329c0602591e21aa4a4c9fc458ecb51 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Mon, 14 Oct 2024 09:03:55 +0530 Subject: [PATCH 31/34] removed two licence file log4j-api & log4j-to-slf4j as asked --- .../licenses/LICENSE-log4j-api-2.11.2.txt | 53 ----- .../licenses/LICENSE-log4j-core-2.11.2.txt | 202 ------------------ 2 files changed, 255 deletions(-) delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-log4j-api-2.11.2.txt delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-log4j-core-2.11.2.txt diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-log4j-api-2.11.2.txt b/dolphinscheduler-dist/release-docs/licenses/LICENSE-log4j-api-2.11.2.txt deleted file mode 100644 index d6aac6c35167..000000000000 --- a/dolphinscheduler-dist/release-docs/licenses/LICENSE-log4j-api-2.11.2.txt +++ /dev/null @@ -1,53 +0,0 @@ -Apache License - -Version 2.0, January 2004 - -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - -"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - -You must give any other recipients of the Work or Derivative Works a copy of this License; and -You must cause any modified files to carry prominent notices stating that You changed the files; and -You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and -If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. - -You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. -5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-log4j-core-2.11.2.txt b/dolphinscheduler-dist/release-docs/licenses/LICENSE-log4j-core-2.11.2.txt deleted file mode 100644 index 6279e5206de1..000000000000 --- a/dolphinscheduler-dist/release-docs/licenses/LICENSE-log4j-core-2.11.2.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 1999-2005 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. From d28de7e3a5bb9dd10ae69281cb3f5c5c0b83dcb1 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Sun, 20 Oct 2024 14:16:57 +0545 Subject: [PATCH 32/34] wrote a testcases for switch task --- deploy/docker/docker-compose.yml | 2 +- .../dolphinscheduler-alert-email/bin/pom.xml | 77 ++++++++++++ .../alert/email/EmailAlertChannel.class | Bin 0 -> 2436 bytes .../email/EmailAlertChannelFactory.class | Bin 0 -> 8121 bytes .../plugin/alert/email/EmailConstants.class | Bin 0 -> 2747 bytes .../plugin/alert/email/ExcelUtils.class | Bin 0 -> 5180 bytes .../alert/email/MailParamsConstants.class | Bin 0 -> 3103 bytes .../plugin/alert/email/MailSender.class | Bin 0 -> 7561 bytes .../email/exception/AlertEmailException.class | Bin 0 -> 1098 bytes .../alert/email/template/AlertTemplate.class | Bin 0 -> 1248 bytes .../email/template/DefaultHTMLTemplate.class | Bin 0 -> 8695 bytes .../email/EmailAlertChannelFactoryTest.class | Bin 0 -> 2233 bytes .../alert/email/EmailAlertChannelTest.class | Bin 0 -> 8188 bytes .../plugin/alert/email/ExcelUtilsTest.class | Bin 0 -> 3756 bytes .../plugin/alert/email/MailUtilsTest.class | Bin 0 -> 8895 bytes .../template/DefaultHTMLTemplateTest.class | Bin 0 -> 5753 bytes .../bin/src/test/resources/logback.xml | 21 ++++ .../src/main/resources/application.yaml | 8 +- .../src/main/resources/application.yaml | 7 +- .../task/switchtask/SwitchLogicTaskTest.java | 118 ++++++++++++++++++ .../dolphinscheduler/StandaloneServer.java | 1 + pom.xml | 1 + qodana.yaml | 31 +++++ 23 files changed, 258 insertions(+), 8 deletions(-) create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/pom.xml create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtils.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/exception/AlertEmailException.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/AlertTemplate.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplate.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactoryTest.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtilsTest.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplateTest.class create mode 100644 dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/resources/logback.xml create mode 100644 dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/switchtask/SwitchLogicTaskTest.java create mode 100644 qodana.yaml diff --git a/deploy/docker/docker-compose.yml b/deploy/docker/docker-compose.yml index ca7f8fbf52a9..5a7ecda1d38c 100644 --- a/deploy/docker/docker-compose.yml +++ b/deploy/docker/docker-compose.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: "3.8" +#version: "3.8" services: dolphinscheduler-postgresql: diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/pom.xml new file mode 100644 index 000000000000..123da7474715 --- /dev/null +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/pom.xml @@ -0,0 +1,77 @@ + + + + 4.0.0 + + org.apache.dolphinscheduler + dolphinscheduler-alert-plugins + dev-SNAPSHOT + + dolphinscheduler-alert-email + jar + + + alert.email + + + + + org.apache.dolphinscheduler + dolphinscheduler-alert-api + + + + org.apache.dolphinscheduler + dolphinscheduler-common + ${project.version} + provided + + + + org.apache.poi + poi + + + org.apache.poi + poi-ooxml + + + + org.apache.commons + commons-email + + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + + shade + + package + + + + + + diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.class b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.class new file mode 100644 index 0000000000000000000000000000000000000000..9f15c31917ff79b76532b52aa4dc7b988e259734 GIT binary patch literal 2436 zcmeHJT~8D-6upIoWd{^QK?Of5`T#F8G2zKICIm5VvVZ|3@v%G8Wec5lY&#qIGyV+| zP4wOW#|6j zqljfJ?(itlGV2Isv7Y3Tn<$g{5#kuuUBq#YjJABa;X5`vOerp_P$4i^P)VkaqTSXp zj~#)@=Ryhhg24Fd+983;rcQVjY6NC4v0KJyGX>M6^6{-Q+-lk735|7{3CWz$ie^T) zBv0)#8q^LtoVwGDQ%?~3#lmti8e=5d(H5uYBq41$Dl8Q$5eDOtr#RH+hN~D?Xd9hk z`+bgM2@PY(tfg%sxh+>oICl9V%*zQo;&cVG6qZ>Ef6r1_W+^PP6c$-pp^4^}`j}GY z;tq8fI{%PiAibn`5TQSau-MRuOO%m{G}FdWoZBY}{{~WQCU-&(ib(3TrBC{z_GNqh zxX%c6nzBL!L9LNyQpCbhn`hjhYLs;*kDWHOl*Q_rS3s^3-WJNAI*wqS<tPsQGRFqswplg+ zvG0sf{WR4Z)=;1kcR74MhC)i+Zxcan#Qp%L;MxpKz;yx(tIbOXD^pPS4maCG{p{pv zi<<+6rbS@BsbeM&nGwEy)>&~KVF|ox{#_fc6R4tD#@r(L(rWWUGWE5xUZx9S%X_(U zBIOO$6;@zi8{Rw%yTz$N^IX04DY!$(k0Ffte8vDxji`kGdcUx`;WIa)uK)BMpbqwR zZesolFGT{2S8n~{%0kIC3#Ud^Ei{z3OJN;X?zP~CnYeRWg$D#?itsOf7btg2i7{l5GOk!EZ);jhQdfL3;`^L!4C^J^?LKU@4_gK9;+!#9y5L*J_C0(69^(^0 M1@6N`cm(6W0Qlq&YybcN literal 0 HcmV?d00001 diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.class b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.class new file mode 100644 index 0000000000000000000000000000000000000000..8dc9c8af3752ca7a7006e62cec5e85fa4a8ac6e6 GIT binary patch literal 8121 zcmeHMTW=gS6h4zC-3w{crVSKIsR@!0^Ujaq1#vvHDbr@^b)$_Eq*%oMTAEz}q=^&V1#-<%e8w^~ixst+jmz<~QPi)u7?P(tos@QpU0lZ#heU z?+MA$I2^Hn_;Hl*kSZPvlF0ZVWKsGxX*T*pM$}Qlh-TpG$=r>QrYZ3ePprrRBgZ^k z(ouw`go}VngcBZN*CCTk_&C9#j3fO1F~h!qxPH#$kcTWSCJ7ie=`NJc4|KrDD$2?& zWaYjpE4Pr9o6E}0WwlCzn59Hxim393L?LqaQ-VOsOmRD0y&Z18o;RGLK+2;emWtrm z3L(r$W^#F<5icEv{J>?3hm%f?H6iM3C9ig-;vSPD?z4)1qGCdGoo+TNOv{83ohS*p z&lO3tgh@0TB2_ZeMu`+gsI{hTKqdlq$c5H>?7?@Mg{n;Lk|$ZJbPrMyDzvH=j7uy} z18`@=q~yV*mG_k7qDq0w;<4n_<+zfQ_OQ(9X>Qw}Qc0sK(^)2+F1NOn^vHr`MX$T-otAet<|?JPQA z()wVS$)_nyBlK^mqJ8bPoYcyTcrc7>*`)!GZ8pG2I8D(PW^5y^6gk2uD&lZ z8+E08evO1PrP8{6hDv3tgGQ|~ZsED?^%)vPJD0Tyb-1z!3vktel~z|r9A2JCC_J-u zojh3TqGw+G&->auJFwi1eH!kM&Goo(UJZHbz<1p#AS^N-$0J_*r_kvTJI%+0Op?3&4%898cEfQ& zjUFEesxpbIx;1Wo*eyp0>yHrb2Tt>^>A|%K0m=v_EPlG&W-$t_3gpYC$@r7CJB)Ur znQ@|XL1eV;Ib3tlaRRiNe44^ELZ8JbuO^VEDf&|c2eTMu9EKT>?Zq`~xIU=ldKbtucMm?sC%~6@T}27C;1l=^TtxrH EzY_MRrvLx| literal 0 HcmV?d00001 diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.class b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.class new file mode 100644 index 0000000000000000000000000000000000000000..ce5fcab1b711a66133f742f79efa3939c646be79 GIT binary patch literal 2747 zcmeHJZEqVz5S~lY#&J{9rf-zjtqV8-eCLp~1iyh}UmB}U9NCwWe6luo8~fVx?df*i zI8^*DB#_`czl3l61H|lJl3rRsLV^!S*wWrTGqbZZyED)2&%b^DBLLK)ISW$;JQlHQ zji?`5Pw8`N@pxd-h`K{&c|3@QekkzW8wV`5qF_8gJBshpVmK$TY&AA`C?pM~n1vYw zu4z934F^`|@F{bp0ay3iz5ZsaZTENU&Xxg-?Uyz^8T;X&j7Dc}p3q>-GBAgtNg&K4 zKVW7=<dN>F;(sPN&gnXJ8(cDil-3G!zk!r5VLsa+e3FaqNAk zzvXPV`;D!7w`V*3J!iAOo`D5aN;Z+!P>zDKJEXB-vO1PWg>?h2?CfoC*xmk0u~;;~ zXiWo5|6;(D)6Kvw17<2Rt|{2ez?&L+2roO$zP*E@w+*;dv1B6aCbIVuSu$-a1NZc_ zp`Nytn0%0!DA}Tpc+0LgF^Ju+z1iB&K;D@8wQ{f7X*dVFHc=L2cW6L-3L2iB~BbHPkcdih#K z?Fo*IdbNu5Wx#5$Rs`m!<&_bWl!SD|s`1HUf$x=% zaPflhzhNb^vW63|5O`c7_gD3=oY)tReNPV20u4?jXLb+uFC`6VB+wb^^;`MdBrrK7 zFJ5<4`kqD18!ppD#sXyia>>~I4;xYSw}s7H@k3wY?CGWDC)k?}?y*^TV8Fsl zzOv((#~JwCn0~Yu#tf_NIrFeAMv)&-Rn!ED2O}DZ63NavLqBU7@A{I6al~T9&O*jxSMr!7-|3}g;tPW0!;bur zc_!H&3#kfCPYX_nA3o>L7@=4o!;2oWb9*7WRo`9abFBa2GDYWkj=xrXYhjo5EKR zUrk|Ue+{mm+b<%%k<#Bpd^?5jAikTzZy|aoh2KT|ehL%BxfH&S_`?+b2=P)1FC+dW zg+E1Xrm%&PPGPp6;d2!;T*Isld}e=uwS&cn-@*D%I`1-$Y8L<&p@QRlVg*&GY5kXa M{0bWQoIzdvcW0(0vH$=8 literal 0 HcmV?d00001 diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtils.class b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtils.class new file mode 100644 index 0000000000000000000000000000000000000000..62a84163007349c3ec6628ab3eb3ac3c21855abe GIT binary patch literal 5180 zcmeHLTW{P%6h7XBY}RZ^NGX>V=#UqZKG;I4gdhkhN>jRMla=D!c&cXY+1<&GXUurK zZTL0(3nY->g(rR#;*4EXhj_bQDJU=d;M>gcH)p;x=Q8ux-@pD20K2f+goXp(r8@Lu z%B6onC)8JZ=+lITBj!g+BqJ_Ue2+50w4aD0q`f#p3Fu_oL>jMuRHS}VN@YmWQpiPS7rV!|R4syN|-8m=TswCW2Mr(YAdbv$Ck zTqcZI0MF{>9gnnnK~aK)R7zz?pOJrYJkl|Qr-aLhYt&v`V%LCaCPN%#pjC|DKW5k$ z5ib-pP04@@mKFm=44Z5h(l@3NU@YyonmUj5izJe zdzqjjWl*%2XYJ+XbDDFALQ@_mN*jXzR*s7Zp9kC_;1pb6cG_5j^CEq*=l=IxM=s&O)O!DI&$zw)MPBMr^<(i#&3WrN%D* z{5SMOE+=Zt2u1%GT}5zPClX=pnr2ZC;qyRXLsODRgzJu8)+{iZ%PL3se}tZ5z?i{R z4H2QLGF9taGi1LHdWU&FsE~78^C0ahAu#k| zNS}^(lQh(yW33fatm+CD%FC(-`Lzby)tX+`0Gn;UTEo?vTW}r(PtTMd_f=)wDDyCn zto4pwW|GXHu8hVrD4tV%>ipeSFk)<$s~o8pGxXVGLImb=W)OI$H2+CSL&dJ(Lm4wU zee4O<+?F(M%c9RvU>+Zw%0}6EwN^tdp&HsBW^vy}|7*2dS)(T^t1j@+h|{9|8@uWT z)49X13vGC}4K3Jk;NDi()(d`KJ{NlK*gAL(Eyjv@A6qLsu+dc^6{oMP{;F}=jCkrm zr+Y&M{f-0eA(MH9Z=J}2uPPM0uJZMk?bB7b@2vb>qhOzEp0aswPN+tvts!!gS!j`r zF^b(zh^mo4YpuLRGQP5@E_?1G8Qar}(zfV!R{A0tzdrLRS;GN0P?-){k?z*=)R%8Q z^0O8P9vo%T@R)Vvgr^)+@vc2V%6FTXd7IsQBfQfDa^)nf2pX784|tm5R`VDSq*C|- z@SF?J;T*URZ@~&aoA}j$RlFKl5V+X#Hnu!QDF>hKZ_xf>vP*g5Wx3BNMt8X(xioiM>*1#I6Pzu<<*vg>nKe?eqhNd<>k3ZhpkqYG1K;_h7*?kwJ|~?3GknY!$v@w|?)G-IfByCB?*LGP-YiTJXiE`Phb&5}kJtgL zrlMbE84Cuy8m4hJh!Tmv!%@sdHH$}mlwr-@W7QF0ch2`p)2 zF-!W@*8U?NC<0g7ZukCfv$y4J*SfCXa~ic>x7Ts%&hDPm@dzxtV-AAxMcYA++$bwaK&&X<6|#tC%qV24wi$I@saJ7N!xy>n_s*gOvj{YB}Vz}TYZM* zL!B=P%;)#ild)e2&)kWUNZlpyTxD|)Q&3MsJ_~Iu<#EM3LZrfi4w?R?n+Pt`_<)Br zNQYSzGZm!?#rnYP59KXdF8KpaLmtFTpb)mJ$E?rkIyNu6XkPZo=4BVn%ht`y*3E03 zhAEdcNfjM36%43Cqx?yR-O4nI{n5rFNbEdT`#-uUmx@kC1D52D_BlP?n@TC8>S@N$ zh0c%Q{1*KCLf9QR$e$ZrL#`XVg}iO>edJw(zrd58!kgB>cN0(iCT4-)yZjrp9xi|N mGkAaKJnZ2!&kDdYJizCCAq8KM{$JMs literal 0 HcmV?d00001 diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.class b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.class new file mode 100644 index 0000000000000000000000000000000000000000..24f7366c540adeb8e0f72bde6596823b89febfe1 GIT binary patch literal 7561 zcmeHMTXWk)6h2DR$aa&a4HW1FDq3hAE;gm*(z>LCG-*TaB#qrb%Tusbko-#0buvWV|=i77J)#~%FfBpC~5zP|U zX+)zNfo~OCrtKCt%q_F%`HiC4HmxQr);*`)wA}#r^^U{*V%zC7AZOy97a4S%Vg;8f zbL-64X;h;l62mdwMsaz4gIQdotj{cFZ!tg6Xslee175;l)o!>Z@Ayok6LRosxu;s? zzU?+jGY~wqqdjLqe_YJD;(Oe)JV&FcK^=`I<~%pxrpwn%r^7OISfkNurM41jS6jS& z(+gmj1QXpA&qsGsV27^Ei(8EjGuK>qm=Kxm@TNu?F@7gtzD7A|i5UbB>X9nOtK9T? ztz3;Bi;-#>YC+)C{EnD26EwXCwTErEJt4zbW39Gha`Y$5vm&lL1H$(fbe256)Nz~) zJ+IMGLyQ=%$BlJnxEO}ewi7Ja4qGvWg=1H3*XA>rC||Ca?b7s`Mg@7Ri0@$ZW~9RC zoL6T$y#$+jIhpr;&(F{~ZSw0ouFnF`**>h_S>Fow0#fJY6Vw}T(;I^Mx9xX z=|c$Bv}rb&aR#+j2y3hGXl)h3+A7GP6l86kG3p)*q_-`TTTO!llx??BRdG<1Zvn}0 z3&PgI9;XN`wOehJfFS`o+;$AhbfX~ec-kk3N%lp;3ix;8A~R)sNlDm?n41zVO?{*; zr2mTGcA7}<3z`4P5IA0I-P=scFm`&SNY%N2X+!bE;GSU`9Iv`uR=o5RM8a2og3z#V zQcbomlzqY>=sW);l)~^#Tf_m(wrp+$oi_7vqQU9W?^xXPjqnJYpEm5k=-`Zd-*#EO zU{u5*3@^Bw8o~8`~L+el}GzR>1uXZ6*Rnfr`oy?RT&sq)Q4vtJe;`dt` zT~GEqd3_@XP2O^%6rWe*;NJA0H5#2$NGb(05}s{?%*vUZgD7k<7oE!rfWe6dM?}Hq zx{E&03FK9_+t1MZsLsT*?8$yN_G+Irz zWKc87q#R6&b~Dg}+%NpHEH(hMUER}DfR(qnts>?9n{|e28ZGS}Rk6qPYb7SJ z&K$;>*y>Tg`LehHnVO-GQ!VV|R|G1xX}WcX#o~7|-?xjDyN~3|pCXpYZpPx6=wsFE z_*UfOq}b*|x?D1^8l7D2xExDs(cQ8G8}FG}L83}-7_S4pESUnVuXU6`Y*wAXpijtw z9qwDF`ylN_OmqUNo$aPqrwu$1yP!_sz7L>abaH_gTfsV^i1cVl=mf4l_NPQxZQ%YZ zHjWQ&Ls0PnT_9lLFOefOMF(jNJsrIf%AlWpq@SZhcs?$lPvH3^`h@mK)E*~ z_3{sN{ulH{=oMUrH^RPGaUGZUIeLv=M-TrDP!ZQ11QCG{;SB}Cw~s-1vun%6F4Dm+ z(j^7b_X;GUx9OeKw*2-Ogm+^Iy?Cg+`CW-{nbITtp+vYsCB)+@{2zra?{y13>DtrF zw#uFvCE7Br#C*H0z^W=Na}-z_-J!LZZ@s*Kq(Jyafk1SZ?!^##>);aw!gmUU1N0ek mGD4rz7ih(b`x0${-zl0PlPtQ8T42;b)NI;B^jhT6SAPSr!t_!A literal 0 HcmV?d00001 diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/exception/AlertEmailException.class b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/exception/AlertEmailException.class new file mode 100644 index 0000000000000000000000000000000000000000..eeb90011054d77cf75d7fa805be8fc4c5e61671c GIT binary patch literal 1098 zcmcIjO>Yx15PeQVH(3HLDTVSSnVx{d?u8RYNEHeKDS$*nB@h?KYh_(_?UmOl?U7%F z1QOi&QHb#dl2BDhAULc&9?v|_n|b^7+sDrUc5x#@i{W+cWLgSs(gSfQQtKwEsD#W_ zn%SbtwW-O@riF58RZJ%oC&>1xqMRaCM^aT@Ta)ev?;tn_KYbC}4C@VSA6eUHc8QLcEVWFZ^{5udkWqWCtkOJ?knlkAciyQE>4H0+W&yKSCXRdZuK zFNK#m_XMwwDx$LtPpwQsE0a)l^4E{W-4|2ib*bi^ol|4(l_ z40ldZ)RM;L^ctDPdv@xidZa_qTc-%PnIp;ciILXSy7tQW$67hzWPTjsGO7FIq#|7T zMf0=KM7YMVvC#6o4u;-SUDqW15lynjO)#v`-wCwHqW;nv(djOETeQcY(0SF5KcM%e xi8)VehynUoqqW!AG1hT`P6466gb{e`T*4Nveh2wVL^c2b literal 0 HcmV?d00001 diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/AlertTemplate.class b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/AlertTemplate.class new file mode 100644 index 0000000000000000000000000000000000000000..0171b8245500ca4648a9a600888aa3f2adea22a0 GIT binary patch literal 1248 zcmcIkO>fgc5S=Y0c1$2`pyit`JvBYpAaNoUQibR#g+tOxaNF3Uc#G||b~gon84^fv z=Wp;o5VN+UQi!U6#AUrRo_RBG^k%>P`1Az;_JMn_!eC@{9OXh5(TO+}ko;+vM_W{W*O?J%w|)H6Lhx`Qcf0G%*#wzjP{*#+*ls0GFYqdGEq#USCbQrEdzfq z&SW9&GX|G-`o|1bpQ{8tXfx=ZMZeHmX&6jJ+T3vcQfKDGS zLyK&Wtlh>Nd>pJ Y6;=Q@;Z}uqyE^Z{7JXY(?=IZ`3BL+p*W_B;XPwVo z_lg&M3%&>vNbsHyg?P?R+H`Rmhqa|@t18Lae(rbAJ^${0=l=cA?|%Y76`T@G5O^9Z z*9n*iogKEv9I4t4iGsSQkCI#GWW~lQ1Mv$d)%Y03?hN^5Hh5Zk}aPH@z>Ofrm>AbY@@XO zU&qRH7eOSIrYTaQg-=};n(5Jx*VB88Q{P=dY;T5|W?H~|x5lrFCz((t$M z@8sZ9Eh(e=MZ~k{G%cD_VQ7%VnqrV+zVc9~2_?b~SHffzYsFeI7qgA)j`Zk}YGJpz z-r#YJ3H?yXpjSi|8(N95y-XV&`Min4F4LBjK4;;QRawV@gex?SlZY!U8X*plxLPWj z)wabYDq@<19^V!rYOsw@ux$!szqCy^jNX|PWuYko8E_w@RoU9(N(qmTFi@uPi3oM) zJOZm(eNe9rmDyuTFf5?xx!RA-0%GgF&)dwes&-%`6i%(9QbrpJj0?J*4Y#bwRMugl+BMnc} zp(9z9Q+J647R=5-3FZjAy;wI))=AGwGNo3`F~%%zcKBuzw76=TjWvP!x^$WUq`T4X z-kj1M5fgY;KbfPI9JaMW;6^@cBJgF7^7S5vTKQ>daB2i@|B!@Q1bjW*6S2UVRn6H% zdI*CPvFbhkvr>jzggh&7T+{1ucCmFa7!!f(=-4!n4Cn3gVgmPayqf3BGJHU$zboLN zp}98577F=rcvfFAvnyuSA5>?#5x-()hsVn=pEG0?V4S0XVzOf|)n^$HV=H$VJK(;? zEJA!=A6bL$=Bz~Y|F~yWuK3^O;eP~f9VG~BI`Dh1RtS8Rlgfj{ zAUC=164Lk|lDp6*w2;v7o$Am%@fq+>q*)D_D3?DJhFIRrVSVXqXac2r`m%1N1fLNo z_n2J?K0oq`Kbs4InGF%g_#Vwv@)+&_zLLk!HT<`OYxrA&GJaR^>VA43!1@EMr}Hzv z!5e?!-3fRTzo$_KU>^SfX419=*WoR^Laq!qQ0kqo)J^>Dp-o{sLwh#|?TZ{VfZOn1 zpFWcZ2=C`0)N&C%1lor%ae#0q2jO`x!bk9NAHtyypX4C?nu9P2_i)q+SUj-G5?b{xTCy z^jZHWjnh307d-+*NHo68PTT3X-+Y~EzkdJl2>{ygpbj+#yUwPGN9U7$aUc?7dxmg5)V>|t5o7Dl|`NzbX*(HbK%oI z_XLXX3Zgs=N@~SHtvGOv&-sf1Q<)dWdQN+JN}ACRyU2g$c;1kTM(L%x0IZW3ZRCZL zsr1~H1zI`x)@QBO^ft<&gHH3o=2 zLSuI}dJmJIX|@K_WJ3(VEXmc@#BA-`~-0jX--i679|z(C&^v NTN;TrPi$&%{|CG^$8i7v literal 0 HcmV?d00001 diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.class b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.class new file mode 100644 index 0000000000000000000000000000000000000000..1d53494eb0e811b8f847c8f08b6b7880ccfa43ba GIT binary patch literal 8188 zcmeHMOK;mo5FRS3B{6R8I!PZ%ADf(P1RyUx)kOipO%NAyY}kr{9M|MZ+=SdEc9&}N z%L*hwbI*?|I!h`rUDFihI#3Yn!q*OGXTF)?JoxUP*M9>*AMSUc<-nmg<$azId!1zzaF1Y#Cfg77!#}2f2WXL+ub71Y1_K{Ljb>XJ7-hU<((=wj0kOVSG zc}xwLf}~2G#4OQ26Sp^v7ztSrQ-wq*^-DTtgNJWZZ-P|HvlT3tc#07@I2v_i$X0a(#dt@)u z#;zb0p~A*Z!MMZ{Jsabu0!U&cp~SpOncF+}A-Q7u0T(Y>_=M_ckESzt9~s3(Rg9Je zE^wN`X`WpNd?rZqu)8`X`byDP4Ww(d_$Dw^n_qC$^sd|r?(5@sS9k})%<;ZwYd@jFs7$#aC3JgxSSuCg*|8s7Dohnpg@hBTIK?{0?H$vYht#l&z1?2zj%8hI z374Xk3bDnac1S}moA_ES;bje4c;|k4Q52W4nTPfx_Tk#VDC=8Gcv-+}tytc@mhiH> z&tt-QXlu<~tI4OSa;@u>Rjwtxtd(o6(Ilhh#YnS{LepAt9&b8|3z=rTQsBg8{4u}xd-n7Du;2Xq_iF&ygt!eY0uQW76UVJfp0NX# zXfsS$&e9Q223qDLp)B?Xh2$p5Wib>gVc2&G&zO+O_F>B9t`pMsk)jQA1kRQ`lBr?x z$KErZIs%dBzo+GZ8v^saN6d|G6Il7PP)=n0zB&+A>`A_h?#R4tOe=K@eKxIU91iiuQ>s`@|pGC$8)hm-dNE z`>fJ|=9c2NXvSPRq7F&m}RXBIf#z7d>(bBnM5UlBOJ zezcl1G$=iEqO!QAPcU?s1wnv)vdU3?Y(ovYFXy%+iGiuY^W z+*Q)L6|lLJih`g$1%b-Vly|fmGk#8tNA60;2X1$B*2GBQ;)iZ^_r=zTr_b?r+kqbm zdGrbWs=*rqQfB~U=43gu!10HKS?jSbOvssdOV`w8@PZifp2l<6kNo<=UW+T`W|PF@?NUpU907#$lDsT oU8!YTtzo-X%l1P6+gc6VRt;MVe!|tXU>$B?+rizhzy|#MA1oE9wEzGB literal 0 HcmV?d00001 diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.class b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.class new file mode 100644 index 0000000000000000000000000000000000000000..42fd8f2ea62e8912300dc9901037393da0c2e41c GIT binary patch literal 8895 zcmeHNS#umU5N@rHJ>p=;Bm@YD;&9jrnE{G3Hla37T$maI6+5ZoQJ&TADw!)Ijlsn~ z;F(u`2USo7uN1$5-$K#S_*iEr8LinIz&v5E8WyORYxb(0|LiO6NxRxS^j2;2?)xTQoOw-BKY zlLY1rOu(X^`{ni>?kfV*LEP){lt9DtOlz4yOHbeAQAhXBcp4}Fg<~fS_G%n;MUTJ~ z4kp;!+!VctsVwCLF6q7%?{KM2m5QjhJlt~?XHKt(NT{m>CKi`&6PR3$JG>632+SS= z+(^?nZNRf+?)O_!%4Hnv@DBCkFcAS$B93U1#@hi8c>rlrJn3S|D0xt7aIvl(7 z5bESE>v6h(8ggXLU>q0WLBebm{OQ9;J%-B_{xgI8g z@P(o>OL&Tg7)h08zKT=w|rnul(zV0dtQ=)OuQ9_UX7VXTNgW3peq-ZhRAgvD`{+ zogj?l*8A}{TRNN`jtNG(Q}=U-0-U2xa4g%@DNo5tR`-<=*G(=>Z8*UlS%2l9b}Suh9tGpG(jk&#PlvF z%;#6JK*`Z7x8>u-0@i161j4bHqxE`Lr}lWlv4Xa+zOj(BU=GgAz)5(Hz?sG2(ul5w z%zBs>eUXLRJl)bEHi3CB_E~UyFXZ0qoK$@w33%T4ibYtLnbl>P8zCA#UKXa-bM9sq zDG~DZXh%qa{Iqp7#nfML`4iqjlCs=@S4n-#qEvG*rNmyWRQITis#?6{-YfGEkI-Bz zofn16`p(W{vnq?P>KDUtdme8;B}rAe30pbf|3_X!;H1L*K)=RluZs8Xw5Q_{ymBuP z_|xLbwTNEq<^4DlqrI)SGu2=1bN_Aw-XIg-J;ohdiKR-Y{!sh0X94cVUKTtCuaC&iRIFD(-MFMLNw^IFRYr`giQ~S=(q&`{(4Y*9;dO3c% z+r#Wiqqmj92lkLhY7HNH37plPX1V)ETAOi}`aCC_*UTK0NX$zuzN35l4{DfDP3^EC z!>8@{wa+#$?REGNX%016hmY|Y9Ph(AApO8weJ&h)ir>gT3r{@oCn09<9Mx?$@*Q$8sC}{b?qyZz&@pMM2_UHG&K4FV6f z3IoHn2_Ca!7DzP;SjNIJ4>(yeGVo?$hi^mJa>yX{MR_1<>(F;vIvEtI?uSml1jBv zd1$1fWzlxFsn9e}BR&)K%EeMp8!2 zB;zMWd(1{LaoA!BV5K=8%z`*p=E7(6jS{J=NM{4Ft1;nbEF&5VZ9Xd}VOobuCdF#9 ztf?d3f~Dd^uCxWT3oj8`TbIR@63J`#$MXAu#W=lM%0P~p5)9je*WT3{yBIbM?JzEv z)-=`;Pr1St*OTGVz)rRv4!Fkm{?%lkrO`qeyeNs}Pt4NuSfgAj75JQ*s)W%M=@F0i znI898<|xhC1yu>KY+iGa>UgbVyQ~Q3HpS(T*j0*6y4d^XypBp~`?i1Y?tR>=-3_eL z{!+=$Z7cL{+3k>}#^vn!*4m$F)JzVFUb{Y4m3~+oweAEDJXl|YCR`@)MyLB!j+P1B zv2t}CON!sklS8hGU4pv*kWTZ!^HXs)@MVL2rJV~U2r=G@P< z7El7eFRHrhN{RLY)e!;u3|mJ#Yr%&EepnjWy4fM%^<}O?z9(W%;My5y0ma!`6F#<5 zr8qro!uB)AjO8jNu+}S&3GAn)hE2e;MLhaMaRe7(6-O6w+=LeXw(;t7d`j@&`vtu3 zHr9TESAWB+2E2y9tHqNI*ue2xX$7yt6}&=8hzJdMb87V#{+~vB+ktk&f!4s-t|I1X sgli6jn@)uH&p`OVfpFkN*gOMa%YpFFiEtgW(1088Ns*NXd<31p0d#tNwg3PC literal 0 HcmV?d00001 diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/resources/logback.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/resources/logback.xml new file mode 100644 index 000000000000..9a182a18ef12 --- /dev/null +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/bin/src/test/resources/logback.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/dolphinscheduler-api/src/main/resources/application.yaml b/dolphinscheduler-api/src/main/resources/application.yaml index 9b0e94d64451..0c45ec6c4976 100644 --- a/dolphinscheduler-api/src/main/resources/application.yaml +++ b/dolphinscheduler-api/src/main/resources/application.yaml @@ -241,9 +241,9 @@ spring: on-profile: mysql datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler - username: root - password: root + url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC + username: dolphinscheduler_user + password: StrongPassword123! quartz: properties: - org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate + org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate \ No newline at end of file diff --git a/dolphinscheduler-master/src/main/resources/application.yaml b/dolphinscheduler-master/src/main/resources/application.yaml index 964fca836ce6..68dc45547af1 100644 --- a/dolphinscheduler-master/src/main/resources/application.yaml +++ b/dolphinscheduler-master/src/main/resources/application.yaml @@ -155,9 +155,10 @@ spring: on-profile: mysql datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler - username: root - password: root + url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC + username: dolphinscheduler_user + password: StrongPassword123! quartz: properties: org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate + diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/switchtask/SwitchLogicTaskTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/switchtask/SwitchLogicTaskTest.java new file mode 100644 index 000000000000..3e0db7de84d1 --- /dev/null +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/switchtask/SwitchLogicTaskTest.java @@ -0,0 +1,118 @@ +package org.apache.dolphinscheduler.server.master.runner.task.switchtask; + +import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.model.Property; +import org.apache.dolphinscheduler.plugin.task.api.model.SwitchResultVo; +import org.apache.dolphinscheduler.plugin.task.api.parameters.SwitchParameters; +import org.apache.dolphinscheduler.server.master.engine.workflow.runnable.IWorkflowExecutionRunnable; +import org.apache.dolphinscheduler.server.master.exception.MasterTaskExecuteException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +class SwitchLogicTaskTest { + + @Mock + private IWorkflowExecutionRunnable workflowExecutionRunnable; + + @Mock + private TaskExecutionContext taskExecutionContext; + + @InjectMocks + private SwitchLogicTask switchLogicTask; + + private SwitchParameters switchParameters; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + + // Mock taskExecutionContext and workflowExecutionRunnable + switchParameters = new SwitchParameters(); + when(taskExecutionContext.getTaskParams()).thenReturn("{}"); // mock task params + when(taskExecutionContext.getPrepareParamsMap()).thenReturn(new HashMap<>()); + } + + @Test + void testHandle_WithMatchingBranch() throws MasterTaskExecuteException { + // Set up switch parameters with matching branch condition + List switchResultVoList = new ArrayList<>(); + SwitchResultVo switchResultVo = new SwitchResultVo(); + switchResultVo.setCondition("true"); // simple condition that matches + switchResultVo.setNextNode(123L); // mock next branch node + switchResultVoList.add(switchResultVo); + + switchParameters.setSwitchResult(new SwitchParameters.SwitchResult(switchResultVoList, 999L)); + + // Mock the task instance and context setup + Map globalParams = new HashMap<>(); + when(taskExecutionContext.getPrepareParamsMap()).thenReturn(globalParams); + + // Execute the handle method + switchLogicTask.handle(); + + // Verify the task status + assertEquals(TaskExecutionStatus.SUCCESS, taskExecutionContext.getCurrentExecutionStatus()); + } + + @Test + void testHandle_DefaultBranch_WhenNoConditionMatches() throws MasterTaskExecuteException { + // Set up switch parameters with no matching branch condition + List switchResultVoList = new ArrayList<>(); + SwitchResultVo switchResultVo = new SwitchResultVo(); + switchResultVo.setCondition("false"); // condition that doesn't match + switchResultVo.setNextNode(123L); // mock next branch node + switchResultVoList.add(switchResultVo); + + switchParameters.setSwitchResult(new SwitchParameters.SwitchResult(switchResultVoList, 999L)); + + // Execute the handle method + switchLogicTask.handle(); + + // Verify the task params and status + verify(taskExecutionContext).setCurrentExecutionStatus(TaskExecutionStatus.SUCCESS); + assertEquals(999L, switchParameters.getNextBranch()); // Default branch should be selected + } + + @Test + void testHandle_ExceptionThrownWhenBranchDoesNotExist() { + // Mock the scenario where the branch does not exist in the workflow graph + when(workflowExecutionRunnable.getWorkflowExecuteContext() + .getWorkflowGraph() + .getTaskNodeByCode(anyLong())).thenReturn(null); + + // Execute the handle method and expect an exception + MasterTaskExecuteException thrown = assertThrows(MasterTaskExecuteException.class, () -> { + switchLogicTask.handle(); + }); + + // Verify that the exception message is as expected + assertTrue(thrown.getMessage().contains("please check the switch task configuration")); + } + + @Test + void testHandle_ThrowsExceptionWhenDefaultBranchIsMissing() { + // Set up switch parameters without a default branch + switchParameters.setSwitchResult(new SwitchParameters.SwitchResult(new ArrayList<>(), null)); + + // Execute the handle method and expect an IllegalArgumentException + IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, () -> { + switchLogicTask.handle(); + }); + + // Verify that the exception message is as expected + assertTrue(thrown.getMessage().contains("please check the switch task configuration")); + } + +} diff --git a/dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/StandaloneServer.java b/dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/StandaloneServer.java index 4184aecfff02..cc986d59f490 100644 --- a/dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/StandaloneServer.java +++ b/dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/StandaloneServer.java @@ -22,6 +22,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; + @Slf4j @SpringBootApplication public class StandaloneServer { diff --git a/pom.xml b/pom.xml index 80560f8334b9..3748be8a3913 100755 --- a/pom.xml +++ b/pom.xml @@ -318,6 +318,7 @@ org.apache.dolphinscheduler dolphinscheduler-dao-mysql ${project.version} + compile diff --git a/qodana.yaml b/qodana.yaml new file mode 100644 index 000000000000..cee4e3dbb228 --- /dev/null +++ b/qodana.yaml @@ -0,0 +1,31 @@ +#-------------------------------------------------------------------------------# +# Qodana analysis is configured by qodana.yaml file # +# https://www.jetbrains.com/help/qodana/qodana-yaml.html # +#-------------------------------------------------------------------------------# +version: "1.0" + +#Specify inspection profile for code analysis +profile: + name: qodana.starter + +#Enable inspections +#include: +# - name: + +#Disable inspections +#exclude: +# - name: +# paths: +# - + +projectJDK: 17 #(Applied in CI/CD pipeline) + +#Execute shell command before Qodana execution (Applied in CI/CD pipeline) +#bootstrap: sh ./prepare-qodana.sh + +#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline) +#plugins: +# - id: #(plugin id can be found at https://plugins.jetbrains.com) + +#Specify Qodana linter for analysis (Applied in CI/CD pipeline) +linter: jetbrains/qodana-jvm-community:latest From 7db3e69d57c49831f30c220cd968dd3cfe6dd1b8 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Sun, 20 Oct 2024 14:37:46 +0545 Subject: [PATCH 33/34] made some changes --- dolphinscheduler-api/src/main/resources/application.yaml | 6 +++--- dolphinscheduler-master/src/main/resources/application.yaml | 6 +++--- .../java/org/apache/dolphinscheduler/StandaloneServer.java | 1 - pom.xml | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dolphinscheduler-api/src/main/resources/application.yaml b/dolphinscheduler-api/src/main/resources/application.yaml index 0c45ec6c4976..629d06453044 100644 --- a/dolphinscheduler-api/src/main/resources/application.yaml +++ b/dolphinscheduler-api/src/main/resources/application.yaml @@ -241,9 +241,9 @@ spring: on-profile: mysql datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC - username: dolphinscheduler_user - password: StrongPassword123! + url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler + username: root + password: root quartz: properties: org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate \ No newline at end of file diff --git a/dolphinscheduler-master/src/main/resources/application.yaml b/dolphinscheduler-master/src/main/resources/application.yaml index 68dc45547af1..1953d4bc3589 100644 --- a/dolphinscheduler-master/src/main/resources/application.yaml +++ b/dolphinscheduler-master/src/main/resources/application.yaml @@ -155,9 +155,9 @@ spring: on-profile: mysql datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC - username: dolphinscheduler_user - password: StrongPassword123! + url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler + username: root + password: root quartz: properties: org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate diff --git a/dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/StandaloneServer.java b/dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/StandaloneServer.java index cc986d59f490..4184aecfff02 100644 --- a/dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/StandaloneServer.java +++ b/dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/StandaloneServer.java @@ -22,7 +22,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @Slf4j @SpringBootApplication public class StandaloneServer { diff --git a/pom.xml b/pom.xml index 3748be8a3913..80560f8334b9 100755 --- a/pom.xml +++ b/pom.xml @@ -318,7 +318,6 @@ org.apache.dolphinscheduler dolphinscheduler-dao-mysql ${project.version} - compile From 8836f76286aad170b9939a5548da16a9d7d67818 Mon Sep 17 00:00:00 2001 From: binitshrest Date: Sun, 20 Oct 2024 15:18:35 +0545 Subject: [PATCH 34/34] made some changes --- qodana.yaml | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 qodana.yaml diff --git a/qodana.yaml b/qodana.yaml deleted file mode 100644 index cee4e3dbb228..000000000000 --- a/qodana.yaml +++ /dev/null @@ -1,31 +0,0 @@ -#-------------------------------------------------------------------------------# -# Qodana analysis is configured by qodana.yaml file # -# https://www.jetbrains.com/help/qodana/qodana-yaml.html # -#-------------------------------------------------------------------------------# -version: "1.0" - -#Specify inspection profile for code analysis -profile: - name: qodana.starter - -#Enable inspections -#include: -# - name: - -#Disable inspections -#exclude: -# - name: -# paths: -# - - -projectJDK: 17 #(Applied in CI/CD pipeline) - -#Execute shell command before Qodana execution (Applied in CI/CD pipeline) -#bootstrap: sh ./prepare-qodana.sh - -#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline) -#plugins: -# - id: #(plugin id can be found at https://plugins.jetbrains.com) - -#Specify Qodana linter for analysis (Applied in CI/CD pipeline) -linter: jetbrains/qodana-jvm-community:latest