Merge remote-tracking branch 'upstream/dev' into json_split

# 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

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java

@@ -38,7 +38,6 @@ import org.apache.dolphinscheduler.api.aspect.AccessLogAnnotation;
 import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
-import org.apache.dolphinscheduler.api.utils.RegexUtils;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.ReleaseState;

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java

@@ -74,6 +74,7 @@ public class DependentExecute {
 
     /**
      * constructor
+     *
      * @param itemList item list
      * @param relation relation
      */
@@ -84,6 +85,7 @@ public class DependentExecute {
 
     /**
      * get dependent item for one dependent item
+     *
      * @param dependentItem dependent item
      * @param currentTime   current time
      * @return DependResult
@@ -95,6 +97,7 @@ public class DependentExecute {
 
     /**
      * calculate dependent result for one dependent item.
+     *
      * @param dependentItem dependent item
      * @param dateIntervals date intervals
      * @return dateIntervals
@@ -124,6 +127,7 @@ public class DependentExecute {
 
     /**
      * depend type = depend_all
+     *
      * @return
      */
     private DependResult dependResultByProcessInstance(ProcessInstance processInstance) {
@@ -138,6 +142,7 @@ public class DependentExecute {
 
     /**
      * get depend task result
+     *
      * @param taskName
      * @param processInstance
      * @return
@@ -173,6 +178,7 @@ public class DependentExecute {
      * find the last one process instance that :
      * 1. manual run and finish between the interval
      * 2. schedule run and schedule time between the interval
+     *
      * @param definitionCode definition code
      * @param dateInterval   date interval
      * @return ProcessInstance
@@ -200,6 +206,7 @@ public class DependentExecute {
 
     /**
      * get dependent result by task/process instance state
+     *
      * @param state state
      * @return DependResult
      */
@@ -216,6 +223,7 @@ public class DependentExecute {
 
     /**
      * get dependent result by task instance state when task instance is null
+     *
      * @param state state
      * @return DependResult
      */
@@ -232,6 +240,7 @@ public class DependentExecute {
 
     /**
      * judge depend item finished
+     *
      * @param currentTime current time
      * @return boolean
      */
@@ -245,6 +254,7 @@ public class DependentExecute {
 
     /**
      * get model depend result
+     *
      * @param currentTime current time
      * @return DependResult
      */
@@ -265,6 +275,7 @@ public class DependentExecute {
 
     /**
      * get dependent item result
+     *
      * @param item        item
      * @param currentTime current time
      * @return DependResult

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/procedure/ProcedureTask.java

@@ -118,7 +118,6 @@ public class ProcedureTask extends AbstractTask {
             // get jdbc connection
             connection = DatasourceUtil.getConnection(dbType, connectionParam);
 
-
             // combining local and global parameters
             Map<String, Property> paramsMap = ParamUtils.convert(ParamUtils.getUserDefParamsMap(taskExecutionContext.getDefinedParams()),
                     taskExecutionContext.getDefinedParams(),
@@ -251,6 +250,7 @@ public class ProcedureTask extends AbstractTask {
 
     /**
      * get output parameter
+     *
      * @param stmt     stmt
      * @param index    index
      * @param prop     prop