This is an automated email from the ASF dual-hosted git repository.

journey pushed a commit to branch 1.2.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.2.0-release by this push:
     new af29d69  Replace DISCLAIMER with DISCLAIMER-WIP (#1389)
af29d69 is described below

commit af29d6939be554bfd08e81d27c700d09874b901a
Author: lgcareer <18610854...@163.com>
AuthorDate: Wed Dec 4 19:45:14 2019 +0800

    Replace DISCLAIMER with DISCLAIMER-WIP (#1389)
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * add profile test
    
    * add maven.deploy.skip true
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add dependency
    
    * add javadoc
    
    * add antrun
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * reset pgsql (#1178)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * [maven-release-plugin] rollback the release of 1.2.0
    
    * add javadoc
    
    * Ans UI upgrade to version 0.1.0 (#1181)
    
    + 1
    
    * add javadoc
    
    * add javadoc
    
    * add javadoc
    
    * Administrators group prohibit deletion (#1182)
    
    * Ans UI upgrade to version 0.1.0
    
    * Administrators group prohibit deletion
    
    * add javadoc
    
    * add ui pom
    
    * fix master server shutdown error (#1177)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log 
message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking 
Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate 
methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class (#1183)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log 
message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking 
Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate 
methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * add ui pom
    
    * add src pom and assembly
    
    * fix ZKWorkerClient not close PathChildrenCache (#1185)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log 
message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking 
Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate 
methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method (#1186)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log 
message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking 
Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate 
methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile dao application.properties ,install.sh modify and 
application.properties modify (#1187)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from 
appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * add src pom and assembly
    
    * add src pom and assembly
    
    * dockerfile startup.sh modify (#1189)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from 
appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs (#1191)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from 
appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1192)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from 
appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile conf modify (#1193)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from 
appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change (#1194)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from 
appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in english (#1195)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from 
appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify (#1198)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from 
appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify (#1199)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from 
appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese sql to english. (#1200)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * change chinese to english (#1202)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from 
appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * remove unused code (#1204)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * Modify webpack configuration (#1206)
    
    * add more message for java-doc (#1209)
    
    * move updateTaskState into try/catch block in case of exception
    
    * fix NPE
    
    * using conf.getInt instead of getString
    
    * for AbstractZKClient, remove the log, for it will print the same log 
message in createZNodePath.
    for AlertDao, correct the spelling.
    
    * duplicate
    
    * refactor getTaskWorkerGroupId
    
    * add friendly log
    
    * update hearbeat thread num = 1
    
    * fix the bug when worker execute task using queue. and remove checking 
Tenant user anymore in TaskScheduleThread
    
    * 1. move verifyTaskInstanceIsNull after taskInstance
    2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
    
    * fix the message
    
    * delete before check to avoid KeeperException$NoNodeException
    
    * fix the message
    
    * check processInstance state before delete tenant
    
    * check processInstance state before delete worker group
    
    * refactor
    
    * merge api constants into common constatns
    
    * update the resource perm
    
    * update the dataSource perm
    
    * fix CheckUtils.checkUserParams method
    
    * update AlertGroupService, extends from BaseService, remove duplicate 
methods
    
    * refactor
    
    * modify method name
    
    * add hasProjectAndPerm method
    
    * using checkProject instead of getResultStatus
    
    * delete checkAuth method, using hasProjectAndPerm instead.
    
    * correct spelling
    
    * add transactional for deleteWorkerGroupById
    
    * add Transactional for deleteProcessInstanceById method
    
    * change sqlSessionTemplate singleton
    
    * change sqlSessionTemplate singleton and reformat code
    
    * fix unsuitable error message
    
    * update shutdownhook methods
    
    * fix worker log bug
    
    * fix api server debug mode bug
    
    * upgrade zk version
    
    * delete this line ,for zkClient.close() will do the whole thing
    
    * fix master server shutdown error
    
    * degrade zk version and add FourLetterWordMain class
    
    * fix PathChildrenCache not close
    
    * add Transactional for createSession method
    
    * add more message for java-doc
    
    * add java doc for common module (#1213)
    
    * dao method comments and useless code modify (#1214)
    
    * add ConnectionFactoryTest and ConnectionFactory read datasource from 
appliction.yml
    
    * .escheduler_env.sh to dolphinscheduler_env.sh
    
    * dao yml assembly to conf directory
    
    * table name modify
    
    * entity title table  name modify
    
    * logback log name modify
    
    * running through the big process
    
    * running through the big process error modify
    
    * logback log name modify
    
    * data_source.properties rename
    
    * logback log name modify
    
    * install.sh optimization
    
    * install.sh optimization
    
    * command count modify
    
    * command state update
    
    * countCommandState sql update
    
    * countCommandState sql update
    
    * remove application.yml file
    
    * master.properties modify
    
    * install.sh modify
    
    * install.sh modify
    
    * api server startup modify
    
    * the current user quits and the session is completely emptied. bug fix
    
    * remove pom package resources
    
    * checkQueueNameExist method update
    
    * checkQueueExist
    
    * install.sh error output update
    
    * signOut error update
    
    * ProcessDao is null bug fix
    
    * install.sh add mail.user
    
    * request url variables replace
    
    * process define import bug fix
    
    * process define import export bug fix
    
    * processdefine import export bug fix
    
    * down log suffix format modify
    
    * import export process define contains crontab error bug fix
    
    * add Flink local mode
    
    * ProcessDao is null bug fix
    
    * loadAverage display problem bug fix
    
    * MasterServer rename Server
    
    * rollback .env
    
    * rollback .env
    
    * MasterServer rename Server
    
    * the task is abnormal and task is running bug fix
    
    * owners and administrators can delete
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * dockerfile optimization
    
    * remove application-alert.properties
    
    * task log print worker log bug fix
    
    * remove .escheduler_env.sh
    
    * change dockerfile email address
    
    * dockerfile dao application.properties and install.sh modify
    
    * application.properties modify
    
    * application.properties modify
    
    * dockerfile startup.sh modify
    
    * remove docs
    
    * nginx conf modify
    
    * dockerfile application.properties modify
    
    * dockerfile email address change
    
    * the alert module is modified in English.
    
    * alert server comment and chinese modify
    
    * api server useless code and chinese modify
    
    * common,dao,server useless code and chinese modify
    
    * change chinese to english
    
    * dao method comments and useless code modify
    
    * Change all Chinese names to English (#1207)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin (#1215)
    
    * Modify webpack configuration
    
    * Change all Chinese names to English
    
    * add progress-bar-webpack-plugin
    
    * Add method and parameters comments (#1220)
    
    * rename from DatasourceUserMapper to DataSourceUserMapper
    
    * add unit test in UserMapper and WorkerGroupMapper
    
    * change cn.escheduler to org.apache.dolphinscheduler
    
    * add unit test in UdfFuncMapperTest
    
    * add unit test in UdfFuncMapperTest
    
    * remove DatabaseConfiguration
    
    * add ConnectionFactoryTest
    
    * cal duration in processInstancesList
    
    * change desc to description
    
    * change table name in mysql ddl
    
    * change table name in mysql ddl
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * change escheduler to dolphinscheduler
    
    * remove log4j-1.2-api and modify AlertMapperTest
    
    * remove log4j-1.2-api
    
    * Add alertDao to spring management
    
    * Add alertDao to spring management
    
    * get SqlSessionFactory from MybatisSqlSessionFactoryBean
    
    * get processDao by DaoFactory
    
    * read druid properties in ConneciontFactory
    
    * read druid properties in ConneciontFactory
    
    * change get alertDao by spring to DaoFactory
    
    * add log4j to resolve #967
    
    * resole verify udf name error and delete udf error
    
    * Determine if principal is empty
    
    * Determine whether the logon user has the right to delete the project
    
    * Fixed an issue that produced attatch file named such as ATT00002.bin
    
    * fix too many connection in upgrade or create
    
    * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
    
    * Added a judgment on whether the currently login user is an administrator
    
    * fix update udf database not change and create time is changed
    
    * add enterprise.wechat.enable to decide whether to send enterprise WeChat
    
    * change method check
    
    * Remove the administrator's judgment on query access token list
    
    * only admin can create worker group
    
    * delete alert group need delete the relation of user and alert group
    
    * add timeout in proxy when upload large resource
    
    * add gets scheduled times by expect fire times
    
    * add gets scheduled times by expect fire times
    
    * Increase the judgment of whether it is admin
    
    * Increase the judgment of whether it is admin
    
    * when delete access token add whether login user has perm to delete
    
    * change mysql-connector-java scope to test
    
    * update scm test
    
    * add profile test
    
    * Add method and parameters comments
    
    * roll back
    
    * add some notes (#1221)
    
    * update english documents
    
    * refactor zk client
    
    * update documents
    
    * update zkclient
    
    * update zkclient
    
    * update documents
    
    * add architecture-design
    
    * change i18n
    
    * update i18n
    
    * update english documents
    
    * add architecture-design
    
    * update english documents
    
    * update en-US documents
    
    * add architecture-design
    
    * update demo site
    
    * add mybatis plus model
    
    * modify mybatisplus
    
    * modify mybatisplus
    
    * change interface by mybatisplus
    
    * add unit test
    
    * refactor dao interface.
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * add unit test for dao...
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
    #   
escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
    #   
escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update some dao bugs
    
    * update for some bugs
    
    * update some bugs
    
    * Merge remote-tracking branch 'upstream/dev-db' into dev-db
    
    # Conflicts:
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
    #   
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
    
    * update
    
    * update
    
    * add multiply settings for application.yml
    
    * add multiply settings for application.yml
    
    * revert
    
    * update configuration settings in task record dao...
    
    * change application_master to application-master
    
    * change application_master to application-master
    
    * update application.yml to application.properties
    
    * revert
    
    * revert
    
    * add properties
    
    * add properties
    
    * revert
    
    * revert
    
    * add api start up..
    add alert send try catch
    
    * update dao info level
    
    * fix bug: task cannot submit when recovery failover
    
    * fix bug: task cannot submit when recovery failover
    
    * merge from dev-db
    
    * revert
    
    * revert
    
    * fix bug: get process definition list failed.
    
    * fix bug: process instance interval is error
    
    * revert
    
    * revert
    
    * update
    
    * support stop submit success tasks
    
    * update kill process
    
    * update for stop process
    
    * update for stop process
    
    * add some logs for stop process
    
    * update for small bug.
    
    * add check strategy before submit task
    
    * revert
    
    * update
    
    * update
    
    * revert
    
    * wait task instance exists if null.
    
    * revert
    
    * update
    
    * change desc to description.
    
    * add check user and definitions function when delete tenant
    
    * update
    
    * change desc to description.
    
    * change desc to description.
    
    * change desc to description.
    
    * remove check resources when delete tenant
    
    * change desc to description.
    
    * change mybatisplus version to 3.2.0
    
    * update
    
    * change the notice to apache.
    
    * update
    
    * update postgre sql
    
    * fix bug: phone can be empty.
    
    * fix bug: postgre test error.
    
    * update create table for postgre quartz
    
    * fix some bugs about postgre.
    
    * update create table for postgre quartz
    
    * add postgre db performance monitor
    
    * add postgre performance monitor
    
    * update performance monitor
    
    * revert
    
    * revert
    
    * fix bug: tasks queue length error
    
    * remove datasource.properties
    
    * change chinese sql to english.
    
    * change chinese sql to english.
    
    * remove unused code.
    
    * remove unused code.
    
    * add some notes
    
    * update some notes
    
    * update some notes
    
    * update mbatisplus version
    
    * update lombok version
    
    * update lombok version
    
    * revert
    
    * merge from dev-db
    
    * remove version
    
    * update npm install pom
    
    * add front assembly
    
    * add front module
    
    * change verison to 1.2.0-release-SNAPSHOT
    
    * add name in pom and remove compile
    
    * add name in pom
    
    * add licenses in assemble
    
    * change version to 1.2.0-RC1-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 
1.2.0-release
    
    # Conflicts:
    #   dolphinscheduler-alert/pom.xml
    #   dolphinscheduler-api/pom.xml
    #   dolphinscheduler-common/pom.xml
    #   dolphinscheduler-dao/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #   dolphinscheduler-dist/pom.xml
    #   dolphinscheduler-rpc/pom.xml
    #   dolphinscheduler-server/pom.xml
    #   dolphinscheduler-ui/pom.xml
    #   pom.xml
    change assembly id
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 
1.2.0-release
    
    # Conflicts:
    #   dolphinscheduler-alert/pom.xml
    #   dolphinscheduler-api/pom.xml
    #   dolphinscheduler-common/pom.xml
    #   dolphinscheduler-dao/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #   dolphinscheduler-dist/pom.xml
    #   dolphinscheduler-rpc/pom.xml
    #   dolphinscheduler-server/pom.xml
    #   dolphinscheduler-ui/pom.xml
    #   pom.xml
    add DISCLAIMER
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 
1.2.0-release
    
    # Conflicts:
    #   dolphinscheduler-alert/pom.xml
    #   dolphinscheduler-api/pom.xml
    #   dolphinscheduler-common/pom.xml
    #   dolphinscheduler-dao/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #   dolphinscheduler-dist/pom.xml
    #   dolphinscheduler-rpc/pom.xml
    #   dolphinscheduler-server/pom.xml
    #   dolphinscheduler-ui/pom.xml
    #   pom.xml
    add license in xml and properties
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 
1.2.0-release
    
    # Conflicts:
    #   dolphinscheduler-alert/pom.xml
    #   dolphinscheduler-api/pom.xml
    #   dolphinscheduler-common/pom.xml
    #   dolphinscheduler-dao/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #   dolphinscheduler-dist/pom.xml
    #   dolphinscheduler-rpc/pom.xml
    #   dolphinscheduler-server/pom.xml
    #   dolphinscheduler-ui/pom.xml
    #   pom.xml
    add license in dockerfile
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 
1.2.0-release
    
    # Conflicts:
    #   dolphinscheduler-alert/pom.xml
    #   dolphinscheduler-api/pom.xml
    #   dolphinscheduler-common/pom.xml
    #   dolphinscheduler-dao/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #   dolphinscheduler-dist/pom.xml
    #   dolphinscheduler-rpc/pom.xml
    #   dolphinscheduler-server/pom.xml
    #   dolphinscheduler-ui/pom.xml
    #   pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 
1.2.0-release
    
    # Conflicts:
    #   dolphinscheduler-alert/pom.xml
    #   dolphinscheduler-api/pom.xml
    #   dolphinscheduler-common/pom.xml
    #   dolphinscheduler-dao/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #   dolphinscheduler-dist/pom.xml
    #   dolphinscheduler-rpc/pom.xml
    #   dolphinscheduler-server/pom.xml
    #   dolphinscheduler-ui/pom.xml
    #   pom.xml
    add license in script and sql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 
1.2.0-release
    
    # Conflicts:
    #   dolphinscheduler-alert/pom.xml
    #   dolphinscheduler-api/pom.xml
    #   dolphinscheduler-common/pom.xml
    #   dolphinscheduler-dao/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #   dolphinscheduler-dist/pom.xml
    #   dolphinscheduler-rpc/pom.xml
    #   dolphinscheduler-server/pom.xml
    #   dolphinscheduler-ui/pom.xml
    #   pom.xml
    add license in ci
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 
1.2.0-release
    
    # Conflicts:
    #   dolphinscheduler-alert/pom.xml
    #   dolphinscheduler-api/pom.xml
    #   dolphinscheduler-common/pom.xml
    #   dolphinscheduler-dao/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #   dolphinscheduler-dist/pom.xml
    #   dolphinscheduler-rpc/pom.xml
    #   dolphinscheduler-server/pom.xml
    #   dolphinscheduler-ui/pom.xml
    #   pom.xml
    change version to 1.2.0-SNAPSHOT
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 
1.2.0-release
    
    # Conflicts:
    #   dolphinscheduler-alert/pom.xml
    #   dolphinscheduler-api/pom.xml
    #   dolphinscheduler-common/pom.xml
    #   dolphinscheduler-dao/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #   dolphinscheduler-dist/pom.xml
    #   dolphinscheduler-rpc/pom.xml
    #   dolphinscheduler-server/pom.xml
    #   dolphinscheduler-ui/pom.xml
    #   pom.xml
    set defalut db type postgresql
    
    * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 
1.2.0-release
    
    # Conflicts:
    #   dolphinscheduler-alert/pom.xml
    #   dolphinscheduler-api/pom.xml
    #   dolphinscheduler-common/pom.xml
    #   dolphinscheduler-dao/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-front/pom.xml
    #   dolphinscheduler-dist/dolphinscheduler-src/pom.xml
    #   dolphinscheduler-dist/pom.xml
    #   dolphinscheduler-rpc/pom.xml
    #   dolphinscheduler-server/pom.xml
    #   dolphinscheduler-ui/pom.xml
    #   pom.xml
    set defalut db type postgresql
    
    * change org.quartz.jobStore.driverDelegateClass
    
    * Add comments in method params
    
    * update readme from branch dev
    
    * update content in how to contribute
    
    * change postgresql default port
    
    * change version 1.2.0-SNAPSHOT
    
    * remove antrun plugin
    
    * add how to build
    
    * add how to build
    
    * remove dir format in assembly
    
    * Remove the judgment of whether it is admin
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Remove the judgment of whether it is admin
    
    * Fix bug the administrator authorizes the project to ordinary users,but 
ordinary users cannot see the process definition created by the administrator
    
    * Added description of bug fixes about create dolphinscheduler sql failed
    
    * reset version to 1.2.0-SNAPSHOT
    
    * update dml when init queue table
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Add whether the administrator's judgment
    
    * Add method comments
    
    * reset version to 1.2.0-SNAPSHOT
    
    * Determines whether the s database is empty
    
    * Determines whether the s database is empty
    
    * reset version to 1.2.0-SNAPSHOT
    
    * add selectUdfById
    
    * Make statistics license and notice for backend module and front module
    
    * get release docs include LICENSE and NOTICE
    
    * change assembly in order to package LICENSE and NOTICE
    
    * check and change license
    
    * check and change license
    
    * check and change license
    
    * delete release-docs in dolphinscheduler-dist root
    
    * reset pom to 1.2.0-SNAPSHOT
    
    * Replace DISCLAIMER with DISCLAIMER-WIP
---
 DISCLAIMER                                             |  5 -----
 DISCLAIMER-WIP                                         | 18 ++++++++++++++++++
 dolphinscheduler-alert/pom.xml                         |  2 +-
 dolphinscheduler-api/pom.xml                           |  2 +-
 dolphinscheduler-common/pom.xml                        |  2 +-
 dolphinscheduler-dao/pom.xml                           |  2 +-
 dolphinscheduler-dist/dolphinscheduler-backend/pom.xml |  2 +-
 dolphinscheduler-dist/dolphinscheduler-front/pom.xml   |  2 +-
 dolphinscheduler-dist/dolphinscheduler-src/pom.xml     |  2 +-
 dolphinscheduler-dist/pom.xml                          |  2 +-
 dolphinscheduler-rpc/pom.xml                           |  2 +-
 dolphinscheduler-server/pom.xml                        |  2 +-
 dolphinscheduler-ui/pom.xml                            |  2 +-
 pom.xml                                                |  2 +-
 14 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 1c269cd..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache DolphinScheduler (incubating) is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-Incubation is required of all newly accepted projects until a further review 
indicates that the infrastructure, 
-communications, and decision making process have stabilized in a manner 
consistent with other successful ASF projects. 
-While incubation status is not necessarily a reflection of the completeness or 
stability of the code, 
-it does indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP
new file mode 100644
index 0000000..cd46440
--- /dev/null
+++ b/DISCLAIMER-WIP
@@ -0,0 +1,18 @@
+Apache DolphinScheduler is an effort undergoing incubation at The Apache 
Software Foundation (ASF),
+sponsored by the Apache Incubator. Incubation is required of all newly 
accepted projects
+until a further review indicates that the infrastructure, communications, and 
decision
+making process have stabilized in a manner consistent with other successful 
ASF projects.
+While incubation status is not necessarily a reflection of the completeness or 
stability
+of the code, it does indicate that the project has yet to be fully endorsed by 
the ASF.
+
+Some of the incubating project's releases may not be fully compliant with ASF 
policy. For
+example, releases may have incomplete or un-reviewed licensing conditions. 
What follows is
+a list of known issues the project is currently aware of (note that this list, 
by definition,
+is likely to be incomplete):
+
+ * Releases may have incomplete licensing conditions
+
+If you are planning to incorporate this work into your product/project, please 
be aware that
+you will need to conduct a thorough licensing review to determine the overall 
implications of
+including this work. For the current status of this project through the Apache 
Incubator
+visit: https://incubator.apache.org/projects/dolphinscheduler.html
\ No newline at end of file
diff --git a/dolphinscheduler-alert/pom.xml b/dolphinscheduler-alert/pom.xml
index ead46f5..2fe171f 100644
--- a/dolphinscheduler-alert/pom.xml
+++ b/dolphinscheduler-alert/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.dolphinscheduler</groupId>
         <artifactId>dolphinscheduler</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>dolphinscheduler-alert</artifactId>
     <name>${project.artifactId}</name>
diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index 06a444a..9f9ad74 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.dolphinscheduler</groupId>
     <artifactId>dolphinscheduler</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>dolphinscheduler-api</artifactId>
   <name>${project.artifactId}</name>
diff --git a/dolphinscheduler-common/pom.xml b/dolphinscheduler-common/pom.xml
index 49c57d5..8858c70 100644
--- a/dolphinscheduler-common/pom.xml
+++ b/dolphinscheduler-common/pom.xml
@@ -21,7 +21,7 @@
        <parent>
                <groupId>org.apache.dolphinscheduler</groupId>
                <artifactId>dolphinscheduler</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
        <artifactId>dolphinscheduler-common</artifactId>
        <name>dolphinscheduler-common</name>
diff --git a/dolphinscheduler-dao/pom.xml b/dolphinscheduler-dao/pom.xml
index 85467e1..9448c79 100644
--- a/dolphinscheduler-dao/pom.xml
+++ b/dolphinscheduler-dao/pom.xml
@@ -21,7 +21,7 @@
        <parent>
                <groupId>org.apache.dolphinscheduler</groupId>
                <artifactId>dolphinscheduler</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
        <artifactId>dolphinscheduler-dao</artifactId>
        <name>${project.artifactId}</name>
diff --git a/dolphinscheduler-dist/dolphinscheduler-backend/pom.xml 
b/dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
index 8954710..aeb25b7 100644
--- a/dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
+++ b/dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>dolphinscheduler-dist</artifactId>
         <groupId>org.apache.dolphinscheduler</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dolphinscheduler-backend</artifactId>
diff --git a/dolphinscheduler-dist/dolphinscheduler-front/pom.xml 
b/dolphinscheduler-dist/dolphinscheduler-front/pom.xml
index 37120e6..6a360b3 100644
--- a/dolphinscheduler-dist/dolphinscheduler-front/pom.xml
+++ b/dolphinscheduler-dist/dolphinscheduler-front/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>dolphinscheduler-dist</artifactId>
         <groupId>org.apache.dolphinscheduler</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dolphinscheduler-dist/dolphinscheduler-src/pom.xml 
b/dolphinscheduler-dist/dolphinscheduler-src/pom.xml
index 96151ec..5e95b9b 100644
--- a/dolphinscheduler-dist/dolphinscheduler-src/pom.xml
+++ b/dolphinscheduler-dist/dolphinscheduler-src/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>dolphinscheduler-dist</artifactId>
         <groupId>org.apache.dolphinscheduler</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml
index 209b467..b19dc29 100644
--- a/dolphinscheduler-dist/pom.xml
+++ b/dolphinscheduler-dist/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>dolphinscheduler</artifactId>
         <groupId>org.apache.dolphinscheduler</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dolphinscheduler-rpc/pom.xml b/dolphinscheduler-rpc/pom.xml
index 27260ff..ecc12f4 100644
--- a/dolphinscheduler-rpc/pom.xml
+++ b/dolphinscheduler-rpc/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.dolphinscheduler</groupId>
         <artifactId>dolphinscheduler</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dolphinscheduler-server/pom.xml b/dolphinscheduler-server/pom.xml
index 2ccc880..0fd2b00 100644
--- a/dolphinscheduler-server/pom.xml
+++ b/dolphinscheduler-server/pom.xml
@@ -21,7 +21,7 @@
        <parent>
                <groupId>org.apache.dolphinscheduler</groupId>
                <artifactId>dolphinscheduler</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
        <artifactId>dolphinscheduler-server</artifactId>
        <name>dolphinscheduler-server</name>
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 87af50b..f3c9a63 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>dolphinscheduler</artifactId>
     <groupId>org.apache.dolphinscheduler</groupId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 9e02474..413421e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.apache.dolphinscheduler</groupId>
        <artifactId>dolphinscheduler</artifactId>
-       <version>1.2.1-SNAPSHOT</version>
+       <version>1.2.0-SNAPSHOT</version>
        <packaging>pom</packaging>
        <name>${project.artifactId}</name>
        <url>http://dolphinscheduler.apache.org</url>

Reply via email to