From 16913bacd79fbbdc9caa9154e9c9161be0a6ad68 Mon Sep 17 00:00:00 2001
From: Jave-Chen <acc4hf@126.com>
Date: Fri, 17 Jan 2020 21:55:50 +0800
Subject: [PATCH 01/13] fix return, obj error (#1855)

---
 .../api/service/ExecutorService.java              |  4 +++-
 .../common/model/DateInterval.java                | 15 +++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index 8fa4c013c7..3296624df3 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -550,7 +550,9 @@ public class ExecutorService extends BaseService{
         }else{
             command.setCommandParam(JSONUtils.toJson(cmdParam));
             return processDao.createCommand(command);
-        }  
+        }
+
+        return 0;
     }
 
     /**
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
index 9dc2f34cc1..4ea764cf80 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
@@ -35,12 +35,15 @@ public class DateInterval {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        DateInterval that = (DateInterval) o;
-        return startTime.equals(that.startTime) &&
-                endTime.equals(that.endTime);
-        
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        } else if (this == obj) {
+            return true;
+        } else {
+            DateInterval that = (DateInterval) obj;
+            return startTime.equals(that.startTime) &&
+                    endTime.equals(that.endTime);
+        }
     }
 
     public Date getStartTime() {

From 9549910fccb52b2b8726ca26c79dd6daa3aff385 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Sun, 19 Jan 2020 11:59:06 +0800
Subject: [PATCH 02/13] Fix UDF function list delete data without refresh and
 page data display widened #1851 (#1853)

* fix udfs assignment and task instance page jump #1789

* jest add coverage display

* Fix data echo, style, popup cannot be closed and license

* Fix data echo, style, popup cannot be closed and license

* fix

* Requests the previous page when there is no data on the list page

* Fix DAG task nodes keep requesting API and tooltip background color modification

* Modify list tooltip theme color

* Fix UDF function list delete data without refresh and page data display widened
---
 .../resource/pages/udf/pages/function/_source/createUdf.vue | 3 ++-
 .../resource/pages/udf/pages/function/_source/list.vue      | 3 ++-
 .../src/js/module/components/transfer/resource.vue          | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
index 13a337d557..01d8d22650 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
@@ -76,7 +76,8 @@
                     filterable
                     v-model="resourceId"
                     :disabled="isUpdate"
-                    style="width: 200px">
+                    :add-title="true"
+                    style="width: 261px">
               <x-option
                       v-for="city in udfResourceList"
                       :key="city.id"
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
index 5f788f8223..ed441baad0 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
@@ -142,7 +142,7 @@ v-ps<template>
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
-          this.$emit('_updateList')
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
@@ -156,6 +156,7 @@ v-ps<template>
           showMask: true,
           escClose: true,
           className: 'v-modal-custom',
+          width: '800px',
           transitionName: 'opacityp',
           render (h) {
             return h(mCreateUdf, {
diff --git a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
index 8b7da81d37..1192ab206e 100644
--- a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
+++ b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
@@ -17,7 +17,7 @@
 <template>
   <m-popup :ok-text="$t('Submit')" :nameText="type.name + $t('Authorize')" @ok="_ok" ref="popup">
     <template slot="content">
-      <div class="clearfix transfer-model">
+      <div class="clearfix transfer-model" style="width: 660px">
         <div>
             <x-button-group v-model="checkedValue" size="small">
                 <x-button type="ghost" value="fileResource" @click="_ckFile">{{$t('File resources')}}</x-button>
@@ -195,7 +195,7 @@
   .transfer-model {
     padding: 0 20px;
     .select-list-box {
-      width: 220px;
+      width: 300px;
       float: left;
       border: 1px solid #dcdee2;
       border-radius: 3px;
@@ -237,7 +237,7 @@
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
-              width: 210px;
+              width: 290px;
               display: inline-block;
             }
             &:hover {

From 30db5c1467a972f5e851fd61c3a2039705d7a618 Mon Sep 17 00:00:00 2001
From: liwenhe1993 <32166572+liwenhe1993@users.noreply.github.com>
Date: Mon, 20 Jan 2020 16:26:23 +0800
Subject: [PATCH 03/13] Api module relp server module/1756 (#1766)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove server module on api module

1. Remove server module and add dao module.
2. Move quartz in server module to dao module.
3. Update config and class.


to resolve conflicts，I deleted CombinedApplicationServer.java

Co-authored-by: dailidong <dailidong66@gmail.com>
---
 .../dolphinscheduler/conf/quartz.properties   |  2 +-
 dolphinscheduler-api/pom.xml                  | 32 ++++---------------
 .../api/service/SchedulerService.java         |  4 +--
 .../src/main/resources/quartz.properties      |  2 +-
 .../dao}/quartz/DruidConnectionProvider.java  |  2 +-
 .../dao}/quartz/ProcessScheduleJob.java       |  2 +-
 .../dao}/quartz/QuartzExecutors.java          |  2 +-
 .../server/master/MasterServer.java           |  4 +--
 .../mysql/dolphinscheduler_dml.sql            |  2 +-
 9 files changed, 17 insertions(+), 35 deletions(-)
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server => dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao}/quartz/DruidConnectionProvider.java (99%)
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server => dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao}/quartz/ProcessScheduleJob.java (98%)
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server => dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao}/quartz/QuartzExecutors.java (99%)

diff --git a/dockerfile/conf/dolphinscheduler/conf/quartz.properties b/dockerfile/conf/dolphinscheduler/conf/quartz.properties
index 21ebd5e29d..a83abad5bc 100644
--- a/dockerfile/conf/dolphinscheduler/conf/quartz.properties
+++ b/dockerfile/conf/dolphinscheduler/conf/quartz.properties
@@ -47,7 +47,7 @@ org.quartz.jobStore.dataSource = myDs
 #============================================================================
 # Configure Datasources
 #============================================================================
-org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.server.quartz.DruidConnectionProvider
+org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.dao.quartz.DruidConnectionProvider
 org.quartz.dataSource.myDs.driver = org.postgresql.Driver
 org.quartz.dataSource.myDs.URL=jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
 org.quartz.dataSource.myDs.user=root
diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index ae28a48bb5..1c0ba5e33b 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -31,35 +31,19 @@
     <dependency>
       <groupId>org.apache.dolphinscheduler</groupId>
       <artifactId>dolphinscheduler-alert</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.dolphinscheduler</groupId>
-      <artifactId>dolphinscheduler-server</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-all</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-        <exclusion>
-          <artifactId>leveldbjni-all</artifactId>
-          <groupId>org.fusesource.leveldbjni</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>protobuf-java</artifactId>
-          <groupId>com.google.protobuf</groupId>
+          <groupId>org.apache.dolphinscheduler</groupId>
+          <artifactId>dolphinscheduler-dao</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.dolphinscheduler</groupId>
+      <artifactId>dolphinscheduler-dao</artifactId>
+    </dependency>
+
     <!--springboot-->
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -92,8 +76,6 @@
       </exclusions>
     </dependency>
 
-
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-aop</artifactId>
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
index 3c4a42e6cf..582107953e 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
@@ -35,8 +35,8 @@ import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
 import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
 import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
 import org.apache.dolphinscheduler.dao.utils.cron.CronUtils;
-import org.apache.dolphinscheduler.server.quartz.ProcessScheduleJob;
-import org.apache.dolphinscheduler.server.quartz.QuartzExecutors;
+import org.apache.dolphinscheduler.dao.quartz.ProcessScheduleJob;
+import org.apache.dolphinscheduler.dao.quartz.QuartzExecutors;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.quartz.CronExpression;
diff --git a/dolphinscheduler-common/src/main/resources/quartz.properties b/dolphinscheduler-common/src/main/resources/quartz.properties
index ceec9e5d64..c9a23af991 100644
--- a/dolphinscheduler-common/src/main/resources/quartz.properties
+++ b/dolphinscheduler-common/src/main/resources/quartz.properties
@@ -58,6 +58,6 @@ org.quartz.jobStore.dataSource = myDs
 #============================================================================
 # Configure Datasources  
 #============================================================================
-org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.server.quartz.DruidConnectionProvider
+org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.dao.quartz.DruidConnectionProvider
 org.quartz.dataSource.myDs.maxConnections = 10
 org.quartz.dataSource.myDs.validationQuery = select 1
\ No newline at end of file
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/DruidConnectionProvider.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/DruidConnectionProvider.java
similarity index 99%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/DruidConnectionProvider.java
rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/DruidConnectionProvider.java
index 05100ac374..8a4ceba927 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/DruidConnectionProvider.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/DruidConnectionProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.quartz;
+package org.apache.dolphinscheduler.dao.quartz;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import org.quartz.SchedulerException;
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/ProcessScheduleJob.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/ProcessScheduleJob.java
similarity index 98%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/ProcessScheduleJob.java
rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/ProcessScheduleJob.java
index 9a19233cba..ac461296a9 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/ProcessScheduleJob.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/ProcessScheduleJob.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.quartz;
+package org.apache.dolphinscheduler.dao.quartz;
 
 
 import org.apache.dolphinscheduler.common.Constants;
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/QuartzExecutors.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/QuartzExecutors.java
similarity index 99%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/QuartzExecutors.java
rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/QuartzExecutors.java
index d4ad08faec..054d7903fc 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/QuartzExecutors.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/QuartzExecutors.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.quartz;
+package org.apache.dolphinscheduler.dao.quartz;
 
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
index 65c5607af7..0647b9450b 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
@@ -27,8 +27,8 @@ import org.apache.dolphinscheduler.common.utils.StringUtils;
 import org.apache.dolphinscheduler.dao.ProcessDao;
 import org.apache.dolphinscheduler.server.master.config.MasterConfig;
 import org.apache.dolphinscheduler.server.master.runner.MasterSchedulerThread;
-import org.apache.dolphinscheduler.server.quartz.ProcessScheduleJob;
-import org.apache.dolphinscheduler.server.quartz.QuartzExecutors;
+import org.apache.dolphinscheduler.dao.quartz.ProcessScheduleJob;
+import org.apache.dolphinscheduler.dao.quartz.QuartzExecutors;
 import org.apache.dolphinscheduler.server.zk.ZKMasterClient;
 import org.quartz.SchedulerException;
 import org.slf4j.Logger;
diff --git a/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql b/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql
index de56f02b27..6aeafcd700 100644
--- a/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql
+++ b/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql
@@ -20,6 +20,6 @@ UPDATE QRTZ_CRON_TRIGGERS SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='Ea
 UPDATE QRTZ_TRIGGERS SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='EasyScheduler';
 UPDATE QRTZ_FIRED_TRIGGERS SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='EasyScheduler';
 UPDATE QRTZ_JOB_DETAILS SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='EasyScheduler';
-UPDATE QRTZ_JOB_DETAILS SET JOB_CLASS_NAME='org.apache.dolphinscheduler.server.quartz.ProcessScheduleJob' WHERE JOB_CLASS_NAME='cn.escheduler.server.quartz.ProcessScheduleJob';
+UPDATE QRTZ_JOB_DETAILS SET JOB_CLASS_NAME='org.apache.dolphinscheduler.dao.quartz.ProcessScheduleJob' WHERE JOB_CLASS_NAME='cn.escheduler.server.quartz.ProcessScheduleJob';
 UPDATE QRTZ_LOCKS SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='EasyScheduler';
 UPDATE QRTZ_SCHEDULER_STATE SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='EasyScheduler';
\ No newline at end of file

From a1b918c3640da933c6c147dc673f7e1a9261728f Mon Sep 17 00:00:00 2001
From: "gabry.wu" <wu_shao_jie@qq.com>
Date: Mon, 20 Jan 2020 16:35:17 +0800
Subject: [PATCH 04/13] [Feature] createSchedule should return schedule's Id
 (#1861)

issue: https://github.com/apache/incubator-dolphinscheduler/issues/1860
---
 .../apache/dolphinscheduler/api/service/SchedulerService.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
index 582107953e..bdce9470ca 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
@@ -167,6 +167,7 @@ public class SchedulerService extends BaseService {
         processDefinitionMapper.updateById(processDefinition);
         putMsg(result, Status.SUCCESS);
 
+        result.put("scheduleId", scheduleObj.getId());
         return result;
     }
 

From 0d5c6e4e7c2a75eac44e1d8f711b2b1c3e8862ac Mon Sep 17 00:00:00 2001
From: "gabry.wu" <wu_shao_jie@qq.com>
Date: Wed, 22 Jan 2020 21:09:12 +0800
Subject: [PATCH 05/13] [Feature] set acquireTriggersWithinLock true (#1866)

issue: https://github.com/apache/incubator-dolphinscheduler/issues/1863
---
 dolphinscheduler-common/src/main/resources/quartz.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dolphinscheduler-common/src/main/resources/quartz.properties b/dolphinscheduler-common/src/main/resources/quartz.properties
index c9a23af991..2e3a2a0dc1 100644
--- a/dolphinscheduler-common/src/main/resources/quartz.properties
+++ b/dolphinscheduler-common/src/main/resources/quartz.properties
@@ -53,6 +53,7 @@ org.quartz.jobStore.tablePrefix = QRTZ_
 org.quartz.jobStore.isClustered = true
 org.quartz.jobStore.misfireThreshold = 60000
 org.quartz.jobStore.clusterCheckinInterval = 5000
+org.quartz.jobStore.acquireTriggersWithinLock=true
 org.quartz.jobStore.dataSource = myDs
 
 #============================================================================

From ff9009a5aeef3df1c2031f9bc2eaa094b9dc833c Mon Sep 17 00:00:00 2001
From: Jave-Chen <acc4hf@126.com>
Date: Wed, 22 Jan 2020 23:16:13 +0800
Subject: [PATCH 06/13] #1864 fix dependency and createCommand date check
 (#1865)

---
 dolphinscheduler-api/pom.xml                                  | 4 ++++
 .../apache/dolphinscheduler/api/service/ExecutorService.java  | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index 1c0ba5e33b..cf2aadfcb4 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -43,6 +43,10 @@
       <groupId>org.apache.dolphinscheduler</groupId>
       <artifactId>dolphinscheduler-dao</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.dolphinscheduler</groupId>
+      <artifactId>dolphinscheduler-server</artifactId>
+    </dependency>
 
     <!--springboot-->
     <dependency>
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index 3296624df3..c1689c5bec 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -499,10 +499,6 @@ public class ExecutorService extends BaseService{
             }
         }
 
-        if ( start == null || end == null) {
-            return 0;
-        }
-
         if(commandType == CommandType.COMPLEMENT_DATA){
             runMode = (runMode == null) ? RunMode.RUN_MODE_SERIAL : runMode;
             if(null != start && null != end && start.before(end)){

From 3c9508a1473471fe50caec57315581e1fe628261 Mon Sep 17 00:00:00 2001
From: DS <d66380022@163.com>
Date: Fri, 24 Jan 2020 09:50:21 +0800
Subject: [PATCH 07/13] Update README.md (#1867)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 27b5312f32..fc27ad68a0 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ It is because of the shoulders of these open source projects that the birth of t
 
 ### Get Help
 1. Submit an issue
-1. Subscribe the mail list : https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/subscribe.html.  then send mail to dev@dolphinscheduler.apache.org
+1. Subscribe the mail list : https://dolphinscheduler.apache.org/en-us/docs/development/subscribe.html.  then send mail to dev@dolphinscheduler.apache.org
 1. Contact WeChat group manager, ID 510570367. This is for Mandarin(CN) discussion.
 
 ### License

From 8574762b37ad83f7659e5f58ee966c6171560505 Mon Sep 17 00:00:00 2001
From: DS <d66380022@163.com>
Date: Fri, 24 Jan 2020 10:01:48 +0800
Subject: [PATCH 08/13] Update README_zh_CN.md (#1868)

---
 README_zh_CN.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README_zh_CN.md b/README_zh_CN.md
index c7173ad9ba..fcffd680e0 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -83,13 +83,12 @@ dolphinscheduler-dist/dolphinscheduler-src/target/apache-dolphinscheduler-incuba
 ### 感谢
 
 Dolphin Scheduler使用了很多优秀的开源项目，比如google的guava、guice、grpc，netty，ali的bonecp，quartz，以及apache的众多开源项目等等，
-正是由于站在这些开源项目的肩膀上，才有Dolphin Scheduler的诞生的可能。对此我们对使用的所有开源软件表示非常的感谢！我们也希望自己不仅是开源的受益者，也能成为开源的
-贡献者，于是我们决定把易调度贡献出来，并承诺长期维护。也希望对开源有同样热情和信念的伙伴加入进来，一起为开源献出一份力！
+正是由于站在这些开源项目的肩膀上，才有Dolphin Scheduler的诞生的可能。对此我们对使用的所有开源软件表示非常的感谢！我们也希望自己不仅是开源的受益者，也能成为开源的贡献者,也希望对开源有同样热情和信念的伙伴加入进来，一起为开源献出一份力！
 
 
 ### 获得帮助
 1. 提交issue
-1. 先订阅邮件开发列表:[订阅邮件列表](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/subscribe.html), 订阅成功后发送邮件到dev@dolphinscheduler.apache.org.
+1. 先订阅邮件开发列表:[订阅邮件列表](https://dolphinscheduler.apache.org/zh-cn/docs/development/subscribe.html), 订阅成功后发送邮件到dev@dolphinscheduler.apache.org.
 1. 联系微信群助手(ID:dailidong66). 微信仅用于中国用户讨论.
 
 ### 版权

From b5a1028f79a522f841be2600f5f77128c596995b Mon Sep 17 00:00:00 2001
From: DS <d66380022@163.com>
Date: Fri, 24 Jan 2020 10:08:38 +0800
Subject: [PATCH 09/13] Update README_zh_CN.md (#1869)

fix wrong upgrade url
---
 README_zh_CN.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_zh_CN.md b/README_zh_CN.md
index fcffd680e0..e782c1030d 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -50,7 +50,7 @@ Dolphin Scheduler Official Website
 
 - [**使用手册**](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/system-manual.html?_blank "系统使用手册")
 
-- [**升级文档**](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/release/upgrade.html?_blank "升级文档")
+- [**升级文档**](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/upgrade.html?_blank "升级文档")
 
 - <a href="http://106.75.43.194:8888" target="_blank">我要体验</a>
 

From 541f71c74a8e41abaa63c33b3564a5ca8729e194 Mon Sep 17 00:00:00 2001
From: DS <d66380022@163.com>
Date: Fri, 24 Jan 2020 10:11:30 +0800
Subject: [PATCH 10/13] Update README.md (#1870)

fix wrong upgrade url
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fc27ad68a0..3fbd6345b6 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Overload processing: Task queue mechanism, the number of schedulable tasks on a
 
 - [**User manual**](https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/system-manual.html?_blank "System manual")
 
-- [**Upgrade document**](https://dolphinscheduler.apache.org/en-us/docs/1.2.0/release/upgrade.html?_blank "Upgrade document")
+- [**Upgrade document**](https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/upgrade.html?_blank "Upgrade document")
 
 - <a href="http://106.75.43.194:8888" target="_blank">Online Demo</a>
 

From 0712ccc34284aa7a7053f8756b954eef50cd9617 Mon Sep 17 00:00:00 2001
From: Tboy <guo.jiwei@immomo.com>
Date: Sun, 26 Jan 2020 13:30:59 +0800
Subject: [PATCH 11/13] #1871 correct spelling (#1872)

* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer

* #1871 correct spelling
---
 .../server/master/runner/MasterExecThread.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
index 84b1114b84..2d0e99a867 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -187,7 +187,7 @@ public class MasterExecThread implements Runnable {
 
     /**
      * execute process
-     * @throws Exception excpetion
+     * @throws Exception exception
      */
     private void executeProcess() throws Exception {
         prepareProcess();
@@ -197,7 +197,7 @@ public class MasterExecThread implements Runnable {
 
     /**
      * execute complement process
-     * @throws Exception excpetion
+     * @throws Exception exception
      */
     private void executeComplementProcess() throws Exception {
 
@@ -247,7 +247,7 @@ public class MasterExecThread implements Runnable {
             // execute process ,waiting for end
             runProcess();
 
-            // process instace failure ，no more complements
+            // process instance failure ，no more complements
             if(!processInstance.getState().typeIsSuccess()){
                 logger.info("process {} state {}, complement not completely!",
                         processInstance.getId(), processInstance.getState());
@@ -304,7 +304,7 @@ public class MasterExecThread implements Runnable {
 
     /**
      * prepare process parameter
-     * @throws Exception excpetion
+     * @throws Exception exception
      */
     private void prepareProcess() throws Exception {
         // init task queue
@@ -332,7 +332,7 @@ public class MasterExecThread implements Runnable {
 
     /**
      *  generate process dag
-     * @throws Exception excpetion
+     * @throws Exception exception
      */
     private void buildFlowDag() throws Exception {
         recoverNodeIdList = getStartTaskInstanceList(processInstance.getCommandParam());
@@ -609,7 +609,7 @@ public class MasterExecThread implements Runnable {
     /**
      * query task instance by complete state
      * @param state state
-     * @return task isntance list
+     * @return task instance list
      */
     private List<TaskInstance> getCompleteTaskByState(ExecutionStatus state){
         List<TaskInstance> resultList = new ArrayList<>();
@@ -804,7 +804,7 @@ public class MasterExecThread implements Runnable {
     }
 
     /**
-     * add task to standy list
+     * add task to standby list
      * @param taskInstance task instance
      */
     private void addTaskToStandByList(TaskInstance taskInstance){

From 38eaaa98e689f1a84b416d39ea6e78140d56f2e2 Mon Sep 17 00:00:00 2001
From: Tboy <guo.jiwei@immomo.com>
Date: Mon, 27 Jan 2020 21:09:11 +0800
Subject: [PATCH 12/13] some updates for TaskQueueZkImpl (#1874)

small changes, no need more people review, I will merge.
---
 .../common/queue/TaskQueueZkImpl.java         | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java
index 5f834a2004..d442c13ebc 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java
@@ -30,7 +30,7 @@ import java.util.*;
 
 /**
  * A singleton of a task queue implemented with zookeeper
- * tasks queue implemention
+ * tasks queue implementation
  */
 @Service
 public class TaskQueueZkImpl implements ITaskQueue {
@@ -72,7 +72,7 @@ public class TaskQueueZkImpl implements ITaskQueue {
         } catch (Exception e) {
             logger.error("get all tasks from tasks queue exception",e);
         }
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 
     /**
@@ -196,11 +196,11 @@ public class TaskQueueZkImpl implements ITaskQueue {
                     }
                 }
 
-                List<String> taskslist = getTasksListFromTreeSet(tasksNum, taskTreeSet);
+                List<String> tasksList = getTasksListFromTreeSet(tasksNum, taskTreeSet);
 
-                logger.info("consume tasks: {},there still have {} tasks need to be executed", Arrays.toString(taskslist.toArray()), size - taskslist.size());
+                logger.info("consume tasks: {},there still have {} tasks need to be executed", Arrays.toString(tasksList.toArray()), size - tasksList.size());
 
-                return taskslist;
+                return tasksList;
             }else{
                 Thread.sleep(Constants.SLEEP_TIME_MILLIS);
             }
@@ -208,7 +208,7 @@ public class TaskQueueZkImpl implements ITaskQueue {
         } catch (Exception e) {
             logger.error("add task to tasks queue exception",e);
         }
-        return new ArrayList<String>();
+        return Collections.emptyList();
     }
 
 
@@ -221,15 +221,15 @@ public class TaskQueueZkImpl implements ITaskQueue {
     public List<String> getTasksListFromTreeSet(int tasksNum, Set<String> taskTreeSet) {
         Iterator<String> iterator = taskTreeSet.iterator();
         int j = 0;
-        List<String> taskslist = new ArrayList<>(tasksNum);
+        List<String> tasksList = new ArrayList<>(tasksNum);
         while(iterator.hasNext()){
             if(j++ >= tasksNum){
                 break;
             }
             String task = iterator.next();
-            taskslist.add(getOriginTaskFormat(task));
+            tasksList.add(getOriginTaskFormat(task));
         }
-        return taskslist;
+        return tasksList;
     }
 
     /**
@@ -330,22 +330,13 @@ public class TaskQueueZkImpl implements ITaskQueue {
      */
     @Override
     public Set<String> smembers(String key) {
-
-        Set<String> tasksSet = new HashSet<>();
-
         try {
             List<String> list = zookeeperOperator.getChildrenKeys(getTasksPath(key));
-
-            for (String task : list) {
-                tasksSet.add(task);
-            }
-
-            return tasksSet;
+            return new HashSet<>(list);
         } catch (Exception e) {
             logger.error("get all tasks from tasks queue exception",e);
         }
-
-        return tasksSet;
+        return Collections.emptySet();
     }
 
     /**

From a5536617dded33542790d4f44aa8ef6fcd3c7774 Mon Sep 17 00:00:00 2001
From: Tboy <guo.jiwei@immomo.com>
Date: Thu, 30 Jan 2020 19:50:04 +0800
Subject: [PATCH 13/13] remove unused properties in pom (#1876)

* #1875 remove unused properties in pom
---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6d55c1e99c..ebc7ccf68c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,8 +78,6 @@
 		<slf4j.api.version>1.7.5</slf4j.api.version>
 		<slf4j.log4j12.version>1.7.5</slf4j.log4j12.version>
 		<commons.collections.version>3.2.2</commons.collections.version>
-		<commons.lang.version>2.3</commons.lang.version>
-		<commons.lang3.version>3.5</commons.lang3.version>
 		<commons.httpclient>3.0.1</commons.httpclient>
 		<commons.beanutils.version>1.7.0</commons.beanutils.version>
 		<commons.configuration.version>1.10</commons.configuration.version>