diff --git a/docker/docker-swarm/docker-compose.yml b/docker/docker-swarm/docker-compose.yml index faa7abb65a..3f63e79074 100644 --- a/docker/docker-swarm/docker-compose.yml +++ b/docker/docker-swarm/docker-compose.yml @@ -44,7 +44,7 @@ services: - dolphinscheduler dolphinscheduler-api: - image: apache/dolphinscheduler:1.3.6-SNAPSHOT + image: apache/dolphinscheduler:2.0.0-SNAPSHOT command: api-server ports: - 12345:12345 @@ -68,7 +68,7 @@ services: - dolphinscheduler dolphinscheduler-alert: - image: apache/dolphinscheduler:1.3.6-SNAPSHOT + image: apache/dolphinscheduler:2.0.0-SNAPSHOT command: alert-server environment: TZ: Asia/Shanghai @@ -87,7 +87,7 @@ services: - dolphinscheduler dolphinscheduler-master: - image: apache/dolphinscheduler:1.3.6-SNAPSHOT + image: apache/dolphinscheduler:2.0.0-SNAPSHOT command: master-server environment: TZ: Asia/Shanghai @@ -108,7 +108,7 @@ services: - dolphinscheduler dolphinscheduler-worker: - image: apache/dolphinscheduler:1.3.6-SNAPSHOT + image: apache/dolphinscheduler:2.0.0-SNAPSHOT command: worker-server environment: TZ: Asia/Shanghai diff --git a/docker/docker-swarm/docker-stack.yml b/docker/docker-swarm/docker-stack.yml index 52617ca655..d8939fd30c 100644 --- a/docker/docker-swarm/docker-stack.yml +++ b/docker/docker-swarm/docker-stack.yml @@ -48,7 +48,7 @@ services: replicas: 1 dolphinscheduler-api: - image: apache/dolphinscheduler:1.3.6-SNAPSHOT + image: apache/dolphinscheduler:2.0.0-SNAPSHOT command: api-server ports: - 12345:12345 @@ -71,7 +71,7 @@ services: replicas: 1 dolphinscheduler-alert: - image: apache/dolphinscheduler:1.3.6-SNAPSHOT + image: apache/dolphinscheduler:2.0.0-SNAPSHOT command: alert-server environment: TZ: Asia/Shanghai @@ -90,7 +90,7 @@ services: replicas: 1 dolphinscheduler-master: - image: apache/dolphinscheduler:1.3.6-SNAPSHOT + image: apache/dolphinscheduler:2.0.0-SNAPSHOT command: master-server environment: TZ: Asia/Shanghai @@ -110,7 +110,7 @@ services: replicas: 1 dolphinscheduler-worker: - image: apache/dolphinscheduler:1.3.6-SNAPSHOT + image: apache/dolphinscheduler:2.0.0-SNAPSHOT command: worker-server environment: TZ: Asia/Shanghai diff --git a/docker/kubernetes/dolphinscheduler/Chart.yaml b/docker/kubernetes/dolphinscheduler/Chart.yaml index 486f350123..5056392854 100644 --- a/docker/kubernetes/dolphinscheduler/Chart.yaml +++ b/docker/kubernetes/dolphinscheduler/Chart.yaml @@ -39,7 +39,7 @@ version: 2.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 1.3.6-SNAPSHOT +appVersion: 2.0.0-SNAPSHOT dependencies: - name: postgresql diff --git a/docker/kubernetes/dolphinscheduler/values.yaml b/docker/kubernetes/dolphinscheduler/values.yaml index aa64b61e43..ef28b8edfb 100644 --- a/docker/kubernetes/dolphinscheduler/values.yaml +++ b/docker/kubernetes/dolphinscheduler/values.yaml @@ -23,7 +23,7 @@ timezone: "Asia/Shanghai" image: repository: "apache/dolphinscheduler" - tag: "1.3.6-SNAPSHOT" + tag: "2.0.0-SNAPSHOT" pullPolicy: "IfNotPresent" pullSecret: "" diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/pom.xml index cb2d7fba13..646d5feb75 100644 --- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/pom.xml +++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-alert-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml index 9181e0d63b..9c2347ec25 100644 --- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml +++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-alert-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/pom.xml index ef47874c36..3f13c8e342 100644 --- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/pom.xml +++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-alert-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/pom.xml index 83c4d41f7f..0c0eaac7b9 100644 --- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/pom.xml +++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-alert-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/pom.xml index eb64e25787..0ab74785ef 100644 --- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/pom.xml +++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-alert-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-slack/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-slack/pom.xml index 3b1d8067e6..7dce712715 100644 --- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-slack/pom.xml +++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-slack/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-alert-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/pom.xml index fccf0e28da..2b0d3b666e 100644 --- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/pom.xml +++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-alert-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-alert-plugin/pom.xml b/dolphinscheduler-alert-plugin/pom.xml index 1087daca76..f5dc77b04f 100644 --- a/dolphinscheduler-alert-plugin/pom.xml +++ b/dolphinscheduler-alert-plugin/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-alert/pom.xml b/dolphinscheduler-alert/pom.xml index e695af5233..456c076e8f 100644 --- a/dolphinscheduler-alert/pom.xml +++ b/dolphinscheduler-alert/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT dolphinscheduler-alert ${project.artifactId} diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index 67d7d090c7..c6c9760038 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -22,7 +22,7 @@ org.apache.dolphinscheduler dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT dolphinscheduler-api ${project.artifactId} diff --git a/dolphinscheduler-common/pom.xml b/dolphinscheduler-common/pom.xml index f4007fd3eb..481e00cc3d 100644 --- a/dolphinscheduler-common/pom.xml +++ b/dolphinscheduler-common/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT dolphinscheduler-common dolphinscheduler-common diff --git a/dolphinscheduler-dao/pom.xml b/dolphinscheduler-dao/pom.xml index 2cf3de29ac..578bc1c0ce 100644 --- a/dolphinscheduler-dao/pom.xml +++ b/dolphinscheduler-dao/pom.xml @@ -22,7 +22,7 @@ org.apache.dolphinscheduler dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT dolphinscheduler-dao ${project.artifactId} diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml index e999a498ab..1c8213275b 100644 --- a/dolphinscheduler-dist/pom.xml +++ b/dolphinscheduler-dist/pom.xml @@ -20,7 +20,7 @@ dolphinscheduler org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-microbench/pom.xml b/dolphinscheduler-microbench/pom.xml index 9912932198..9355616624 100644 --- a/dolphinscheduler-microbench/pom.xml +++ b/dolphinscheduler-microbench/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-registry-plugin/dolphinscheduler-registry-zookeeper/pom.xml b/dolphinscheduler-registry-plugin/dolphinscheduler-registry-zookeeper/pom.xml index e2e158f20a..5ad7ee934e 100644 --- a/dolphinscheduler-registry-plugin/dolphinscheduler-registry-zookeeper/pom.xml +++ b/dolphinscheduler-registry-plugin/dolphinscheduler-registry-zookeeper/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-registry-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-registry-plugin/pom.xml b/dolphinscheduler-registry-plugin/pom.xml index 9378220f4f..2f8bb0d2d1 100644 --- a/dolphinscheduler-registry-plugin/pom.xml +++ b/dolphinscheduler-registry-plugin/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-remote/pom.xml b/dolphinscheduler-remote/pom.xml index 98a35b621c..ada20e32f5 100644 --- a/dolphinscheduler-remote/pom.xml +++ b/dolphinscheduler-remote/pom.xml @@ -20,7 +20,7 @@ dolphinscheduler org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-server/pom.xml b/dolphinscheduler-server/pom.xml index 8913a14617..8ba1f4cf03 100644 --- a/dolphinscheduler-server/pom.xml +++ b/dolphinscheduler-server/pom.xml @@ -22,7 +22,7 @@ org.apache.dolphinscheduler dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT dolphinscheduler-server dolphinscheduler-server diff --git a/dolphinscheduler-service/pom.xml b/dolphinscheduler-service/pom.xml index dbdebb98ea..bc8b367364 100644 --- a/dolphinscheduler-service/pom.xml +++ b/dolphinscheduler-service/pom.xml @@ -20,7 +20,7 @@ dolphinscheduler org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-spi/pom.xml b/dolphinscheduler-spi/pom.xml index 666cff6407..4755b828b2 100644 --- a/dolphinscheduler-spi/pom.xml +++ b/dolphinscheduler-spi/pom.xml @@ -20,7 +20,7 @@ org.apache.dolphinscheduler dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT dolphinscheduler-spi ${project.artifactId} diff --git a/dolphinscheduler-standalone-server/pom.xml b/dolphinscheduler-standalone-server/pom.xml index c31334d6ea..8b9efc1241 100644 --- a/dolphinscheduler-standalone-server/pom.xml +++ b/dolphinscheduler-standalone-server/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-standalone-server/src/main/resources/registry.properties b/dolphinscheduler-standalone-server/src/main/resources/registry.properties index 3f557ce033..3c33799075 100644 --- a/dolphinscheduler-standalone-server/src/main/resources/registry.properties +++ b/dolphinscheduler-standalone-server/src/main/resources/registry.properties @@ -17,6 +17,6 @@ # This file is only to override the production configurations in standalone server. -registry.plugin.dir=./dolphinscheduler-dist/target/dolphinscheduler-dist-1.3.6-SNAPSHOT/lib/plugin/registry/zookeeper +registry.plugin.dir=./dolphinscheduler-dist/target/dolphinscheduler-dist-2.0.0-SNAPSHOT/lib/plugin/registry/zookeeper registry.plugin.name=zookeeper registry.servers=127.0.0.1:2181 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml index 5868976144..784f7d5de2 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml index 3feb9ef4de..b75f26884c 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml index 11060c6fa4..9d8162fc38 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml index b9c27bdae8..6cfa3330b2 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml index 7cf4ffd57b..93c266efbf 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml index 324ae53e48..4726e7deaa 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml index e40533149e..5293595227 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml index fd8d76ed3e..adf3008357 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml index 500175efa9..87d8c3fc95 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 dolphinscheduler-task-spark diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml index 09ddf41adf..c2a44f5bc8 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml index 853be1ac83..1229c845f6 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-tis/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-tis/pom.xml index 18b332e1a5..71fc55294d 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-tis/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-tis/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler-task-plugin org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-task-plugin/pom.xml b/dolphinscheduler-task-plugin/pom.xml index e45ed021ae..cffc6d1cb9 100644 --- a/dolphinscheduler-task-plugin/pom.xml +++ b/dolphinscheduler-task-plugin/pom.xml @@ -21,7 +21,7 @@ dolphinscheduler org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml index 71fbe1521e..a50b82e674 100644 --- a/dolphinscheduler-ui/pom.xml +++ b/dolphinscheduler-ui/pom.xml @@ -20,7 +20,7 @@ dolphinscheduler org.apache.dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index afa5c7e60a..eb00309ff1 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.apache.dolphinscheduler dolphinscheduler - 1.3.6-SNAPSHOT + 2.0.0-SNAPSHOT pom ${project.artifactId} http://dolphinscheduler.apache.org