This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch json_split
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 4a9099c Merge remote-tracking branch 'upstream/dev' into spilit
add 0ab246d [NOTICE Update]Update year to 2021 (#4521)
add 43586da [feat-4496][server] Add to! {} is used to mark the custom
parameters to be output as-is in sql (#4497)
add 0c8d08c [Feature-#3049] Alert Plugin Design(merge alert_plugin_design
to dev) (#4495)
new 49204a6 merge from dev
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE | 4 +
NOTICE | 2 +-
.../{requirements.yaml => requirements.yaml~HEAD} | 0
.../{requirements.yaml => requirements.yaml~dev} | 0
.../dolphinscheduler-alert-dingtalk}/pom.xml | 97 +--
.../alert/dingtalk/DingTalkAlertChannel.java | 36 +-
.../dingtalk/DingTalkAlertChannelFactory.java | 89 +++
.../plugin/alert/dingtalk/DingTalkAlertPlugin.java | 24 +-
.../alert/dingtalk/DingTalkParamsConstants.java | 57 ++
.../plugin/alert/dingtalk/DingTalkSender.java | 204 ++++++
.../dingtalk/DingTalkAlertChannelFactoryTest.java | 48 ++
.../plugin/alert/dingtalk/DingTalkSenderTest.java | 57 ++
.../dolphinscheduler-alert-email}/pom.xml | 111 +--
.../plugin/alert/email/EmailAlertChannel.java | 69 ++
.../alert/email/EmailAlertChannelFactory.java | 137 ++++
.../plugin/alert/email/EmailAlertPlugin.java | 25 +-
.../plugin/alert/email/EmailConstants.java | 75 ++
.../plugin/alert/email}/ExcelUtils.java | 24 +-
.../plugin/alert/email/MailParamsConstants.java | 65 ++
.../plugin/alert/email/MailSender.java | 429 ++++++++++++
.../alert/email}/template/AlertTemplate.java | 21 +-
.../alert/email/template}/DefaultHTMLTemplate.java | 53 +-
.../alert/email/EmailAlertChannelFactoryTest.java | 75 ++
.../plugin/alert/email/EmailAlertChannelTest.java | 161 +++++
.../plugin/alert/email}/ExcelUtilsTest.java | 10 +-
.../plugin/alert/email/MailUtilsTest.java | 136 ++++
.../email/template/DefaultHTMLTemplateTest.java | 105 +++
.../dolphinscheduler-alert-http}/pom.xml | 95 +--
.../plugin/alert/http/HttpAlertChannel.java | 36 +-
.../plugin/alert/http/HttpAlertChannelFactory.java | 78 +++
.../plugin/alert/http/HttpAlertConstants.java | 22 +-
.../plugin/alert/http/HttpAlertPlugin.java | 24 +-
.../plugin/alert/http/HttpSender.java | 166 +++++
.../alert/http/HttpAlertChannelFactoryTest.java | 46 +-
.../plugin/alert/http/HttpAlertChannelTest.java | 104 +++
.../plugin/alert/http/HttpAlertPluginTest.java | 33 +-
.../plugin/alert/http/HttpSenderTest.java | 50 +-
.../dolphinscheduler-alert-script}/pom.xml | 96 +--
.../plugin/alert/script/OSUtils.java | 19 +-
.../plugin/alert/script/ProcessUtils.java | 62 ++
.../plugin/alert/script/ScriptAlertChannel.java | 37 +-
.../alert/script/ScriptAlertChannelFactory.java | 71 ++
.../plugin/alert/script/ScriptAlertPlugin.java | 23 +-
.../plugin/alert/script/ScriptParamsConstants.java | 33 +-
.../plugin/alert/script/ScriptSender.java | 74 ++
.../plugin/alert/script/ScriptType.java | 49 +-
.../plugin/alert/script/StreamGobbler.java | 53 +-
.../plugin/alert/script/ProcessUtilsTest.java | 32 +-
.../script/ScriptAlertChannelFactoryTest.java | 48 ++
.../plugin/alert/script/ScriptSenderTest.java | 58 ++
.../src/test/script/shell/example.sh | 13 +-
.../src/test/script/shell/scriptTest.sh | 13 +-
.../dolphinscheduler-alert-wechat/pom.xml | 78 +++
.../plugin/alert/wechat/WeChatAlertChannel.java | 36 +-
.../alert/wechat/WeChatAlertChannelFactory.java | 94 +++
.../plugin/alert/wechat/WeChatAlertConstants.java | 29 +-
.../alert/wechat/WeChatAlertParamsConstants.java | 56 ++
.../plugin/alert/wechat/WeChatAlertPlugin.java | 24 +-
.../plugin/alert/wechat/WeChatSender.java | 335 +++++++++
.../wechat/WeChatAlertChannelFactoryTest.java | 48 ++
.../plugin/alert/wechat/WeChatSenderTest.java | 89 +++
.../pom.xml | 47 +-
dolphinscheduler-alert/pom.xml | 79 ++-
.../apache/dolphinscheduler/alert/AlertServer.java | 126 +++-
.../alert/manager/EmailManager.java | 110 +--
.../alert/manager/EnterpriseWeChatManager.java | 59 --
.../dolphinscheduler/alert/manager/MsgManager.java | 10 +-
.../alert/plugin/AbstractDolphinPluginManager.java | 18 +-
.../alert/plugin/AlertPluginManager.java | 99 +++
.../alert/plugin/DolphinPluginClassLoader.java | 139 ++++
.../alert/plugin/DolphinPluginDiscovery.java | 139 ++++
.../alert/plugin/DolphinPluginLoader.java | 194 ++++++
.../alert/plugin/DolphinPluginManagerConfig.java | 121 ++++
.../alert/plugin/EmailAlertPlugin.java | 147 ----
.../alert/processor/AlertRequestProcessor.java | 67 ++
.../dolphinscheduler/alert/runner/AlertSender.java | 174 +++--
.../dolphinscheduler/alert/utils/Constants.java | 172 +----
.../alert/utils/DingTalkUtils.java | 141 ----
.../alert/utils/EnterpriseWeChatUtils.java | 286 --------
.../dolphinscheduler/alert/utils/MailUtils.java | 375 ----------
.../alert/utils/PropertyUtils.java | 2 +-
.../src/main/resources/alert.properties | 49 +-
.../dolphinscheduler/alert/AlertServerTest.java | 91 +++
.../alert/plugin/AlertPluginManagerTest.java | 65 ++
.../alert/plugin/DolphinPluginLoaderTest.java | 60 ++
.../alert/plugin/EmailAlertPluginTest.java | 253 +++++--
.../alert/processor/AlertRequestProcessorTest.java | 61 ++
.../alert/runner/AlertSenderTest.java | 181 +++++
.../alert/template/AlertTemplateFactoryTest.java | 65 --
.../template/impl/DefaultHTMLTemplateTest.java | 96 ---
.../alert/utils/DingTalkUtilsTest.java | 120 ----
.../alert/utils/EnterpriseWeChatUtilsTest.java | 283 --------
.../alert/utils/FuncUtilsTest.java | 10 +-
.../alert/utils/MailUtilsTest.java | 190 ------
.../api/controller/AlertGroupController.java | 113 ++-
.../controller/AlertPluginInstanceController.java | 240 +++++++
.../api/controller/ExecutorController.java | 113 ++-
.../api/controller/SchedulerController.java | 132 ++--
.../api/controller/UiPluginController.java | 93 +++
.../apache/dolphinscheduler/api/enums/Status.java | 17 +-
.../api/service/AlertGroupService.java | 84 +--
.../api/service/AlertPluginInstanceService.java | 89 +++
.../api/service/ExecutorService.java | 47 +-
.../api/service/ProcessInstanceService.java | 3 +-
.../api/service/SchedulerService.java | 97 ++-
.../api/service/UiPluginService.java | 14 +-
.../dolphinscheduler/api/service/UsersService.java | 10 +-
.../impl/AlertPluginInstanceServiceImpl.java | 208 ++++++
.../service/impl/ProcessDefinitionServiceImpl.java | 7 +-
.../impl/ProcessDefinitionVersionServiceImpl.java | 23 +-
.../api/service/impl/UiPluginServiceImpl.java | 85 +++
.../api/vo/AlertPluginInstanceVO.java | 117 ++++
.../src/main/resources/i18n/messages.properties | 5 +
.../main/resources/i18n/messages_en_US.properties | 5 +
.../api/controller/ExecutorControllerTest.java | 100 ++-
.../api/controller/TaskInstanceControllerTest.java | 1 +
...PTest.java => SecurityConfigLDAPTest.java~HEAD} | 0
...APTest.java => SecurityConfigLDAPTest.java~dev} | 0
.../api/service/AlertGroupServiceTest.java | 129 ++--
.../api/service/ExecutorService2Test.java | 147 ++--
.../ProcessDefinitionVersionServiceTest.java | 23 +-
.../api/service/ProcessInstanceServiceTest.java | 2 -
.../api/service/UiPluginServiceTest.java | 86 +++
.../api/service/UserAlertGroupServiceTest.java | 53 --
dolphinscheduler-common/pom.xml | 5 -
.../apache/dolphinscheduler/common/Constants.java | 8 +-
.../enums/{ShowType.java => PluginType.java} | 55 +-
.../common/plugin/FilePluginManager.java | 107 ---
.../common/plugin/PluginClassLoader.java | 154 -----
.../common/task/sql/SqlParameters.java | 67 +-
.../common/plugin/FilePluginManagerTest.java | 72 --
.../common/plugin/PluginClassLoaderTest.java | 61 --
.../org/apache/dolphinscheduler/dao/AlertDao.java | 102 +--
.../org/apache/dolphinscheduler/dao/PluginDao.java | 96 +++
.../apache/dolphinscheduler/dao/entity/Alert.java | 121 +---
.../dolphinscheduler/dao/entity/AlertGroup.java | 71 +-
...serAlertGroup.java => AlertPluginInstance.java} | 104 ++-
.../{UserAlertGroup.java => PluginDefine.java} | 107 ++-
.../dao/entity/ProcessDefinition.java | 95 ++-
.../dao/entity/ProcessDefinitionVersion.java | 88 +--
.../dao/entity/ProcessInstance.java | 36 +-
.../dao/mapper/AlertGroupMapper.java | 13 +-
...pMapper.java => AlertPluginInstanceMapper.java} | 32 +-
...ertGroupMapper.java => PluginDefineMapper.java} | 46 +-
.../src/main/resources/datasource.properties | 8 +-
.../dao/mapper/AlertGroupMapper.xml | 19 +-
.../dolphinscheduler/dao/mapper/AlertMapper.xml | 5 +-
...oupMapper.xml => AlertPluginInstanceMapper.xml} | 44 +-
.../dao/mapper/PluginDefineMapper.xml | 45 ++
.../dao/mapper/ProcessDefinitionMapper.xml | 13 +-
.../dao/mapper/ProcessDefinitionVersionMapper.xml | 5 +-
.../dolphinscheduler/dao/mapper/ProjectMapper.xml | 1 +
.../apache/dolphinscheduler/dao/AlertDaoTest.java | 21 +-
.../dao/mapper/AlertGroupMapperTest.java | 189 ++---
.../dao/mapper/AlertMapperTest.java | 67 +-
.../dao/mapper/AlertPluginInstanceMapperTest.java | 112 +++
.../dao/mapper/PluginDefineTest.java | 77 +++
.../dao/mapper/ProcessDefinitionMapperTest.java | 4 -
.../mapper/ProcessDefinitionVersionMapperTest.java | 4 -
.../dao/mapper/UserAlertGroupMapperTest.java | 196 ------
.../dao/mapper/UserMapperTest.java | 122 +---
dolphinscheduler-dist/pom.xml | 2 +-
dolphinscheduler-dist/release-docs/LICENSE | 12 +-
dolphinscheduler-dist/release-docs/NOTICE | 25 +-
...SE-aspectjweaver.txt => LICENSE-aether-api.txt} | 0
.../LICENSE-animal-sniffer-annotations.txt | 21 +
.../licenses/LICENSE-checker-compat-qual.txt | 22 +
...SE-remixicon => LICENSE-j2objc-annotations.txt} | 0
.../release-docs/licenses/LICENSE-javax.mail.txt | 759 ---------------------
.../{LICENSE-xml-apis.txt => LICENSE-resolver.txt} | 0
.../ui-licenses/LICENSE-@form-create-element-ui | 21 +
.../src/main/provisio/dolphinscheduler.xml | 67 ++
.../plugin/utils/PropertyUtils.java | 190 ------
.../plugin/model/AlertDataTest.java | 80 ---
.../plugin/utils/PropertyUtilsTest.java | 83 ---
.../remote/command/CommandType.java | 12 +-
.../command/alert/AlertSendRequestCommand.java | 80 +++
.../command/alert/AlertSendResponseCommand.java | 75 ++
.../command/alert/AlertSendResponseResult.java | 41 +-
.../remote/utils/JsonSerializer.java | 96 +++
.../command/alert/AlertSendRequestCommandTest.java | 48 +-
.../alert/AlertSendResponseCommandTest.java | 48 ++
dolphinscheduler-server/pom.xml | 325 ++++-----
.../server/log/TaskLogAppender.java | 8 +-
.../master/runner/MasterBaseTaskExecThread.java | 64 +-
.../server/master/runner/MasterTaskExecThread.java | 59 +-
.../server/utils/AlertManager.java | 14 +-
.../server/worker/WorkerServer.java | 23 +-
.../server/worker/config/WorkerConfig.java | 19 +-
.../worker/processor/TaskExecuteProcessor.java | 18 +-
.../server/worker/runner/TaskExecuteThread.java | 11 +-
.../server/worker/task/TaskManager.java | 6 +-
.../server/worker/task/sql/SqlTask.java | 254 +++----
.../src/main/resources/worker.properties | 3 +
.../server/registry/DependencyConfig.java | 84 ++-
.../processor/TaskCallbackServiceTestConfig.java | 71 +-
.../worker/runner/TaskExecuteThreadTest.java | 17 +-
.../server/worker/task/TaskManagerTest.java | 27 +-
.../server/worker/task/sql/SqlTaskTest.java | 111 +++
.../service/alert/AlertClientService.java | 120 ++++
.../service/process/ProcessService.java | 5 +-
.../service/alert/AlertClientServiceTest.java | 152 +++++
.../pom.xml | 36 +-
.../spi/DolphinSchedulerPlugin.java | 38 ++
.../dolphinscheduler/spi/alert/AlertChannel.java | 17 +-
.../spi/alert/AlertChannelFactory.java | 37 +-
.../dolphinscheduler/spi/alert/AlertConstants.java | 17 +-
.../dolphinscheduler/spi/alert}/AlertData.java | 56 +-
.../dolphinscheduler/spi/alert/AlertInfo.java | 37 +-
.../dolphinscheduler/spi/alert/AlertResult.java | 30 +-
.../dolphinscheduler/spi/alert}/ShowType.java | 8 +-
.../spi/classloader/ThreadContextClassLoader.java | 27 +-
.../dolphinscheduler/spi/params/InputParam.java | 94 +++
.../dolphinscheduler/spi/params/PasswordParam.java | 87 +++
.../spi/params/PluginParamsTransfer.java | 51 ++
.../dolphinscheduler/spi/params/RadioParam.java | 106 +++
.../dolphinscheduler/spi/params/base/DataType.java | 27 +-
.../dolphinscheduler/spi/params/base/FormType.java | 25 +-
.../spi/params/base/ParamsOptions.java | 72 ++
.../spi/params/base/ParamsProps.java | 33 +-
.../spi/params/base/PluginParams.java | 170 +++++
.../spi/params/base/PropsType.java | 24 +-
.../spi/params/base/TriggerType.java | 23 +-
.../dolphinscheduler/spi/params/base/Validate.java | 137 ++++
.../dolphinscheduler/spi/utils/JSONUtils.java | 156 +++++
.../dolphinscheduler/spi/utils/StringUtils.java | 32 +-
.../spi/params/PluginParamsTransferTest.java | 201 ++++++
install.sh | 2 +
pom.xml | 124 +++-
sql/dolphinscheduler-postgre.sql | 99 +--
sql/dolphinscheduler_mysql.sql | 103 +--
.../1.4.0_schema/mysql/dolphinscheduler_ddl.sql | 69 ++
.../1.4.0_schema/mysql/dolphinscheduler_dml.sql | 21 +-
.../postgresql/dolphinscheduler_ddl.sql | 65 ++
.../postgresql/dolphinscheduler_dml.sql | 0
style/checkstyle.xml | 8 +-
style/intellij-java-code-style.xml | 2 -
tools/dependencies/known-dependencies.txt | 13 +-
238 files changed, 10826 insertions(+), 6976 deletions(-)
copy docker/kubernetes/dolphinscheduler/{requirements.yaml =>
requirements.yaml~HEAD} (100%)
copy docker/kubernetes/dolphinscheduler/{requirements.yaml =>
requirements.yaml~dev} (100%)
copy {dolphinscheduler-alert =>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk}/pom.xml (53%)
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/api/AlertPlugin.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java
(50%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannelFactory.java
copy
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactory.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertPlugin.java
(63%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkParamsConstants.java
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSender.java
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/test/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannelFactoryTest.java
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/test/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSenderTest.java
copy {dolphinscheduler-alert =>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email}/pom.xml (68%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java
copy
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactory.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertPlugin.java
(63%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.java
rename
{dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email}/ExcelUtils.java
(87%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.java
rename {dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email}/template/AlertTemplate.java
(72%)
rename
{dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template}/DefaultHTMLTemplate.java
(66%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactoryTest.java
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.java
rename
{dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email}/ExcelUtilsTest.java
(89%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.java
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplateTest.java
copy {dolphinscheduler-alert =>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-http}/pom.xml (51%)
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/api/AlertPlugin.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java
(50%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelFactory.java
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginManager.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertConstants.java
(65%)
copy
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactory.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertPlugin.java
(63%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpSender.java
copy
dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertInfoTest.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelFactoryTest.java
(53%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelTest.java
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/PluginName.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertPluginTest.java
(62%)
copy
dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertInfoTest.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpSenderTest.java
(50%)
copy {dolphinscheduler-alert =>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script}/pom.xml (52%)
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/spi/AlertPluginProvider.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/OSUtils.java
(73%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ProcessUtils.java
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/api/AlertPlugin.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java
(51%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactory.java
copy
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactory.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertPlugin.java
(63%)
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/PluginName.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptParamsConstants.java
(60%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptSender.java
rename
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/AlertInfo.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptType.java
(51%)
rename
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/DingTalkManager.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/StreamGobbler.java
(50%)
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/PluginName.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ProcessUtilsTest.java
(59%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactoryTest.java
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptSenderTest.java
copy dolphinscheduler-plugin-api/src/test/resources/plugin.properties =>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/script/shell/example.sh
(81%)
mode change 100644 => 100755
rename dolphinscheduler-plugin-api/src/test/resources/plugin.properties =>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/script/shell/scriptTest.sh
(91%)
mode change 100644 => 100755
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/pom.xml
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/api/AlertPlugin.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java
(50%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannelFactory.java
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/PluginName.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertConstants.java
(62%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertParamsConstants.java
copy
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactory.java
=>
dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertPlugin.java
(63%)
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSender.java
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/test/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannelFactoryTest.java
create mode 100644
dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/test/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSenderTest.java
copy {dolphinscheduler-plugin-api => dolphinscheduler-alert-plugin}/pom.xml
(52%)
delete mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginManager.java
=>
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AbstractDolphinPluginManager.java
(65%)
create mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
create mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginClassLoader.java
create mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginDiscovery.java
create mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginLoader.java
create mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginManagerConfig.java
delete mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java
create mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessor.java
delete mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtils.java
delete mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java
delete mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java
create mode 100644
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java
create mode 100644
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManagerTest.java
create mode 100644
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/DolphinPluginLoaderTest.java
create mode 100644
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessorTest.java
create mode 100644
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java
delete mode 100644
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactoryTest.java
delete mode 100644
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplateTest.java
delete mode 100644
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/DingTalkUtilsTest.java
delete mode 100644
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtilsTest.java
delete mode 100644
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/MailUtilsTest.java
create mode 100644
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java
create mode 100644
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UiPluginController.java
create mode 100644
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceService.java
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginManager.java
=>
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UiPluginService.java
(74%)
create mode 100644
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
create mode 100644
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UiPluginServiceImpl.java
create mode 100644
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/vo/AlertPluginInstanceVO.java
copy
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/security/{SecurityConfigLDAPTest.java
=> SecurityConfigLDAPTest.java~HEAD} (100%)
copy
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/security/{SecurityConfigLDAPTest.java
=> SecurityConfigLDAPTest.java~dev} (100%)
create mode 100644
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UiPluginServiceTest.java
delete mode 100644
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UserAlertGroupServiceTest.java
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/{ShowType.java
=> PluginType.java} (54%)
delete mode 100644
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/FilePluginManager.java
delete mode 100644
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoader.java
delete mode 100644
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/FilePluginManagerTest.java
delete mode 100644
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/plugin/PluginClassLoaderTest.java
create mode 100644
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java
copy
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/{UserAlertGroup.java
=> AlertPluginInstance.java} (51%)
rename
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/{UserAlertGroup.java
=> PluginDefine.java} (51%)
copy
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/{UserAlertGroupMapper.java
=> AlertPluginInstanceMapper.java} (62%)
copy
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/{UserAlertGroupMapper.java
=> PluginDefineMapper.java} (54%)
rename
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/{UserAlertGroupMapper.xml
=> AlertPluginInstanceMapper.xml} (52%)
create mode 100644
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/PluginDefineMapper.xml
create mode 100644
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertPluginInstanceMapperTest.java
create mode 100644
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/PluginDefineTest.java
delete mode 100644
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java
copy dolphinscheduler-dist/release-docs/licenses/{LICENSE-aspectjweaver.txt =>
LICENSE-aether-api.txt} (100%)
create mode 100644
dolphinscheduler-dist/release-docs/licenses/LICENSE-animal-sniffer-annotations.txt
create mode 100644
dolphinscheduler-dist/release-docs/licenses/LICENSE-checker-compat-qual.txt
copy
dolphinscheduler-dist/release-docs/licenses/{ui-licenses/LICENSE-remixicon =>
LICENSE-j2objc-annotations.txt} (100%)
delete mode 100644
dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt
copy dolphinscheduler-dist/release-docs/licenses/{LICENSE-xml-apis.txt =>
LICENSE-resolver.txt} (100%)
create mode 100644
dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui
create mode 100644 dolphinscheduler-dist/src/main/provisio/dolphinscheduler.xml
delete mode 100644
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/utils/PropertyUtils.java
delete mode 100644
dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertDataTest.java
delete mode 100644
dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/utils/PropertyUtilsTest.java
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendRequestCommand.java
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommand.java
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/PluginName.java
=>
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseResult.java
(55%)
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/JsonSerializer.java
rename
dolphinscheduler-plugin-api/src/test/java/org/apache/dolphinscheduler/plugin/model/AlertInfoTest.java
=>
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendRequestCommandTest.java
(50%)
create mode 100644
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommandTest.java
mode change 100644 => 100755
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/log/TaskLogAppender.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTaskTest.java
create mode 100644
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/AlertClientService.java
create mode 100644
dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/alert/AlertClientServiceTest.java
rename {dolphinscheduler-plugin-api => dolphinscheduler-spi}/pom.xml (64%)
create mode 100644
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/DolphinSchedulerPlugin.java
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/spi/AlertPluginProvider.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertChannel.java
(74%)
rename
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertChannelFactory.java
(51%)
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/spi/AlertPluginProvider.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertConstants.java
(73%)
rename
{dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert}/AlertData.java
(61%)
rename
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/api/AlertPlugin.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertInfo.java
(60%)
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/PluginName.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertResult.java
(63%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert}/ShowType.java
(89%)
rename
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UserAlertGroupService.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/classloader/ThreadContextClassLoader.java
(58%)
create mode 100644
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/InputParam.java
create mode 100644
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/PasswordParam.java
create mode 100644
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/PluginParamsTransfer.java
create mode 100644
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/RadioParam.java
rename
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactory.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/DataType.java
(64%)
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginManager.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/FormType.java
(69%)
create mode 100644
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/ParamsOptions.java
copy
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/PluginName.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/ParamsProps.java
(59%)
create mode 100644
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/PluginParams.java
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginManager.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/PropsType.java
(71%)
rename
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/PluginManager.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/TriggerType.java
(72%)
create mode 100644
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/Validate.java
create mode 100644
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/utils/JSONUtils.java
rename
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/model/PluginName.java
=>
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/utils/StringUtils.java
(60%)
create mode 100644
dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/params/PluginParamsTransferTest.java
create mode 100644 sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql
rename
dolphinscheduler-plugin-api/src/main/java/org/apache/dolphinscheduler/plugin/spi/AlertPluginProvider.java
=> sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_dml.sql (72%)
create mode 100644 sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
copy sql/upgrade/{1.3.3_schema =>
1.4.0_schema}/postgresql/dolphinscheduler_dml.sql (100%)