# Conflicts:
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java

* Fix ProcessService ut

* codeStyle

* Fix AlertPlugin ut

* Fix AlertPlugin ut

* Fix server module ut

* Fix server module ut

* Fix api ut

* codeStyle
Co-authored-by: NJinyLeeChina <297062848@qq.com>

* [Improvement][Alert] Replace HSSFWorkbook

* add license

* reduce the number of data sources created twice by master server.

* update ProcessAlertManagerTest test class to increase coverage.

* add DolphinSchedulerPluginLoaderTest test ignore.

Co-authored-by: zhuang chong 

* update taskParams/add task delayTime/fix conditionType bug

* update codeStyle for merge to dev

* fix process lineage bug

* fix codeStyle for json_split

* Fix dao ut

* Fix dao ut

* codeStyle

* modify postgreSQL

* fix TaskInstanceMapper ut

* fix ProjectMapper ut

* fix ProcessDefinitionDao ut

* datasource

* fix postgreSQL
Co-authored-by: NJinyLeeChina <297062848@qq.com>

* update taskParams/add task delayTime/fix conditionType bug

* update codeStyle for merge to dev

* fix process lineage bug

* fix codeStyle for json_split
Co-authored-by: NJinyLeeChina <297062848@qq.com>

* Create RollViewLogRequestCommandTest.java

Add a test case about RollViewLogRequestCommand

* Update pom.xml

add the test files in the parent pom

* update taskParams/add task delayTime/fix conditionType bug

* update codeStyle for merge to dev

* fix process lineage bug
Co-authored-by: NJinyLeeChina <297062848@qq.com>

# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/procedure/ProcedureTask.java

# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/procedure/ProcedureTask.java

* [Improvement][DAO] Add Unique key to t_ds_worker_group t_ds_datasource

* Add exception catch

* add ddl

* fix ut

* replace access log by AccessLogAnnotaion

* fix codesytle error

* fix RequestContextHolder.getRequestAttributes may be null

* fix code style

* accessLogAnnotation addd ignore params

* fix style

* reduce code smells

* fix code style

* fix logtext if request is ignore

* add trance id

* fix code style

* add comment

* optimize

* fix code style

* fix code
Co-authored-by: Nhayden <hayden@haydendeMacBook-Pro.local>

Create a test case

* [Feature][Alert plugin] Support slack alert (#5382)

* fix code smell

* add markdown table

[Feature-4093][server] Support for stored procedures and stored function calls and data source supports DB2 (#4094)

* Support for stored procedures and stored function calls and data source supports DB2.
Co-authored-by: Nzhuangchong <zhuangchong8@163.com>

* Improvement-5346 :  Resource files support copy path operations

* Improvement-5346 :  Resource files support copy path operations

* this close #5346

The current resource file does not support copying paths

When using the path is very easy to output errors. Add copy button. Support copy operation

* fix code smell

* Create GetLogBytesRequestCommandTest.java

Add a test case about GetLogBytesRequestCommand

* Update GetLogBytesRequestCommandTest.java

* modify the code format

* Update GetLogBytesRequestCommandTest.java

Submitting the test again

* Update GetLogBytesRequestCommandTest.java

Code changes based on comments

* [Bug][api-server] delete the user ,when query the project by join the table of t_ds_user will return null. (#5326)

* when delete a user, do project ownership check

* fix ut

* fix vulnerability

* fix code style

* fix ut

* remove unused ut

* remove unused ut
Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>

* update taskParams/add task delayTime/fix conditionType bug

* update codeStyle for merge to dev
Co-authored-by: NJinyLeeChina <297062848@qq.com>

# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionVersionServiceImpl.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
#	dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
#	dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionVersionServiceTest.java
#	dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/processdure/ProcedureTask.java
#	dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java

Co-authored-by: NJinyLeeChina <297062848@qq.com>

This reverts commit b108ac43.

Co-authored-by: Nwen-hemin <wenhemin@apache.com>

[FixBug][JsonSplit] depend task, the field "process definition id" modify to "process definition code" (#5377)

* fix: depend task, the field "process definition id" modify to "process definition code"

* fix: depend task, the field "process definition id" modify to "process definition code"
Co-authored-by: Nwen-hemin <wenhemin@apache.com>

* [Improvement][API] Create Datasource #5083

  * Refact create/ update datasource API

* fix Code Smells

* fix code smell

* resolve code smell

* use ConnectionParam to replace BaseDatasource

* solve license

* add ut

* code check

* add ut

* fix ut coverage

* fix ut

[Improvement][Build] Optimize long release name and remove unused nginx release and upgrade spring boot version (#5308)

* [Build] Optimize long release name and remove unused nginx release

* [Build] Upgrade spring boot version

* [Improvement] Improve code style

* update SnowFlake

* update processDefinite from processInstance

* update processDefinite from processInstance

* Fix task logger path

* Fix dependTask bug

* Fix batchMove of processDefinition bug

* codeStyle
Co-authored-by: NJinyLeeChina <297062848@qq.com>

* [Improvement][DAO] Create CreateDolphinScheduler (#5357)

* add ut

* fix code smell

Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>

* update SnowFlake

* update processDefinite from processInstance

* update processDefinite from processInstance

* Fix task logger path

* Fix dependTask bug
Co-authored-by: NJinyLeeChina <297062848@qq.com>

* [Bug][worker] Fix sql task query result is empty (#5322)

* add ut

* remove duplicate

* add ut

* [improvement]modify all methods that refer to LogClientService in the code.

* delete unused code

* [Improvement] Optimized close of IO

Co-authored-by: Nwanghong1314 <wanghong1@onething.net>