diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-all/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-all/pom.xml new file mode 100644 index 0000000000..22f42cf3bf --- /dev/null +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-all/pom.xml @@ -0,0 +1,88 @@ + + + + 4.0.0 + + org.apache.dolphinscheduler + dolphinscheduler-alert-plugins + dev-SNAPSHOT + + + dolphinscheduler-alert-all + + + + org.apache.dolphinscheduler + dolphinscheduler-alert-dingtalk + ${project.version} + + + org.apache.dolphinscheduler + dolphinscheduler-alert-email + ${project.version} + + + org.apache.dolphinscheduler + dolphinscheduler-alert-feishu + ${project.version} + + + org.apache.dolphinscheduler + dolphinscheduler-alert-http + ${project.version} + + + org.apache.dolphinscheduler + dolphinscheduler-alert-pagerduty + ${project.version} + + + org.apache.dolphinscheduler + dolphinscheduler-alert-script + ${project.version} + + + org.apache.dolphinscheduler + dolphinscheduler-alert-slack + ${project.version} + + + org.apache.dolphinscheduler + dolphinscheduler-alert-telegram + ${project.version} + + + org.apache.dolphinscheduler + dolphinscheduler-alert-telegram + ${project.version} + + + org.apache.dolphinscheduler + dolphinscheduler-alert-webexteams + ${project.version} + + + org.apache.dolphinscheduler + dolphinscheduler-alert-wechat + ${project.version} + + + + + diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/pom.xml similarity index 96% rename from dolphinscheduler-alert/dolphinscheduler-alert-api/pom.xml rename to dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/pom.xml index 4bdc035d45..4ce63942bd 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-api/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.apache.dolphinscheduler - dolphinscheduler-alert + dolphinscheduler-alert-plugins dev-SNAPSHOT dolphinscheduler-alert-api diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannel.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannel.java similarity index 100% rename from dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannel.java rename to dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannel.java diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannelFactory.java similarity index 100% rename from dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannelFactory.java rename to dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannelFactory.java diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertConstants.java similarity index 100% rename from dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertConstants.java rename to dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertConstants.java diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertData.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertData.java similarity index 100% rename from dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertData.java rename to dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertData.java diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertInfo.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertInfo.java similarity index 100% rename from dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertInfo.java rename to dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertInfo.java diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertInputTips.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertInputTips.java similarity index 100% rename from dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertInputTips.java rename to dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertInputTips.java diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertResult.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertResult.java similarity index 100% rename from dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertResult.java rename to dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertResult.java diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/ShowType.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/ShowType.java similarity index 100% rename from dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/ShowType.java rename to dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/ShowType.java diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml index 5ce2f6d9d1..db64f7e4f2 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml @@ -27,6 +27,10 @@ jar + + org.apache.dolphinscheduler + dolphinscheduler-alert-api + org.apache.httpcomponents httpclient diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml index 4669d7eac0..e088d33458 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml @@ -27,6 +27,10 @@ jar + + org.apache.dolphinscheduler + dolphinscheduler-alert-api + org.apache.poi poi diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml index 1a56cdc094..98ab229d1a 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml @@ -27,6 +27,10 @@ jar + + org.apache.dolphinscheduler + dolphinscheduler-alert-api + org.apache.httpcomponents httpclient diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml index c83356af4d..3ce4dfd186 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml @@ -27,6 +27,10 @@ jar + + org.apache.dolphinscheduler + dolphinscheduler-alert-api + org.apache.httpcomponents httpclient diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml index 671bff25ea..b356e78703 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml @@ -27,6 +27,10 @@ jar + + org.apache.dolphinscheduler + dolphinscheduler-alert-api + com.google.guava guava diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml index e5b168d543..9a783cb2d5 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml @@ -25,4 +25,11 @@ dolphinscheduler-alert-script jar + + + + org.apache.dolphinscheduler + dolphinscheduler-alert-api + + diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml index e92ddc6a42..39594d351d 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml @@ -27,6 +27,10 @@ jar + + org.apache.dolphinscheduler + dolphinscheduler-alert-api + org.apache.httpcomponents httpclient diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml index e24045c8aa..cd96676e68 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml @@ -27,6 +27,10 @@ jar + + org.apache.dolphinscheduler + dolphinscheduler-alert-api + org.apache.httpcomponents httpclient diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml index fc1c373bee..99bc262c70 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml @@ -27,6 +27,10 @@ jar + + org.apache.dolphinscheduler + dolphinscheduler-alert-api + com.google.guava guava diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml index 3576f0c5e2..733ac16cf0 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml @@ -27,6 +27,10 @@ jar + + org.apache.dolphinscheduler + dolphinscheduler-alert-api + org.apache.httpcomponents httpclient diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml index df705e9ea2..8d9b5d7a73 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml @@ -27,6 +27,8 @@ pom + dolphinscheduler-alert-all + dolphinscheduler-alert-api dolphinscheduler-alert-email dolphinscheduler-alert-wechat dolphinscheduler-alert-dingtalk @@ -39,11 +41,4 @@ dolphinscheduler-alert-telegram - - - org.apache.dolphinscheduler - dolphinscheduler-alert-api - - - diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml index ec67b31996..fcdf991d9b 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml @@ -38,44 +38,7 @@ org.apache.dolphinscheduler - dolphinscheduler-alert-dingtalk - - - org.apache.dolphinscheduler - dolphinscheduler-alert-email - - - org.apache.dolphinscheduler - dolphinscheduler-alert-feishu - - - org.apache.dolphinscheduler - dolphinscheduler-alert-http - - - org.apache.dolphinscheduler - dolphinscheduler-alert-script - - - org.apache.dolphinscheduler - dolphinscheduler-alert-slack - - - org.apache.dolphinscheduler - dolphinscheduler-alert-wechat - - - org.apache.dolphinscheduler - dolphinscheduler-alert-pagerduty - - - org.apache.dolphinscheduler - dolphinscheduler-alert-webexteams - - - - org.apache.dolphinscheduler - dolphinscheduler-alert-telegram + dolphinscheduler-alert-all diff --git a/dolphinscheduler-alert/pom.xml b/dolphinscheduler-alert/pom.xml index bcf840410d..4021d0b6b5 100644 --- a/dolphinscheduler-alert/pom.xml +++ b/dolphinscheduler-alert/pom.xml @@ -29,7 +29,6 @@ pom - dolphinscheduler-alert-api dolphinscheduler-alert-plugins dolphinscheduler-alert-server diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index facd4e4e69..f8e6b44cb6 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -75,7 +75,7 @@ org.apache.dolphinscheduler - dolphinscheduler-scheduler-quartz + dolphinscheduler-scheduler-all diff --git a/dolphinscheduler-master/pom.xml b/dolphinscheduler-master/pom.xml index 2c91ae381e..7443ae1196 100644 --- a/dolphinscheduler-master/pom.xml +++ b/dolphinscheduler-master/pom.xml @@ -60,7 +60,7 @@ org.apache.dolphinscheduler - dolphinscheduler-scheduler-quartz + dolphinscheduler-scheduler-all diff --git a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-all/pom.xml b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-all/pom.xml new file mode 100644 index 0000000000..2de4e05d84 --- /dev/null +++ b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-all/pom.xml @@ -0,0 +1,41 @@ + + + + 4.0.0 + + org.apache.dolphinscheduler + dolphinscheduler-scheduler-plugin + dev-SNAPSHOT + + + dolphinscheduler-scheduler-all + + + + org.apache.dolphinscheduler + dolphinscheduler-scheduler-api + ${project.version} + + + org.apache.dolphinscheduler + dolphinscheduler-scheduler-quartz + ${project.version} + + + diff --git a/dolphinscheduler-scheduler-plugin/pom.xml b/dolphinscheduler-scheduler-plugin/pom.xml index 5865678eca..6bd91494d8 100644 --- a/dolphinscheduler-scheduler-plugin/pom.xml +++ b/dolphinscheduler-scheduler-plugin/pom.xml @@ -29,6 +29,7 @@ dolphinscheduler-scheduler-api + dolphinscheduler-scheduler-all dolphinscheduler-scheduler-quartz diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml index 6c5063ee28..e36c3d0048 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml @@ -39,6 +39,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-python + ${project.version} diff --git a/dolphinscheduler-task-plugin/pom.xml b/dolphinscheduler-task-plugin/pom.xml index a4478f0d6a..5327236c2e 100644 --- a/dolphinscheduler-task-plugin/pom.xml +++ b/dolphinscheduler-task-plugin/pom.xml @@ -28,6 +28,7 @@ pom + dolphinscheduler-task-all dolphinscheduler-task-api dolphinscheduler-task-shell dolphinscheduler-task-datax @@ -46,7 +47,6 @@ dolphinscheduler-task-dependent dolphinscheduler-task-subprocess dolphinscheduler-task-switch - dolphinscheduler-task-all dolphinscheduler-task-emr dolphinscheduler-task-blocking dolphinscheduler-task-k8s diff --git a/pom.xml b/pom.xml index 7f78d69de4..d5a96ba4b1 100755 --- a/pom.xml +++ b/pom.xml @@ -107,32 +107,33 @@ org.apache.dolphinscheduler - dolphinscheduler-standalone-server + dolphinscheduler-api ${project.version} org.apache.dolphinscheduler - dolphinscheduler-aop + dolphinscheduler-alert-server ${project.version} org.apache.dolphinscheduler - dolphinscheduler-common + dolphinscheduler-standalone-server ${project.version} org.apache.dolphinscheduler - dolphinscheduler-alert-plugins + dolphinscheduler-ui ${project.version} + org.apache.dolphinscheduler - dolphinscheduler-registry-plugins + dolphinscheduler-aop ${project.version} org.apache.dolphinscheduler - dolphinscheduler-registry-all + dolphinscheduler-common ${project.version} @@ -140,11 +141,6 @@ dolphinscheduler-dao ${project.version} - - org.apache.dolphinscheduler - dolphinscheduler-api - ${project.version} - org.apache.dolphinscheduler dolphinscheduler-remote @@ -174,64 +170,32 @@ org.apache.dolphinscheduler - dolphinscheduler-alert-api - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-alert-server - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-alert-dingtalk - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-alert-email - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-alert-feishu - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-alert-http - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-alert-script - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-alert-slack + dolphinscheduler-tools ${project.version} + org.apache.dolphinscheduler - dolphinscheduler-alert-wechat + dolphinscheduler-alert-api ${project.version} org.apache.dolphinscheduler - dolphinscheduler-alert-pagerduty + dolphinscheduler-alert-all ${project.version} + org.apache.dolphinscheduler - dolphinscheduler-alert-webexteams + dolphinscheduler-registry-api ${project.version} org.apache.dolphinscheduler - dolphinscheduler-alert-telegram + dolphinscheduler-registry-all ${project.version} + org.apache.dolphinscheduler dolphinscheduler-registry-api @@ -239,12 +203,7 @@ org.apache.dolphinscheduler - dolphinscheduler-registry-zookeeper - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-registry-mysql + dolphinscheduler-registry-all ${project.version} @@ -255,18 +214,18 @@ org.apache.dolphinscheduler - dolphinscheduler-scheduler-quartz + dolphinscheduler-scheduler-all ${project.version} org.apache.dolphinscheduler - dolphinscheduler-datasource-all + dolphinscheduler-datasource-api ${project.version} org.apache.dolphinscheduler - dolphinscheduler-datasource-api + dolphinscheduler-datasource-all ${project.version} @@ -275,27 +234,12 @@ dolphinscheduler-task-api ${project.version} - - org.apache.dolphinscheduler - dolphinscheduler-task-python - ${project.version} - org.apache.dolphinscheduler dolphinscheduler-task-all ${project.version} - - org.apache.dolphinscheduler - dolphinscheduler-ui - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-tools - ${project.version} - org.junit junit-bom