From f55204d12112b1d770f6cfd10efc52cbfff46f6b Mon Sep 17 00:00:00 2001 From: zhuxuetong <594754793@qq.com> Date: Thu, 13 Jun 2024 19:22:40 +0800 Subject: [PATCH 01/10] reduce binary tarball size --- dolphinscheduler-dist/pom.xml | 30 +++++++++ .../src/main/assembly/create-symlinks.sh | 62 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 dolphinscheduler-dist/src/main/assembly/create-symlinks.sh diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml index 777b86cf91c8..36fd2586f03c 100644 --- a/dolphinscheduler-dist/pom.xml +++ b/dolphinscheduler-dist/pom.xml @@ -77,6 +77,36 @@ apache-dolphinscheduler-${project.version} + + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + docker-build + + exec + + package + + sh + + ${basedir}/../dolphinscheduler-dist/src/main/assembly/create-symlinks.sh + + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + + diff --git a/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh new file mode 100644 index 000000000000..51e16326697b --- /dev/null +++ b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh @@ -0,0 +1,62 @@ +#!/bin/bash +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +set -eu +script_dir=`dirname $0` +cd $script_dir/../../../target +# Check if the package file exists +if ! ls ./apache-dolphinscheduler-*-bin.tar.gz &> /dev/null; then + echo "File apache-dolphinscheduler-*-bin.tar.gz not found" + exit 0 +fi +package_file=$(ls apache-dolphinscheduler-*-bin.tar.gz) +echo $package_file + +decompress_dirname="${package_file%.tar.gz}" +rm -rf $decompress_dirname +#Decompress package file +tar -xf $package_file +cd $decompress_dirname + +SHARED_LIB_DIR="libs" +# create share lib directory +mkdir -p $SHARED_LIB_DIR + +echo 'iterate through the lib directory for all subprojects' +for module in api-server master-server worker-server alert-server tools; do + MODULE_LIB_DIR="$module/libs" + echo "handling $MODULE_LIB_DIR" + + if [ -d "$MODULE_LIB_DIR" ]; then + cd $MODULE_LIB_DIR + + for jar in `ls *.jar`; do + # Move jar file to share lib directory + mv $jar ../../$SHARED_LIB_DIR/ + + # Create a symbolic link in the subproject's lib directory + ln -s ../../$SHARED_LIB_DIR/$jar . + done + + cd - > /dev/null + fi +done +#Recompress the package +cd .. +tar -zcf $package_file $decompress_dirname +rm -rf $decompress_dirname \ No newline at end of file From 69fc1bd49f2e0ec43b1ba8672650e4486fe2fac9 Mon Sep 17 00:00:00 2001 From: zhuxuetong <594754793@qq.com> Date: Wed, 19 Jun 2024 14:27:42 +0800 Subject: [PATCH 02/10] fix CI --- dolphinscheduler-dist/src/main/assembly/create-symlinks.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh index 51e16326697b..6afaba8ed7d9 100644 --- a/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh +++ b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh @@ -56,6 +56,7 @@ for module in api-server master-server worker-server alert-server tools; do cd - > /dev/null fi done + #Recompress the package cd .. tar -zcf $package_file $decompress_dirname From 84c2af13cdfe85597f1f5dac2cdd86109b0fb8a7 Mon Sep 17 00:00:00 2001 From: zhuxuetong <594754793@qq.com> Date: Wed, 19 Jun 2024 14:29:46 +0800 Subject: [PATCH 03/10] Optimize shell script --- dolphinscheduler-dist/src/main/assembly/create-symlinks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh index 6afaba8ed7d9..09bc5ba7eaa1 100644 --- a/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh +++ b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh @@ -45,7 +45,7 @@ for module in api-server master-server worker-server alert-server tools; do if [ -d "$MODULE_LIB_DIR" ]; then cd $MODULE_LIB_DIR - for jar in `ls *.jar`; do + for jar in *.jar; do # Move jar file to share lib directory mv $jar ../../$SHARED_LIB_DIR/ From 43d90297a16f8d265c018658b7e463c012798b66 Mon Sep 17 00:00:00 2001 From: zhuxuetong <594754793@qq.com> Date: Thu, 20 Jun 2024 11:39:42 +0800 Subject: [PATCH 04/10] exec-maven-plugin after maven-assembly-plugin --- dolphinscheduler-dist/pom.xml | 50 ++++++++++++++--------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml index 36fd2586f03c..3ed656a0e800 100644 --- a/dolphinscheduler-dist/pom.xml +++ b/dolphinscheduler-dist/pom.xml @@ -77,36 +77,6 @@ apache-dolphinscheduler-${project.version} - - - - org.codehaus.mojo - exec-maven-plugin - ${exec-maven-plugin.version} - - - docker-build - - exec - - package - - sh - - ${basedir}/../dolphinscheduler-dist/src/main/assembly/create-symlinks.sh - - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - @@ -148,6 +118,26 @@ + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + create-symlinks + + exec + + package + + sh + + ${basedir}/../dolphinscheduler-dist/src/main/assembly/create-symlinks.sh + + + + + From 3cdf754b1b935ef1a594c2ec3cd235bf3b9d9a30 Mon Sep 17 00:00:00 2001 From: xiangzihao <460888207@qq.com> Date: Thu, 20 Jun 2024 13:44:28 +0800 Subject: [PATCH 05/10] Fix admin login tenant unspecified issue after upgrade to v3.2.1 (#16064) (#16185) --- .../sql/upgrade/3.2.0_schema/mysql/dolphinscheduler_dml.sql | 3 +++ .../upgrade/3.2.0_schema/postgresql/dolphinscheduler_dml.sql | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/mysql/dolphinscheduler_dml.sql b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/mysql/dolphinscheduler_dml.sql index e5d97fab946f..21189c77a3a3 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/mysql/dolphinscheduler_dml.sql +++ b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/mysql/dolphinscheduler_dml.sql @@ -30,6 +30,9 @@ END IF; END; d// +-- If the admin account is not associated with a tenant, the admin's tenant will be set to the default tenant. +UPDATE `t_ds_user` SET `tenant_id` = '-1' WHERE (`user_name` = 'admin') AND (`tenant_id` = '0'); + delimiter ; CALL dolphin_t_ds_tenant_insert_default(); DROP PROCEDURE dolphin_t_ds_tenant_insert_default; diff --git a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/postgresql/dolphinscheduler_dml.sql b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/postgresql/dolphinscheduler_dml.sql index 482b317a60c4..f47d16f7c7db 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/postgresql/dolphinscheduler_dml.sql +++ b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/postgresql/dolphinscheduler_dml.sql @@ -21,6 +21,9 @@ INSERT INTO t_ds_tenant(id, tenant_code, description, queue_id, create_time, upd UPDATE t_ds_schedules as t1 SET tenant_code = COALESCE(t3.tenant_code, 'default') FROM t_ds_process_definition as t2 LEFT JOIN t_ds_tenant t3 ON t2.tenant_id = t3.id WHERE t1.process_definition_code = t2.code; UPDATE t_ds_process_instance SET tenant_code = 'default' WHERE tenant_code IS NULL; +-- If the admin account is not associated with a tenant, the admin's tenant will be set to the default tenant. +UPDATE t_ds_user SET tenant_id = '-1' WHERE (user_name = 'admin') AND (tenant_id = '0'); + -- data quality support choose database INSERT INTO t_ds_dq_rule_input_entry (id, field, "type", title, value, "options", placeholder, option_source_type, value_type, input_type, is_show, can_edit, is_emit, is_validate, create_time, update_time) From 16bc1e7bfba22c13fb52e84fdc8cfaaae1d085e6 Mon Sep 17 00:00:00 2001 From: xiangzihao <460888207@qq.com> Date: Thu, 20 Jun 2024 13:44:55 +0800 Subject: [PATCH 06/10] =?UTF-8?q?Revert=20"3.2.2=20release=20=20add=20task?= =?UTF-8?q?-pure=20delete=20some=20task=20module=20to=20reduce=20the=20si?= =?UTF-8?q?=E2=80=A6"=20(#16184)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3ad53c52007171f7ac291c7bdc497d3887dfaeef. --- deploy/docker/.env | 4 +- deploy/kubernetes/dolphinscheduler/Chart.yaml | 2 +- .../kubernetes/dolphinscheduler/values.yaml | 2 +- docs/configs/docsdev.js | 600 +++++++++--------- docs/docs/en/contribute/release.md | 42 +- docs/docs/en/guide/expansion-reduction.md | 4 +- docs/docs/en/guide/installation/kubernetes.md | 12 +- docs/docs/en/guide/installation/standalone.md | 2 +- docs/docs/en/guide/start/docker.md | 10 +- docs/docs/en/history-versions.md | 4 - docs/docs/zh/contribute/release.md | 40 +- docs/docs/zh/guide/expansion-reduction.md | 4 +- docs/docs/zh/guide/installation/kubernetes.md | 12 +- docs/docs/zh/guide/installation/standalone.md | 2 +- docs/docs/zh/guide/start/docker.md | 8 +- docs/docs/zh/history-versions.md | 4 - .../pom.xml | 2 +- .../dolphinscheduler-alert-all/pom.xml | 2 +- .../dolphinscheduler-alert-api/pom.xml | 2 +- .../dolphinscheduler-alert-dingtalk/pom.xml | 2 +- .../dolphinscheduler-alert-email/pom.xml | 2 +- .../dolphinscheduler-alert-feishu/pom.xml | 2 +- .../dolphinscheduler-alert-http/pom.xml | 2 +- .../dolphinscheduler-alert-pagerduty/pom.xml | 2 +- .../dolphinscheduler-alert-prometheus/pom.xml | 2 +- .../dolphinscheduler-alert-script/pom.xml | 2 +- .../dolphinscheduler-alert-slack/pom.xml | 2 +- .../dolphinscheduler-alert-telegram/pom.xml | 2 +- .../dolphinscheduler-alert-webexteams/pom.xml | 2 +- .../dolphinscheduler-alert-wechat/pom.xml | 2 +- .../dolphinscheduler-alert-plugins/pom.xml | 2 +- .../dolphinscheduler-alert-server/pom.xml | 31 +- dolphinscheduler-alert/pom.xml | 2 +- dolphinscheduler-aop/pom.xml | 2 +- dolphinscheduler-api/pom.xml | 73 +-- dolphinscheduler-bom/pom.xml | 2 +- dolphinscheduler-common/pom.xml | 2 +- .../dolphinscheduler-dao-api/pom.xml | 2 +- .../dolphinscheduler-dao-h2/pom.xml | 2 +- .../dolphinscheduler-dao-mysql/pom.xml | 2 +- .../dolphinscheduler-dao-plugin-all/pom.xml | 2 +- .../dolphinscheduler-dao-postgresql/pom.xml | 2 +- dolphinscheduler-dao-plugin/pom.xml | 2 +- dolphinscheduler-dao/pom.xml | 2 +- .../resources/sql/dolphinscheduler_h2.sql | 2 +- .../resources/sql/dolphinscheduler_mysql.sql | 2 +- .../sql/dolphinscheduler_postgresql.sql | 2 +- .../src/main/resources/sql/soft_version | 2 +- dolphinscheduler-data-quality/pom.xml | 2 +- .../dolphinscheduler-datasource-all/pom.xml | 2 +- .../dolphinscheduler-datasource-api/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../dolphinscheduler-datasource-db2/pom.xml | 2 +- .../dolphinscheduler-datasource-doris/pom.xml | 2 +- .../dolphinscheduler-datasource-hana/pom.xml | 2 +- .../dolphinscheduler-datasource-hive/pom.xml | 2 +- .../dolphinscheduler-datasource-k8s/pom.xml | 2 +- .../pom.xml | 2 +- .../dolphinscheduler-datasource-mysql/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../dolphinscheduler-datasource-pure/pom.xml | 66 -- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../dolphinscheduler-datasource-spark/pom.xml | 2 +- .../pom.xml | 2 +- .../dolphinscheduler-datasource-ssh/pom.xml | 2 +- .../pom.xml | 2 +- .../dolphinscheduler-datasource-trino/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- dolphinscheduler-datasource-plugin/pom.xml | 3 +- dolphinscheduler-dist/pom.xml | 2 +- dolphinscheduler-dist/release-docs/LICENSE | 3 - .../dolphinscheduler-extract-alert/pom.xml | 2 +- .../dolphinscheduler-extract-base/pom.xml | 2 +- .../dolphinscheduler-extract-common/pom.xml | 2 +- .../dolphinscheduler-extract-master/pom.xml | 2 +- .../dolphinscheduler-extract-worker/pom.xml | 2 +- dolphinscheduler-extract/pom.xml | 2 +- dolphinscheduler-master/pom.xml | 62 +- .../server/master/metrics/TaskMetrics.java | 2 +- dolphinscheduler-meter/pom.xml | 4 +- dolphinscheduler-microbench/pom.xml | 2 +- .../dolphinscheduler-registry-all/pom.xml | 2 +- .../dolphinscheduler-registry-api/pom.xml | 2 +- .../dolphinscheduler-registry-etcd/pom.xml | 2 +- .../dolphinscheduler-registry-it/pom.xml | 2 +- .../dolphinscheduler-registry-jdbc/pom.xml | 2 +- .../pom.xml | 2 +- .../dolphinscheduler-registry-plugins/pom.xml | 2 +- .../dolphinscheduler-registry-pure/pom.xml | 36 -- dolphinscheduler-registry/pom.xml | 3 +- .../dolphinscheduler-scheduler-all/pom.xml | 2 +- .../dolphinscheduler-scheduler-api/pom.xml | 2 +- .../dolphinscheduler-scheduler-quartz/pom.xml | 2 +- dolphinscheduler-scheduler-plugin/pom.xml | 2 +- dolphinscheduler-service/pom.xml | 2 +- dolphinscheduler-spi/pom.xml | 2 +- dolphinscheduler-standalone-server/pom.xml | 2 +- .../dolphinscheduler-storage-abs/pom.xml | 2 +- .../dolphinscheduler-storage-all/pom.xml | 2 +- .../dolphinscheduler-storage-api/pom.xml | 2 +- .../dolphinscheduler-storage-gcs/pom.xml | 2 +- .../dolphinscheduler-storage-hdfs/pom.xml | 2 +- .../dolphinscheduler-storage-obs/pom.xml | 2 +- .../dolphinscheduler-storage-oss/pom.xml | 2 +- .../dolphinscheduler-storage-pure/pom.xml | 47 -- .../dolphinscheduler-storage-s3/pom.xml | 2 +- dolphinscheduler-storage-plugin/pom.xml | 3 +- .../dolphinscheduler-task-all/pom.xml | 2 +- .../dolphinscheduler-task-api/pom.xml | 2 +- .../dolphinscheduler-task-chunjun/pom.xml | 3 +- .../dolphinscheduler-task-datafactory/pom.xml | 2 +- .../dolphinscheduler-task-dataquality/pom.xml | 3 +- .../dolphinscheduler-task-datasync/pom.xml | 2 +- .../dolphinscheduler-task-datax/pom.xml | 2 +- .../dolphinscheduler-task-dinky/pom.xml | 2 +- .../dolphinscheduler-task-dms/pom.xml | 2 +- .../dolphinscheduler-task-dvc/pom.xml | 2 +- .../dolphinscheduler-task-emr/pom.xml | 2 +- .../pom.xml | 2 +- .../dolphinscheduler-task-flink/pom.xml | 2 +- .../dolphinscheduler-task-hivecli/pom.xml | 2 +- .../dolphinscheduler-task-http/pom.xml | 2 +- .../dolphinscheduler-task-java/pom.xml | 2 +- .../dolphinscheduler-task-jupyter/pom.xml | 2 +- .../dolphinscheduler-task-k8s/pom.xml | 3 +- .../dolphinscheduler-task-kubeflow/pom.xml | 3 +- .../dolphinscheduler-task-linkis/pom.xml | 2 +- .../dolphinscheduler-task-mlflow/pom.xml | 2 +- .../dolphinscheduler-task-mr/pom.xml | 2 +- .../dolphinscheduler-task-openmldb/pom.xml | 2 +- .../dolphinscheduler-task-pigeon/pom.xml | 2 +- .../dolphinscheduler-task-procedure/pom.xml | 2 +- .../dolphinscheduler-task-pure/pom.xml | 133 ---- .../dolphinscheduler-task-python/pom.xml | 2 +- .../dolphinscheduler-task-pytorch/pom.xml | 2 +- .../dolphinscheduler-task-remoteshell/pom.xml | 3 +- .../dolphinscheduler-task-sagemaker/pom.xml | 3 +- .../dolphinscheduler-task-seatunnel/pom.xml | 2 +- .../dolphinscheduler-task-shell/pom.xml | 2 +- .../dolphinscheduler-task-spark/pom.xml | 2 +- .../dolphinscheduler-task-sql/pom.xml | 3 +- .../dolphinscheduler-task-sqoop/pom.xml | 2 +- .../dolphinscheduler-task-zeppelin/pom.xml | 3 +- dolphinscheduler-task-plugin/pom.xml | 3 +- dolphinscheduler-tools/pom.xml | 2 +- dolphinscheduler-ui/pom.xml | 2 +- dolphinscheduler-worker/pom.xml | 64 +- pom.xml | 22 +- tools/dependencies/known-dependencies.txt | 2 - 159 files changed, 562 insertions(+), 1007 deletions(-) delete mode 100644 dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-pure/pom.xml delete mode 100644 dolphinscheduler-registry/dolphinscheduler-registry-pure/pom.xml delete mode 100644 dolphinscheduler-storage-plugin/dolphinscheduler-storage-pure/pom.xml delete mode 100644 dolphinscheduler-task-plugin/dolphinscheduler-task-pure/pom.xml diff --git a/deploy/docker/.env b/deploy/docker/.env index d65a873b7211..ad703258aab3 100755 --- a/deploy/docker/.env +++ b/deploy/docker/.env @@ -15,8 +15,8 @@ # specific language governing permissions and limitations # under the License. # -HUB=apache -TAG=3.2.2 +HUB=ghcr.io/apache/dolphinscheduler +TAG=latest TZ=Asia/Shanghai DATABASE=postgresql diff --git a/deploy/kubernetes/dolphinscheduler/Chart.yaml b/deploy/kubernetes/dolphinscheduler/Chart.yaml index 096d7b84c9c5..bb886ea8c558 100644 --- a/deploy/kubernetes/dolphinscheduler/Chart.yaml +++ b/deploy/kubernetes/dolphinscheduler/Chart.yaml @@ -35,7 +35,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 3.2.2 +version: 3.1.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. diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml b/deploy/kubernetes/dolphinscheduler/values.yaml index 52addbac1996..7a04ff560440 100644 --- a/deploy/kubernetes/dolphinscheduler/values.yaml +++ b/deploy/kubernetes/dolphinscheduler/values.yaml @@ -33,7 +33,7 @@ image: # -- Docker image repository for the DolphinScheduler registry: apache # -- Docker image version for the DolphinScheduler - tag: 3.2.2 + tag: latest # -- Image pull policy. Options: Always, Never, IfNotPresent pullPolicy: "IfNotPresent" # -- Specify a imagePullSecrets diff --git a/docs/configs/docsdev.js b/docs/configs/docsdev.js index ce02146794b4..323e8b21d902 100644 --- a/docs/configs/docsdev.js +++ b/docs/configs/docsdev.js @@ -25,19 +25,19 @@ export default { children: [ { title: 'Introduction', - link: '/en-us/docs/3.2.2/user_doc/about/introduction.html', + link: '/en-us/docs/dev/user_doc/about/introduction.html', }, { title: 'Features', - link: '/en-us/docs/3.2.2/user_doc/about/features.html', + link: '/en-us/docs/dev/user_doc/about/features.html', }, { title: 'Hardware Environment', - link: '/en-us/docs/3.2.2/user_doc/about/hardware.html', + link: '/en-us/docs/dev/user_doc/about/hardware.html', }, { title: 'Glossary', - link: '/en-us/docs/3.2.2/user_doc/about/glossary.html', + link: '/en-us/docs/dev/user_doc/about/glossary.html', } ], }, @@ -46,11 +46,11 @@ export default { children: [ { title: 'Quick Start', - link: '/en-us/docs/3.2.2/user_doc/guide/start/quick-start.html', + link: '/en-us/docs/dev/user_doc/guide/start/quick-start.html', }, { title: 'Docker Deployment', - link: '/en-us/docs/3.2.2/user_doc/guide/start/docker.html', + link: '/en-us/docs/dev/user_doc/guide/start/docker.html', }, ], }, @@ -59,30 +59,30 @@ export default { children: [ { title: 'Application Homepage', - link: '/en-us/docs/3.2.2/user_doc/guide/homepage.html', + link: '/en-us/docs/dev/user_doc/guide/homepage.html', }, { title: 'Project', children: [ { title: 'Project List', - link: '/en-us/docs/3.2.2/user_doc/guide/project/project-list.html', + link: '/en-us/docs/dev/user_doc/guide/project/project-list.html', }, { title: 'Workflow Definition', - link: '/en-us/docs/3.2.2/user_doc/guide/project/workflow-definition.html', + link: '/en-us/docs/dev/user_doc/guide/project/workflow-definition.html', }, { title: 'Workflow Instance', - link: '/en-us/docs/3.2.2/user_doc/guide/project/workflow-instance.html', + link: '/en-us/docs/dev/user_doc/guide/project/workflow-instance.html', }, { title: 'Task Instance', - link: '/en-us/docs/3.2.2/user_doc/guide/project/task-instance.html', + link: '/en-us/docs/dev/user_doc/guide/project/task-instance.html', }, { title: 'Task Definition', - link: '/zh-cn/docs/3.2.2/user_doc/guide/project/task-definition.html', + link: '/zh-cn/docs/dev/user_doc/guide/project/task-definition.html', }, ] }, @@ -91,147 +91,147 @@ export default { children: [ { title: 'Appendix', - link: '/en-us/docs/3.2.2/user_doc/guide/task/appendix.html', + link: '/en-us/docs/dev/user_doc/guide/task/appendix.html', }, { title: 'Shell', - link: '/en-us/docs/3.2.2/user_doc/guide/task/shell.html', + link: '/en-us/docs/dev/user_doc/guide/task/shell.html', }, { title: 'SubProcess', - link: '/en-us/docs/3.2.2/user_doc/guide/task/sub-process.html', + link: '/en-us/docs/dev/user_doc/guide/task/sub-process.html', }, { title: 'Dynamic', - link: '/en-us/docs/3.2.2/user_doc/guide/task/dynamic.html', + link: '/en-us/docs/dev/user_doc/guide/task/dynamic.html', }, { title: 'Dependent', - link: '/en-us/docs/3.2.2/user_doc/guide/task/dependent.html', + link: '/en-us/docs/dev/user_doc/guide/task/dependent.html', }, { title: 'Stored Procedure', - link: '/en-us/docs/3.2.2/user_doc/guide/task/stored-procedure.html', + link: '/en-us/docs/dev/user_doc/guide/task/stored-procedure.html', }, { title: 'SQL', - link: '/en-us/docs/3.2.2/user_doc/guide/task/sql.html', + link: '/en-us/docs/dev/user_doc/guide/task/sql.html', }, { title: 'Spark', - link: '/en-us/docs/3.2.2/user_doc/guide/task/spark.html', + link: '/en-us/docs/dev/user_doc/guide/task/spark.html', }, { title: 'MapReduce', - link: '/en-us/docs/3.2.2/user_doc/guide/task/map-reduce.html', + link: '/en-us/docs/dev/user_doc/guide/task/map-reduce.html', }, { title: 'Python', - link: '/en-us/docs/3.2.2/user_doc/guide/task/python.html', + link: '/en-us/docs/dev/user_doc/guide/task/python.html', }, { title: 'Flink', - link: '/en-us/docs/3.2.2/user_doc/guide/task/flink.html', + link: '/en-us/docs/dev/user_doc/guide/task/flink.html', }, { title: 'HTTP', - link: '/en-us/docs/3.2.2/user_doc/guide/task/http.html', + link: '/en-us/docs/dev/user_doc/guide/task/http.html', }, { title: 'DataX', - link: '/en-us/docs/3.2.2/user_doc/guide/task/datax.html', + link: '/en-us/docs/dev/user_doc/guide/task/datax.html', }, { title: 'Sqoop', - link: '/en-us/docs/3.2.2/user_doc/guide/task/sqoop.html', + link: '/en-us/docs/dev/user_doc/guide/task/sqoop.html', }, { title: 'Pigeon', - link: '/en-us/docs/3.2.2/user_doc/guide/task/pigeon.html', + link: '/en-us/docs/dev/user_doc/guide/task/pigeon.html', }, { title: 'Conditions', - link: '/en-us/docs/3.2.2/user_doc/guide/task/conditions.html', + link: '/en-us/docs/dev/user_doc/guide/task/conditions.html', }, { title: 'Switch', - link: '/en-us/docs/3.2.2/user_doc/guide/task/switch.html', + link: '/en-us/docs/dev/user_doc/guide/task/switch.html', }, { title: 'SeaTunnel', - link: '/en-us/docs/3.2.2/user_doc/guide/task/seatunnel.html', + link: '/en-us/docs/dev/user_doc/guide/task/seatunnel.html', }, { title: 'Amazon EMR', - link: '/en-us/docs/3.2.2/user_doc/guide/task/emr.html', + link: '/en-us/docs/dev/user_doc/guide/task/emr.html', }, { title: 'Apache Zeppelin', - link: '/en-us/docs/3.2.2/user_doc/guide/task/zeppelin.html', + link: '/en-us/docs/dev/user_doc/guide/task/zeppelin.html', }, { title: 'Jupyter', - link: '/en-us/docs/3.2.2/user_doc/guide/task/jupyter.html', + link: '/en-us/docs/dev/user_doc/guide/task/jupyter.html', }, { title: 'Hive CLI', - link: '/en-us/docs/3.2.2/user_doc/guide/task/hive-cli.html', + link: '/en-us/docs/dev/user_doc/guide/task/hive-cli.html', }, { title: 'Kubernetes', - link: '/en-us/docs/3.2.2/user_doc/guide/task/kubernetes.html', + link: '/en-us/docs/dev/user_doc/guide/task/kubernetes.html', }, { title: 'MLflow', - link: '/en-us/docs/3.2.2/user_doc/guide/task/mlflow.html', + link: '/en-us/docs/dev/user_doc/guide/task/mlflow.html', }, { title: 'Openmldb', - link: '/en-us/docs/3.2.2/user_doc/guide/task/openmldb.html', + link: '/en-us/docs/dev/user_doc/guide/task/openmldb.html', }, { title: 'DVC', - link: '/en-us/docs/3.2.2/user_doc/guide/task/dvc.html', + link: '/en-us/docs/dev/user_doc/guide/task/dvc.html', }, { title: 'Dinky', - link: '/en-us/docs/3.2.2/user_doc/guide/task/dinky.html', + link: '/en-us/docs/dev/user_doc/guide/task/dinky.html', }, { title: 'Java', - link: '/en-us/docs/3.2.2/user_doc/guide/task/java.html', + link: '/en-us/docs/dev/user_doc/guide/task/java.html', }, { title: 'SageMaker', - link: '/en-us/docs/3.2.2/user_doc/guide/task/sagemaker.html', + link: '/en-us/docs/dev/user_doc/guide/task/sagemaker.html', }, { title: 'ChunJun', - link: '/en-us/docs/3.2.2/user_doc/guide/task/chunjun.html', + link: '/en-us/docs/dev/user_doc/guide/task/chunjun.html', }, { title: 'Pytorch', - link: '/en-us/docs/3.2.2/user_doc/guide/task/pytorch.html', + link: '/en-us/docs/dev/user_doc/guide/task/pytorch.html', }, { title: 'Amazon DMS', - link: '/en-us/docs/3.2.2/user_doc/guide/task/dms.html', + link: '/en-us/docs/dev/user_doc/guide/task/dms.html', }, { title: 'AWS Datasync', - link: '/en-us/docs/3.2.2/user_doc/guide/task/datasync.html', + link: '/en-us/docs/dev/user_doc/guide/task/datasync.html', }, { title: 'Kubeflow', - link: '/en-us/docs/3.2.2/user_doc/guide/task/kubeflow.html', + link: '/en-us/docs/dev/user_doc/guide/task/kubeflow.html', }, { title: 'Apache Linkis', - link: '/en-us/docs/3.2.2/user_doc/guide/task/linkis.html', + link: '/en-us/docs/dev/user_doc/guide/task/linkis.html', }, { title: 'SSH', - link: '/en-us/docs/3.2.2/user_doc/guide/task/ssh.html', + link: '/en-us/docs/dev/user_doc/guide/task/ssh.html', }, ], }, @@ -240,39 +240,39 @@ export default { children: [ { title: 'Built-in Parameter', - link: '/en-us/docs/3.2.2/user_doc/guide/parameter/built-in.html', + link: '/en-us/docs/dev/user_doc/guide/parameter/built-in.html', }, { title: 'Global Parameter', - link: '/en-us/docs/3.2.2/user_doc/guide/parameter/global.html', + link: '/en-us/docs/dev/user_doc/guide/parameter/global.html', }, { title: 'Local Parameter', - link: '/en-us/docs/3.2.2/user_doc/guide/parameter/local.html', + link: '/en-us/docs/dev/user_doc/guide/parameter/local.html', }, { title: 'Project-level Parameter', - link: '/en-us/docs/3.2.2/user_doc/guide/parameter/project-parameter.html', + link: '/en-us/docs/dev/user_doc/guide/parameter/project-parameter.html', }, { title: 'Parameter Context', - link: '/en-us/docs/3.2.2/user_doc/guide/parameter/context.html', + link: '/en-us/docs/dev/user_doc/guide/parameter/context.html', }, { title: 'Parameter Priority', - link: '/en-us/docs/3.2.2/user_doc/guide/parameter/priority.html', + link: '/en-us/docs/dev/user_doc/guide/parameter/priority.html', }, { title: 'File Parameter', - link: '/en-us/docs/3.2.2/user_doc/guide/parameter/file-parameter.html', + link: '/en-us/docs/dev/user_doc/guide/parameter/file-parameter.html', }, { title: 'Vertica', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/vertica.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/vertica.html', }, { title: 'Remote Shell', - link: '/en-us/docs/3.2.2/user_doc/guide/task/remoteshell.html', + link: '/en-us/docs/dev/user_doc/guide/task/remoteshell.html', }, ], }, @@ -281,91 +281,91 @@ export default { children: [ { title: 'MySQL', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/mysql.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/mysql.html', }, { title: 'PostgreSQL', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/postgresql.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/postgresql.html', }, { title: 'HIVE', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/hive.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/hive.html', }, { title: 'SNOWFLAKE', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/snowflake.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/snowflake.html', }, { title: 'KYUUBI', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/kyuubi.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/kyuubi.html', }, { title: 'Spark', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/spark.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/spark.html', }, { title: 'Presto', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/presto.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/presto.html', }, { title: 'SQL SERVER', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/sqlserver.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/sqlserver.html', }, { title: 'Amazon Redshift', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/redshift.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/redshift.html', }, { title: 'ClickHouse', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/clickhouse.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/clickhouse.html', }, { title: 'IBM DB2', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/db2.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/db2.html', }, { title: 'Oracle', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/oracle.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/oracle.html', }, { title: 'Amazon Athena', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/athena.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/athena.html', }, { title: 'Azure SQL Database', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/azure-sql.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/azure-sql.html', }, { title: 'Trino', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/trino.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/trino.html', }, { title: 'StarRocks', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/starrocks.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/starrocks.html', }, { title: 'DAMENG', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/dameng.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/dameng.html', }, { title: 'OceanBase', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/oceanbase.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/oceanbase.html', }, { title: 'SSH', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/ssh.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/ssh.html', }, { title: 'Databend', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/databend.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/databend.html', }, { title: 'HANA', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/hana.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/hana.html', }, { title: 'doris', - link: '/en-us/docs/3.2.2/user_doc/guide/datasource/doris.html', + link: '/en-us/docs/dev/user_doc/guide/datasource/doris.html', } ], }, @@ -374,46 +374,46 @@ export default { children: [ { title: 'Alert Component User Guide ', - link: '/en-us/docs/3.2.2/user_doc/guide/alert/alert_plugin_user_guide.html', + link: '/en-us/docs/dev/user_doc/guide/alert/alert_plugin_user_guide.html', }, { title: 'Email', - link: '/en-us/docs/3.2.2/user_doc/guide/alert/email.html', + link: '/en-us/docs/dev/user_doc/guide/alert/email.html', }, { title: 'Telegram', - link: '/en-us/docs/3.2.2/user_doc/guide/alert/telegram.html', + link: '/en-us/docs/dev/user_doc/guide/alert/telegram.html', }, { title: 'Ding Talk', - link: '/en-us/docs/3.2.2/user_doc/guide/alert/dingtalk.html', + link: '/en-us/docs/dev/user_doc/guide/alert/dingtalk.html', }, { title: 'Enterprise Wechat', - link: '/en-us/docs/3.2.2/user_doc/guide/alert/enterprise-wechat.html', + link: '/en-us/docs/dev/user_doc/guide/alert/enterprise-wechat.html', }, { title: 'Enterprise Webexteams', - link: '/en-us/docs/3.2.2/user_doc/guide/alert/enterprise-webexteams.html', + link: '/en-us/docs/dev/user_doc/guide/alert/enterprise-webexteams.html', }, { title: 'Script', - link: '/en-us/docs/3.2.2/user_doc/guide/alert/script.html', + link: '/en-us/docs/dev/user_doc/guide/alert/script.html', }, { title: 'Http', - link: '/en-us/docs/3.2.2/user_doc/guide/alert/http.html', + link: '/en-us/docs/dev/user_doc/guide/alert/http.html', }, { title: 'Feishu', - link: '/en-us/docs/3.2.2/user_doc/guide/alert/feishu.html', + link: '/en-us/docs/dev/user_doc/guide/alert/feishu.html', }, { title: 'Slack', - link: '/en-us/docs/3.2.2/user_doc/guide/alert/slack.html', + link: '/en-us/docs/dev/user_doc/guide/alert/slack.html', },{ title: 'Aliyun Voice', - link: '/en-us/docs/3.2.2/user_doc/guide/alert/aliyun-voice.html', + link: '/en-us/docs/dev/user_doc/guide/alert/aliyun-voice.html', }, ], }, @@ -422,40 +422,40 @@ export default { children: [ { title: 'Introduction', - link: '/en-us/docs/3.2.2/user_doc/guide/resource/intro.html' + link: '/en-us/docs/dev/user_doc/guide/resource/intro.html' }, { title: 'Configuration', - link: '/en-us/docs/3.2.2/user_doc/guide/resource/configuration.html' + link: '/en-us/docs/dev/user_doc/guide/resource/configuration.html' }, { title: 'File Manage', - link: '/en-us/docs/3.2.2/user_doc/guide/resource/file-manage.html' + link: '/en-us/docs/dev/user_doc/guide/resource/file-manage.html' }, { title: 'UDF Manage', - link: '/en-us/docs/3.2.2/user_doc/guide/resource/udf-manage.html' + link: '/en-us/docs/dev/user_doc/guide/resource/udf-manage.html' }, { title: 'Task Group Manage', - link: '/en-us/docs/3.2.2/user_doc/guide/resource/task-group.html' + link: '/en-us/docs/dev/user_doc/guide/resource/task-group.html' }, ], }, { title: 'Monitor', - link: '/en-us/docs/3.2.2/user_doc/guide/monitor.html', + link: '/en-us/docs/dev/user_doc/guide/monitor.html', }, { title: 'Security', children: [ { title: 'Security (Authorization System)', - link: '/en-us/docs/3.2.2/user_doc/guide/security/security.html', + link: '/en-us/docs/dev/user_doc/guide/security/security.html', }, { title: 'Authentication Type', - link: '/en-us/docs/3.2.2/user_doc/guide/security/authentication-type.html', + link: '/en-us/docs/dev/user_doc/guide/security/authentication-type.html', } ], }, @@ -465,38 +465,38 @@ export default { children: [ { title: 'Metrics', - link: '/en-us/docs/3.2.2/user_doc/guide/metrics/metrics.html', + link: '/en-us/docs/dev/user_doc/guide/metrics/metrics.html', } ], }, { title: 'Data Quality', - link: '/en-us/docs/3.2.2/user_doc/guide/data-quality.html', + link: '/en-us/docs/dev/user_doc/guide/data-quality.html', }, { title: 'Remote Logging', - link: '/en-us/docs/3.2.2/user_doc/guide/remote-logging.html', + link: '/en-us/docs/dev/user_doc/guide/remote-logging.html', }, { title: 'Upgrade', children: [ { title: 'Incompatible', - link: '/en-us/docs/3.2.2/user_doc/guide/upgrade/incompatible.html', + link: '/en-us/docs/dev/user_doc/guide/upgrade/incompatible.html', }, { title: 'Upgrade', - link: '/en-us/docs/3.2.2/user_doc/guide/upgrade/upgrade.html', + link: '/en-us/docs/dev/user_doc/guide/upgrade/upgrade.html', }, ], }, { title: 'Expansion and Reduction', - link: '/en-us/docs/3.2.2/user_doc/guide/expansion-reduction.html', + link: '/en-us/docs/dev/user_doc/guide/expansion-reduction.html', }, { title: 'Demo', - link: '/en-us/docs/3.2.2/user_doc/guide/demo.html', + link: '/en-us/docs/dev/user_doc/guide/demo.html', }, ], }, @@ -505,26 +505,26 @@ export default { children: [ { title: 'Standalone Deployment', - link: '/en-us/docs/3.2.2/user_doc/guide/installation/standalone.html', + link: '/en-us/docs/dev/user_doc/guide/installation/standalone.html', }, { title: 'Pseudo Cluster Deployment', - link: '/en-us/docs/3.2.2/user_doc/guide/installation/pseudo-cluster.html', + link: '/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html', }, { title: 'Cluster Deployment', - link: '/en-us/docs/3.2.2/user_doc/guide/installation/cluster.html', + link: '/en-us/docs/dev/user_doc/guide/installation/cluster.html', }, { title: 'Kubernetes Deployment', - link: '/en-us/docs/3.2.2/user_doc/guide/installation/kubernetes.html', + link: '/en-us/docs/dev/user_doc/guide/installation/kubernetes.html', }, { title: 'integration', children: [ { title: 'Rainbond Deployment', - link: '/en-us/docs/3.2.2/user_doc/guide/integration/rainbond.html', + link: '/en-us/docs/dev/user_doc/guide/integration/rainbond.html', }, ], }, @@ -535,27 +535,27 @@ export default { children: [ { title: 'Architecture Design', - link: '/en-us/docs/3.2.2/user_doc/architecture/design.html', + link: '/en-us/docs/dev/user_doc/architecture/design.html', }, { title: 'Metadata', - link: '/en-us/docs/3.2.2/user_doc/architecture/metadata.html', + link: '/en-us/docs/dev/user_doc/architecture/metadata.html', }, { title: 'Configuration File', - link: '/en-us/docs/3.2.2/user_doc/architecture/configuration.html', + link: '/en-us/docs/dev/user_doc/architecture/configuration.html', }, { title: 'Task Structure', - link: '/en-us/docs/3.2.2/user_doc/architecture/task-structure.html', + link: '/en-us/docs/dev/user_doc/architecture/task-structure.html', }, { title: 'Load Balance', - link: '/en-us/docs/3.2.2/user_doc/architecture/load-balance.html', + link: '/en-us/docs/dev/user_doc/architecture/load-balance.html', }, { title: 'Cache', - link: '/en-us/docs/3.2.2/user_doc/architecture/cache.html', + link: '/en-us/docs/dev/user_doc/architecture/cache.html', }, ], }, @@ -564,15 +564,15 @@ export default { children: [ { title: 'Open API', - link: '/en-us/docs/3.2.2/user_doc/guide/api/open-api.html', + link: '/en-us/docs/dev/user_doc/guide/api/open-api.html', }, { title: 'PyDolphinScheduler', - link: '/en-us/docs/3.2.2/user_doc/guide/api/pydolphinscheduler.html', + link: '/en-us/docs/dev/user_doc/guide/api/pydolphinscheduler.html', }, { title: 'Health Check', - link: '/en-us/docs/3.2.2/user_doc/guide/api/healthcheck.html', + link: '/en-us/docs/dev/user_doc/guide/api/healthcheck.html', }, ], }, @@ -584,69 +584,69 @@ export default { children: [ { title: 'Security Report', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/security.html', + link: '/en-us/docs/dev/user_doc/contribute/join/security.html', }, { title: 'How to Become a Committer', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/become-a-committer.html', + link: '/en-us/docs/dev/user_doc/contribute/join/become-a-committer.html', }, { title: 'Subscribe Mailing Lists', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/subscribe.html', + link: '/en-us/docs/dev/user_doc/contribute/join/subscribe.html', }, { title: 'Participate in Contributing', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/contribute.html', + link: '/en-us/docs/dev/user_doc/contribute/join/contribute.html', }, { title: 'Code of Conduct', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/code-conduct.html', + link: '/en-us/docs/dev/user_doc/contribute/join/code-conduct.html', }, { title: 'Review Issue or Pull Requests', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/review.html', + link: '/en-us/docs/dev/user_doc/contribute/join/review.html', }, { title: 'E2E Contribution Guide', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/e2e-guide.html', + link: '/en-us/docs/dev/user_doc/contribute/join/e2e-guide.html', }, { title: 'Submit Code', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/submit-code.html', + link: '/en-us/docs/dev/user_doc/contribute/join/submit-code.html', }, { title: 'License Notice', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/DS-License.html', + link: '/en-us/docs/dev/user_doc/contribute/join/DS-License.html', }, { title: 'Document Notice', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/document.html', + link: '/en-us/docs/dev/user_doc/contribute/join/document.html', }, { title: 'Issue Notice', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/issue.html', + link: '/en-us/docs/dev/user_doc/contribute/join/issue.html', }, { title: 'Pull Request Notice', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/pull-request.html', + link: '/en-us/docs/dev/user_doc/contribute/join/pull-request.html', }, { title: 'Commit Message Notice', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/commit-message.html', + link: '/en-us/docs/dev/user_doc/contribute/join/commit-message.html', }, { title: 'Micro BenchMark Notice', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/microbench.html', + link: '/en-us/docs/dev/user_doc/contribute/join/microbench.html', }, { title: 'Unit Test Writing Guide', - link: '/en-us/docs/3.2.2/user_doc/contribute/join/unit-test.html', + link: '/en-us/docs/dev/user_doc/contribute/join/unit-test.html', }, ], }, { - title: '3.2.2elopment Environment Setup', - link: '/en-us/docs/3.2.2/user_doc/contribute/3.2.2elopment-environment-setup.html', + title: 'Development Environment Setup', + link: '/en-us/docs/dev/user_doc/contribute/development-environment-setup.html', }, { title: 'Design Document', @@ -657,27 +657,27 @@ export default { // children: [ { title: 'Architecture Design', - link: '/en-us/docs/3.2.2/user_doc/contribute/architecture-design.html', + link: '/en-us/docs/dev/user_doc/contribute/architecture-design.html', }, { title: 'Alert SPI', - link: '/en-us/docs/3.2.2/user_doc/contribute/backend/spi/alert.html', + link: '/en-us/docs/dev/user_doc/contribute/backend/spi/alert.html', }, { title: 'Registry SPI', - link: '/en-us/docs/3.2.2/user_doc/contribute/backend/spi/registry.html', + link: '/en-us/docs/dev/user_doc/contribute/backend/spi/registry.html', }, { title: 'Task SPI', - link: '/en-us/docs/3.2.2/user_doc/contribute/backend/spi/task.html', + link: '/en-us/docs/dev/user_doc/contribute/backend/spi/task.html', }, { title: 'Datasource SPI', - link: '/en-us/docs/3.2.2/user_doc/contribute/backend/spi/datasource.html', + link: '/en-us/docs/dev/user_doc/contribute/backend/spi/datasource.html', }, { title: 'Mechanism Design', - link: '/en-us/docs/3.2.2/user_doc/contribute/backend/mechanism/overview.html', + link: '/en-us/docs/dev/user_doc/contribute/backend/mechanism/overview.html', }, ], }, @@ -685,34 +685,34 @@ export default { title: 'Guidelines', children: [ { - title: 'Frontend 3.2.2elopment', - link: '/en-us/docs/3.2.2/user_doc/contribute/frontend-3.2.2elopment.html', + title: 'Frontend Development', + link: '/en-us/docs/dev/user_doc/contribute/frontend-development.html', }, { title: 'API Standard', - link: '/en-us/docs/3.2.2/user_doc/contribute/api-standard.html', + link: '/en-us/docs/dev/user_doc/contribute/api-standard.html', }, { title: 'E2E Automation Test', - link: '/en-us/docs/3.2.2/user_doc/contribute/e2e-test.html', + link: '/en-us/docs/dev/user_doc/contribute/e2e-test.html', }, { title: 'API Automation Test', - link: '/en-us/docs/3.2.2/user_doc/contribute/api-test.html', + link: '/en-us/docs/dev/user_doc/contribute/api-test.html', }, { title: 'Log Specification', - link: '/en-us/docs/3.2.2/user_doc/contribute/log-specification.html', + link: '/en-us/docs/dev/user_doc/contribute/log-specification.html', }, ], }, { title: 'Releasing', - link: '/en-us/docs/3.2.2/user_doc/contribute/release.html', + link: '/en-us/docs/dev/user_doc/contribute/release.html', }, { title: 'Questions & Communications', - link: '/en-us/docs/3.2.2/user_doc/contribute/have-questions.html', + link: '/en-us/docs/dev/user_doc/contribute/have-questions.html', }, ], }, @@ -721,7 +721,7 @@ export default { children: [ { title: 'DSIP', - link: '/en-us/docs/3.2.2/user_doc/DSIP.html', + link: '/en-us/docs/dev/user_doc/DSIP.html', }, ], }, @@ -730,11 +730,11 @@ export default { children: [ { title: 'General Setting', - link: '/en-us/docs/3.2.2/user_doc/guide/howto/general-setting.html', + link: '/en-us/docs/dev/user_doc/guide/howto/general-setting.html', }, { title: 'Datasource Setting', - link: '/en-us/docs/3.2.2/user_doc/guide/howto/datasource-setting.html', + link: '/en-us/docs/dev/user_doc/guide/howto/datasource-setting.html', }, { title: 'Others', @@ -761,19 +761,19 @@ export default { children: [ { title: '简介', - link: '/zh-cn/docs/3.2.2/user_doc/about/introduction.html', + link: '/zh-cn/docs/dev/user_doc/about/introduction.html', }, { title: '特性', - link: '/zh-cn/docs/3.2.2/user_doc/about/features.html', + link: '/zh-cn/docs/dev/user_doc/about/features.html', }, { title: '建议配置', - link: '/zh-cn/docs/3.2.2/user_doc/about/hardware.html', + link: '/zh-cn/docs/dev/user_doc/about/hardware.html', }, { title: '名词解释', - link: '/zh-cn/docs/3.2.2/user_doc/about/glossary.html', + link: '/zh-cn/docs/dev/user_doc/about/glossary.html', }, ], }, @@ -782,11 +782,11 @@ export default { children: [ { title: '快速上手', - link: '/zh-cn/docs/3.2.2/user_doc/guide/start/quick-start.html', + link: '/zh-cn/docs/dev/user_doc/guide/start/quick-start.html', }, { title: 'Docker部署(Docker)', - link: '/zh-cn/docs/3.2.2/user_doc/guide/start/docker.html', + link: '/zh-cn/docs/dev/user_doc/guide/start/docker.html', }, ], }, @@ -795,30 +795,30 @@ export default { children: [ { title: '应用首页', - link: '/zh-cn/docs/3.2.2/user_doc/guide/homepage.html', + link: '/zh-cn/docs/dev/user_doc/guide/homepage.html', }, { title: '项目管理', children: [ { title: '项目列表', - link: '/zh-cn/docs/3.2.2/user_doc/guide/project/project-list.html', + link: '/zh-cn/docs/dev/user_doc/guide/project/project-list.html', }, { title: '工作流定义', - link: '/zh-cn/docs/3.2.2/user_doc/guide/project/workflow-definition.html', + link: '/zh-cn/docs/dev/user_doc/guide/project/workflow-definition.html', }, { title: '工作流实例', - link: '/zh-cn/docs/3.2.2/user_doc/guide/project/workflow-instance.html', + link: '/zh-cn/docs/dev/user_doc/guide/project/workflow-instance.html', }, { title: '任务实例', - link: '/zh-cn/docs/3.2.2/user_doc/guide/project/task-instance.html', + link: '/zh-cn/docs/dev/user_doc/guide/project/task-instance.html', }, { title: '任务定义', - link: '/zh-cn/docs/3.2.2/user_doc/guide/project/task-definition.html', + link: '/zh-cn/docs/dev/user_doc/guide/project/task-definition.html', }, ] }, @@ -827,155 +827,155 @@ export default { children: [ { title: 'Appendix', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/appendix.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/appendix.html', }, { title: 'Shell', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/shell.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/shell.html', }, { title: 'SubProcess', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/sub-process.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/sub-process.html', }, { title: 'Dynamic', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/dynamic.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/dynamic.html', }, { title: 'Dependent', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/dependent.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/dependent.html', }, { title: 'Stored Procedure', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/stored-procedure.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/stored-procedure.html', }, { title: 'SQL', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/sql.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/sql.html', }, { title: 'Spark', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/spark.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/spark.html', }, { title: 'MapReduce', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/map-reduce.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/map-reduce.html', }, { title: 'Python', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/python.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/python.html', }, { title: 'Flink', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/flink.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/flink.html', }, { title: 'HTTP', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/http.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/http.html', }, { title: 'DataX', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/datax.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/datax.html', }, { title: 'Sqoop', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/sqoop.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/sqoop.html', }, { title: 'Pigeon', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/pigeon.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/pigeon.html', }, { title: 'Conditions', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/conditions.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/conditions.html', }, { title: 'Switch', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/switch.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/switch.html', }, { title: 'SeaTunnel', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/seatunnel.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/seatunnel.html', }, { title: 'Amazon EMR', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/emr.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/emr.html', }, { title: 'Apache Zeppelin', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/zeppelin.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/zeppelin.html', }, { title: 'Jupyter', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/jupyter.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/jupyter.html', }, { title: 'Hive CLI', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/hive-cli.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/hive-cli.html', }, { title: 'Kubernetes', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/kubernetes.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/kubernetes.html', }, { title: 'MLflow', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/mlflow.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/mlflow.html', }, { title: 'Openmldb', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/openmldb.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/openmldb.html', }, { title: 'DVC', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/dvc.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/dvc.html', }, { title: 'Dinky', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/dinky.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/dinky.html', }, { title: 'Java', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/java.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/java.html', }, { title: 'SageMaker', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/sagemaker.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/sagemaker.html', }, { title: 'ChunJun', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/chunjun.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/chunjun.html', }, { title: 'Pytorch', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/pytorch.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/pytorch.html', }, { title: 'Amazon DMS', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/dms.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/dms.html', }, { title: 'AWS Datasync', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/datasync.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/datasync.html', }, { title: 'Kubeflow', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/kubeflow.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/kubeflow.html', }, { title: 'Apache Linkis', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/linkis.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/linkis.html', }, { title: 'SSH', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/ssh.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/ssh.html', }, { title: 'Vertica', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/vertica.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/vertica.html', }, { title: 'Remote Shell', - link: '/zh-cn/docs/3.2.2/user_doc/guide/task/remoteshell.html', + link: '/zh-cn/docs/dev/user_doc/guide/task/remoteshell.html', }, ], }, @@ -984,31 +984,31 @@ export default { children: [ { title: '内置参数', - link: '/zh-cn/docs/3.2.2/user_doc/guide/parameter/built-in.html', + link: '/zh-cn/docs/dev/user_doc/guide/parameter/built-in.html', }, { title: '全局参数', - link: '/zh-cn/docs/3.2.2/user_doc/guide/parameter/global.html', + link: '/zh-cn/docs/dev/user_doc/guide/parameter/global.html', }, { title: '本地参数', - link: '/zh-cn/docs/3.2.2/user_doc/guide/parameter/local.html', + link: '/zh-cn/docs/dev/user_doc/guide/parameter/local.html', }, { title: '项目级别参数', - link: '/zh-cn/docs/3.2.2/user_doc/guide/parameter/project-parameter.html', + link: '/zh-cn/docs/dev/user_doc/guide/parameter/project-parameter.html', }, { title: '参数传递', - link: '/zh-cn/docs/3.2.2/user_doc/guide/parameter/context.html', + link: '/zh-cn/docs/dev/user_doc/guide/parameter/context.html', }, { title: '参数优先级', - link: '/zh-cn/docs/3.2.2/user_doc/guide/parameter/priority.html', + link: '/zh-cn/docs/dev/user_doc/guide/parameter/priority.html', }, { title: '文件参数传递', - link: '/zh-cn/docs/3.2.2/user_doc/guide/parameter/file-parameter.html', + link: '/zh-cn/docs/dev/user_doc/guide/parameter/file-parameter.html', }, ], }, @@ -1017,75 +1017,75 @@ export default { children: [ { title: 'MySQL', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/mysql.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/mysql.html', }, { title: 'PostgreSQL', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/postgresql.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/postgresql.html', }, { title: 'HIVE', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/hive.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/hive.html', }, { title: 'SNOWFLAKE', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/snowflake.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/snowflake.html', }, { title: 'KYUUBI', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/kyuubi.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/kyuubi.html', }, { title: 'Spark', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/spark.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/spark.html', }, { title: 'Amazon Athena', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/athena.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/athena.html', }, { title: 'Azure SQL Database', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/azure-sql.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/azure-sql.html', }, { title: 'Redshift', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/redshift.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/redshift.html', }, { title: 'Oracle', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/oracle.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/oracle.html', }, { title: 'Trino', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/trino.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/trino.html', }, { title: 'StarRocks', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/starrocks.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/starrocks.html', }, { title: 'DAMENG', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/dameng.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/dameng.html', }, { title: 'OceanBase', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/oceanbase.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/oceanbase.html', }, { title: 'SSH', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/ssh.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/ssh.html', }, { title: 'Databend', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/databend.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/databend.html', }, { title: 'HANA', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/hana.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/hana.html', }, { title: 'Doris', - link: '/zh-cn/docs/3.2.2/user_doc/guide/datasource/doris.html', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/doris.html', } ], }, @@ -1094,47 +1094,47 @@ export default { children: [ { title: '告警组件向导', - link: '/zh-cn/docs/3.2.2/user_doc/guide/alert/alert_plugin_user_guide.html', + link: '/zh-cn/docs/dev/user_doc/guide/alert/alert_plugin_user_guide.html', }, { title: 'Email', - link: '/zh-cn/docs/3.2.2/user_doc/guide/alert/email.html', + link: '/zh-cn/docs/dev/user_doc/guide/alert/email.html', }, { title: 'Telegram', - link: '/zh-cn/docs/3.2.2/user_doc/guide/alert/telegram.html', + link: '/zh-cn/docs/dev/user_doc/guide/alert/telegram.html', }, { title: '钉钉告警', - link: '/zh-cn/docs/3.2.2/user_doc/guide/alert/dingtalk.html', + link: '/zh-cn/docs/dev/user_doc/guide/alert/dingtalk.html', }, { title: '企业微信', - link: '/zh-cn/docs/3.2.2/user_doc/guide/alert/enterprise-wechat.html', + link: '/zh-cn/docs/dev/user_doc/guide/alert/enterprise-wechat.html', }, { title: 'Webexteams', - link: '/zh-cn/docs/3.2.2/user_doc/guide/alert/enterprise-webexteams.html', + link: '/zh-cn/docs/dev/user_doc/guide/alert/enterprise-webexteams.html', }, { title: '脚本告警', - link: '/zh-cn/docs/3.2.2/user_doc/guide/alert/script.html', + link: '/zh-cn/docs/dev/user_doc/guide/alert/script.html', }, { title: 'Http告警', - link: '/zh-cn/docs/3.2.2/user_doc/guide/alert/http.html', + link: '/zh-cn/docs/dev/user_doc/guide/alert/http.html', }, { title: '飞书告警', - link: '/zh-cn/docs/3.2.2/user_doc/guide/alert/feishu.html', + link: '/zh-cn/docs/dev/user_doc/guide/alert/feishu.html', }, { title: 'Slack告警', - link: '/zh-cn/docs/3.2.2/user_doc/guide/alert/slack.html', + link: '/zh-cn/docs/dev/user_doc/guide/alert/slack.html', }, { title: '阿里云语音告警', - link: '/zh-cn/docs/3.2.2/user_doc/guide/alert/aliyun-voice.html', + link: '/zh-cn/docs/dev/user_doc/guide/alert/aliyun-voice.html', }, ], }, @@ -1143,40 +1143,40 @@ export default { children: [ { title: '简介', - link: '/zh-cn/docs/3.2.2/user_doc/guide/resource/intro.html' + link: '/zh-cn/docs/dev/user_doc/guide/resource/intro.html' }, { title: '配置详情', - link: '/zh-cn/docs/3.2.2/user_doc/guide/resource/configuration.html' + link: '/zh-cn/docs/dev/user_doc/guide/resource/configuration.html' }, { title: '文件管理', - link: '/zh-cn/docs/3.2.2/user_doc/guide/resource/file-manage.html' + link: '/zh-cn/docs/dev/user_doc/guide/resource/file-manage.html' }, { title: 'UDF 管理', - link: '/zh-cn/docs/3.2.2/user_doc/guide/resource/udf-manage.html' + link: '/zh-cn/docs/dev/user_doc/guide/resource/udf-manage.html' }, { title: '任务组管理', - link: '/zh-cn/docs/3.2.2/user_doc/guide/resource/task-group.html' + link: '/zh-cn/docs/dev/user_doc/guide/resource/task-group.html' }, ], }, { title: '监控中心', - link: '/zh-cn/docs/3.2.2/user_doc/guide/monitor.html', + link: '/zh-cn/docs/dev/user_doc/guide/monitor.html', }, { title: '安全中心', children: [ { title: '安全中心（权限系统）', - link: '/zh-cn/docs/3.2.2/user_doc/guide/security/security.html', + link: '/zh-cn/docs/dev/user_doc/guide/security/security.html', }, { title: '认证方式', - link: '/zh-cn/docs/3.2.2/user_doc/guide/security/authentication-type.html', + link: '/zh-cn/docs/dev/user_doc/guide/security/authentication-type.html', } ], }, @@ -1185,38 +1185,38 @@ export default { children: [ { title: '指标', - link: '/zh-cn/docs/3.2.2/user_doc/guide/metrics/metrics.html', + link: '/zh-cn/docs/dev/user_doc/guide/metrics/metrics.html', } ], }, { title: '数据质量', - link: '/zh-cn/docs/3.2.2/user_doc/guide/data-quality.html', + link: '/zh-cn/docs/dev/user_doc/guide/data-quality.html', }, { title: '远程日志存储', - link: '/zh-cn/docs/3.2.2/user_doc/guide/remote-logging.html', + link: '/zh-cn/docs/dev/user_doc/guide/remote-logging.html', }, { title: '升级', children: [ { title: '不向前兼容的更新', - link: '/zh-cn/docs/3.2.2/user_doc/guide/upgrade/incompatible.html', + link: '/zh-cn/docs/dev/user_doc/guide/upgrade/incompatible.html', }, { title: '升级步骤', - link: '/zh-cn/docs/3.2.2/user_doc/guide/upgrade/upgrade.html', + link: '/zh-cn/docs/dev/user_doc/guide/upgrade/upgrade.html', }, ], }, { title: '扩/缩容', - link: '/zh-cn/docs/3.2.2/user_doc/guide/expansion-reduction.html', + link: '/zh-cn/docs/dev/user_doc/guide/expansion-reduction.html', }, { title: 'Demo', - link: '/zh-cn/docs/3.2.2/user_doc/guide/demo.html', + link: '/zh-cn/docs/dev/user_doc/guide/demo.html', }, ], }, @@ -1225,26 +1225,26 @@ export default { children: [ { title: '单机部署(Standalone)', - link: '/zh-cn/docs/3.2.2/user_doc/guide/installation/standalone.html', + link: '/zh-cn/docs/dev/user_doc/guide/installation/standalone.html', }, { title: '伪集群部署(Pseudo-Cluster)', - link: '/zh-cn/docs/3.2.2/user_doc/guide/installation/pseudo-cluster.html', + link: '/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html', }, { title: '集群部署(Cluster)', - link: '/zh-cn/docs/3.2.2/user_doc/guide/installation/cluster.html', + link: '/zh-cn/docs/dev/user_doc/guide/installation/cluster.html', }, { title: 'Kubernetes部署(Kubernetes)', - link: '/zh-cn/docs/3.2.2/user_doc/guide/installation/kubernetes.html', + link: '/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.html', }, { title: '集成', children: [ { title: '基于Rainbond部署(Cluster)', - link: '/zh-cn/docs/3.2.2/user_doc/guide/integration/rainbond.html', + link: '/zh-cn/docs/dev/user_doc/guide/integration/rainbond.html', }, ], }, @@ -1255,27 +1255,27 @@ export default { children: [ { title: '元数据文档', - link: '/zh-cn/docs/3.2.2/user_doc/architecture/metadata.html', + link: '/zh-cn/docs/dev/user_doc/architecture/metadata.html', }, { title: '架构设计', - link: '/zh-cn/docs/3.2.2/user_doc/architecture/design.html', + link: '/zh-cn/docs/dev/user_doc/architecture/design.html', }, { title: '配置文件', - link: '/zh-cn/docs/3.2.2/user_doc/architecture/configuration.html', + link: '/zh-cn/docs/dev/user_doc/architecture/configuration.html', }, { title: '任务结构', - link: '/zh-cn/docs/3.2.2/user_doc/architecture/task-structure.html', + link: '/zh-cn/docs/dev/user_doc/architecture/task-structure.html', }, { title: '负载均衡', - link: '/zh-cn/docs/3.2.2/user_doc/architecture/load-balance.html', + link: '/zh-cn/docs/dev/user_doc/architecture/load-balance.html', }, { title: '缓存', - link: '/zh-cn/docs/3.2.2/user_doc/architecture/cache.html', + link: '/zh-cn/docs/dev/user_doc/architecture/cache.html', }, ], }, @@ -1284,15 +1284,15 @@ export default { children: [ { title: 'API调用', - link: '/zh-cn/docs/3.2.2/user_doc/guide/api/open-api.html', + link: '/zh-cn/docs/dev/user_doc/guide/api/open-api.html', }, { title: 'PyDolphinScheduler', - link: '/zh-cn/docs/3.2.2/user_doc/guide/api/pydolphinscheduler.html', + link: '/zh-cn/docs/dev/user_doc/guide/api/pydolphinscheduler.html', }, { title: '健康检查', - link: '/zh-cn/docs/3.2.2/user_doc/guide/api/healthcheck.html', + link: '/zh-cn/docs/dev/user_doc/guide/api/healthcheck.html', }, ], }, @@ -1304,69 +1304,69 @@ export default { children: [ { title: '报告安全问题', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/security.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/security.html', }, { title: '如何成为 Committer', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/become-a-committer.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/become-a-committer.html', }, { title: '订阅/取消订阅邮件列表', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/subscribe.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/subscribe.html', }, { title: '参与贡献', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/contribute.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/contribute.html', }, { title: '行为准则', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/code-conduct.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/code-conduct.html', }, { title: 'Review Issue or Pull Requests', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/review.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/review.html', }, { title: 'E2E Contribution Guide', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/e2e-guide.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/e2e-guide.html', }, { title: '提交代码', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/submit-code.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/submit-code.html', }, { title: 'License须知', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/DS-License.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/DS-License.html', }, { title: '文档须知', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/document.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/document.html', }, { title: 'Issue须知', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/issue.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/issue.html', }, { title: 'Pull Request须知', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/pull-request.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/pull-request.html', }, { title: 'Commit Message须知', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/commit-message.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/commit-message.html', }, { title: '微基准测试须知', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/microbench.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/microbench.html', }, { title: '单元测试编写指南', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/join/unit-test.html', + link: '/zh-cn/docs/dev/user_doc/contribute/join/unit-test.html', }, ], }, { title: '环境搭建', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/3.2.2elopment-environment-setup.html', + link: '/zh-cn/docs/dev/user_doc/contribute/development-environment-setup.html', }, { title: '设计文档', @@ -1377,27 +1377,27 @@ export default { // children: [ { title: '架构设计', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/architecture-design.html', + link: '/zh-cn/docs/dev/user_doc/contribute/architecture-design.html', }, { title: 'Alert SPI', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/backend/spi/alert.html', + link: '/zh-cn/docs/dev/user_doc/contribute/backend/spi/alert.html', }, { title: 'Registry SPI', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/backend/spi/registry.html', + link: '/zh-cn/docs/dev/user_doc/contribute/backend/spi/registry.html', }, { title: 'Task SPI', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/backend/spi/task.html', + link: '/zh-cn/docs/dev/user_doc/contribute/backend/spi/task.html', }, { title: 'Datasource SPI', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/backend/spi/datasource.html', + link: '/zh-cn/docs/dev/user_doc/contribute/backend/spi/datasource.html', }, { title: '组件设计', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/backend/mechanism/overview.html', + link: '/zh-cn/docs/dev/user_doc/contribute/backend/mechanism/overview.html', }, ], }, @@ -1406,33 +1406,33 @@ export default { children: [ { title: '前端开发', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/frontend-3.2.2elopment.html', + link: '/zh-cn/docs/dev/user_doc/contribute/frontend-development.html', }, { title: 'API规范', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/api-standard.html', + link: '/zh-cn/docs/dev/user_doc/contribute/api-standard.html', }, { title: 'E2E 自动化测试', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/e2e-test.html', + link: '/zh-cn/docs/dev/user_doc/contribute/e2e-test.html', }, { title: 'API 自动化测试', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/api-test.html', + link: '/zh-cn/docs/dev/user_doc/contribute/api-test.html', }, { title: '日志规范', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/log-specification.html', + link: '/zh-cn/docs/dev/user_doc/contribute/log-specification.html', }, ], }, { title: '发版', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/release.html', + link: '/zh-cn/docs/dev/user_doc/contribute/release.html', }, { title: '问题与交流', - link: '/zh-cn/docs/3.2.2/user_doc/contribute/have-questions.html', + link: '/zh-cn/docs/dev/user_doc/contribute/have-questions.html', }, ], }, @@ -1441,7 +1441,7 @@ export default { children: [ { title: 'DSIP', - link: '/zh-cn/docs/3.2.2/user_doc/DSIP.html', + link: '/zh-cn/docs/dev/user_doc/DSIP.html', }, ], }, @@ -1450,11 +1450,11 @@ export default { children: [ { title: '通用设置', - link: '/zh-cn/docs/3.2.2/user_doc/guide/howto/general-setting.html', + link: '/zh-cn/docs/dev/user_doc/guide/howto/general-setting.html', }, { title: '数据源设置', - link: '/zh-cn/docs/3.2.2/user_doc/guide/howto/datasource-setting.html', + link: '/zh-cn/docs/dev/user_doc/guide/howto/datasource-setting.html', }, { title: '其他', diff --git a/docs/docs/en/contribute/release.md b/docs/docs/en/contribute/release.md index 1bd5b48d3afd..4fffce468817 100644 --- a/docs/docs/en/contribute/release.md +++ b/docs/docs/en/contribute/release.md @@ -340,7 +340,7 @@ svn --username="${A_USERNAME}" commit -m "release ${VERSION}" #### Check source package -Decompress `apache-dolphinscheduler-3.2.2-src.tar.gz` then check the following items: +Decompress `apache-dolphinscheduler--src.tar.gz` then check the following items: - Check whether source tarball is oversized for including nonessential files - `LICENSE` and `NOTICE` files exist @@ -353,7 +353,7 @@ Decompress `apache-dolphinscheduler-3.2.2-src.tar.gz` then check the following i #### Check binary packages -Decompress `apache-dolphinscheduler-3.2.2-bin.tar.gz` to check the following items: +Decompress `apache-dolphinscheduler--bin.tar.gz` to check the following items: - `LICENSE` and `NOTICE` files exist - Correct year in `NOTICE` file @@ -389,7 +389,7 @@ Announce the vote result: send the result vote e-mail to `dev@dolphinscheduler.a Title： ```txt -[VOTE] Release Apache DolphinScheduler 3.2.2 +[VOTE] Release Apache DolphinScheduler ``` Body： @@ -397,15 +397,15 @@ Body： ```txt Hello DolphinScheduler Community, -This is a call for vote to release Apache DolphinScheduler version 3.2.2 +This is a call for vote to release Apache DolphinScheduler version -Release notes: https://github.com/apache/dolphinscheduler/releases/tag/3.2.2 +Release notes: https://github.com/apache/dolphinscheduler/releases/tag/ -The release candidates: https://dist.apache.org/repos/dist/dev/dolphinscheduler/3.2.2/ +The release candidates: https://dist.apache.org/repos/dist/dev/dolphinscheduler// Maven 2 staging repository: https://repository.apache.org/content/repositories//org/apache/dolphinscheduler/ -Git tag for the release: https://github.com/apache/dolphinscheduler/tree/3.2.2 +Git tag for the release: https://github.com/apache/dolphinscheduler/tree/ Release Commit ID: https://github.com/apache/dolphinscheduler/commit/ @@ -436,13 +436,13 @@ Checklist for reference: Title： ```txt -[RESULT][VOTE] Release Apache DolphinScheduler 3.2.2 +[RESULT][VOTE] Release Apache DolphinScheduler ``` Body： ```txt -The vote to release Apache DolphinScheduler 3.2.2 has passed.Here is the vote result, +The vote to release Apache DolphinScheduler has passed.Here is the vote result, 4 PMC member +1 votes: @@ -478,19 +478,19 @@ and then find DolphinScheduler in [apache staging repositories](https://reposito ### Update Document Website should be present before you send the announce mail this section will tell you how to change the website. For example, -the release version is `3.2.2`, the following updates are required(note it will take effect immediately when the PR is merged): +the release version is ``, the following updates are required(note it will take effect immediately when the PR is merged): - Repository **apache/dolphinscheduler-website**: - - `config/download.json`: add the download of the `3.2.2` release package - - `scripts/conf.sh`: Add new release version `3.2.2` key-value pair to variable `DEV_RELEASE_DOCS_VERSIONS` + - `config/download.json`: add the download of the `` release package + - `scripts/conf.sh`: Add new release version `` key-value pair to variable `DEV_RELEASE_DOCS_VERSIONS` - Repository **apache/dolphinscheduler** (dev branch): - `docs/configs/site.js`: - - `docsLatest`: update to `3.2.2` - - `docs0`: The `text` of two places of `en-us/zh-cn` needs to be updated to `latest(3.2.2)` - - `docs/configs/index.md.jsx`: Add `3.2.2: docsxyzConfig` and add new `import` for the new `docsxyzConfig` - - `docs/docs/en/history-versions.md` and `docs/docs/zh/history-versions.md`: Add new `3.2.2` release docs. + - `docsLatest`: update to `` + - `docs0`: The `text` of two places of `en-us/zh-cn` needs to be updated to `latest()` + - `docs/configs/index.md.jsx`: Add `: docsxyzConfig` and add new `import` for the new `docsxyzConfig` + - `docs/docs/en/history-versions.md` and `docs/docs/zh/history-versions.md`: Add new `` release docs. - `.github/ISSUE_TEMPLATE/bug-report.yml`: DolphinScheduler's GitHub [bug-report](https://github.com/apache/dolphinscheduler/blob/dev/.github/ISSUE_TEMPLATE/bug-report.yml) - issue template have **Version** selection bottom. So after released we should add the new `3.2.2` to + issue template have **Version** selection bottom. So after released we should add the new `` to bug-report.yml ### Publish Docker Image and Helm Chart @@ -511,7 +511,7 @@ Announcement e-mail template as below： Title： ```txt -[ANNOUNCE] Release Apache DolphinScheduler 3.2.2 +[ANNOUNCE] Release Apache DolphinScheduler ``` Body： @@ -519,7 +519,7 @@ Body： ```txt Hi all, -We are glad to announce the release of Apache DolphinScheduler 3.2.2. Once again I would like to express my thanks to your help. +We are glad to announce the release of Apache DolphinScheduler . Once again I would like to express my thanks to your help. Dolphin Scheduler is a distributed and easy-to-extend visual workflow scheduler system, dedicated to solving the complex task dependencies in data processing, making the scheduler system out of the box for data processing. @@ -527,14 +527,14 @@ dedicated to solving the complex task dependencies in data processing, making th Download Links: https://dolphinscheduler.apache.org/en-us/download -Release Notes: https://github.com/apache/dolphinscheduler/releases/tag/3.2.2 +Release Notes: https://github.com/apache/dolphinscheduler/releases/tag/ Website: https://dolphinscheduler.apache.org/ DolphinScheduler Resources: - Issue: https://github.com/apache/dolphinscheduler/issues/ - Mailing list: dev@dolphinscheduler.apache.org -- Documents: https://dolphinscheduler.apache.org/en-us/docs/3.2.2/about/introduction +- Documents: https://dolphinscheduler.apache.org/en-us/docs//about/introduction ``` ## News diff --git a/docs/docs/en/guide/expansion-reduction.md b/docs/docs/en/guide/expansion-reduction.md index 45303dd704f7..5c9dd7d1d202 100644 --- a/docs/docs/en/guide/expansion-reduction.md +++ b/docs/docs/en/guide/expansion-reduction.md @@ -30,9 +30,9 @@ Attention: DolphinScheduler itself does not depend on Hadoop, Hive, Spark, but w mkdir -p /opt cd /opt # decompress -tar -zxvf apache-dolphinscheduler-3.2.2-bin.tar.gz -C /opt +tar -zxvf apache-dolphinscheduler--bin.tar.gz -C /opt cd /opt -mv apache-dolphinscheduler-3.2.2-bin dolphinscheduler +mv apache-dolphinscheduler--bin dolphinscheduler ``` ```markdown diff --git a/docs/docs/en/guide/installation/kubernetes.md b/docs/docs/en/guide/installation/kubernetes.md index dd1ad7723881..a6587a585511 100644 --- a/docs/docs/en/guide/installation/kubernetes.md +++ b/docs/docs/en/guide/installation/kubernetes.md @@ -233,9 +233,9 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n test # with test names 2. Create a new `Dockerfile` to add MySQL driver: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.2.2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-: # For example -# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.2.2 +# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools: # Attention Please, If the build is dolphinscheduler-tools image # You need to change the following line to: COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/tools/libs @@ -284,9 +284,9 @@ externalDatabase: 2. Create a new `Dockerfile` to add MySQL or Oracle driver: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.2.2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-: # For example -# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.2 +# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker: # If you want to support MySQL Datasource COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/libs @@ -316,7 +316,7 @@ docker build -t apache/dolphinscheduler-:new-driver . 1. Create a new `Dockerfile` to install pip: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker: COPY requirements.txt /tmp RUN apt-get update && \ apt-get install -y --no-install-recommends python-pip && \ @@ -351,7 +351,7 @@ docker build -t apache/dolphinscheduler-worker:pip . 1. Create a new `Dockerfile` to install Python 3: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker: RUN apt-get update && \ apt-get install -y --no-install-recommends python3 && \ rm -rf /var/lib/apt/lists/* diff --git a/docs/docs/en/guide/installation/standalone.md b/docs/docs/en/guide/installation/standalone.md index e4b0fb86cd51..bd2d73f1ce94 100644 --- a/docs/docs/en/guide/installation/standalone.md +++ b/docs/docs/en/guide/installation/standalone.md @@ -12,7 +12,7 @@ If you want to deploy DolphinScheduler in production, we recommend you follow [c ## Preparation - JDK：download [JDK][jdk] (1.8+), install and configure environment variable `JAVA_HOME` and append `bin` dir (included in `JAVA_HOME`) to `PATH` variable. You can skip this step if it already exists in your environment. -- Binary package: download the DolphinScheduler binary package at [download page](https://dolphinscheduler.apache.org/en-us/download/3.2.2). +- Binary package: download the DolphinScheduler binary package at [download page](https://dolphinscheduler.apache.org/en-us/download/). ## Start DolphinScheduler Standalone Server diff --git a/docs/docs/en/guide/start/docker.md b/docs/docs/en/guide/start/docker.md index 9470e304e68e..f29bcd5c75fe 100644 --- a/docs/docs/en/guide/start/docker.md +++ b/docs/docs/en/guide/start/docker.md @@ -19,7 +19,7 @@ Start DolphinScheduler with standalone-server Docker images is the easiest way t you can learn DolphinScheduler's concepts and usage, with minimal cost. ```shell -$ DOLPHINSCHEDULER_VERSION=3.2.2 +$ DOLPHINSCHEDULER_VERSION= $ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}" ``` @@ -37,11 +37,11 @@ be stored on disks after you change docker-compose configuration, and it is robu DolphinScheduler in a long term. You have to install [docker-compose](https://docs.docker.com/compose/install/) before you start servers. -After complete the installation, get the `docker-compose.yaml` file from [download page](https://dolphinscheduler.apache.org/en-us/download/3.2.2) +After complete the installation, get the `docker-compose.yaml` file from [download page](https://dolphinscheduler.apache.org/en-us/download/) form its source package, and make sure you get the right version. After download the package, you can run the commands as below. ```shell -$ DOLPHINSCHEDULER_VERSION=3.2.2 +$ DOLPHINSCHEDULER_VERSION= $ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz # Going to docker-compose's location # For Mac or Linux users @@ -68,7 +68,7 @@ $ docker-compose --profile all up -d container when it up. You could start DolphinScheduler server separately if you want to reuse your exists services. ```shell -$ DOLPHINSCHEDULER_VERSION=3.2.2 +$ DOLPHINSCHEDULER_VERSION= # Initialize the database, make sure database already exists $ docker run -d --name dolphinscheduler-tools \ -e DATABASE="postgresql" \ @@ -134,5 +134,5 @@ and use `admin` and `dolphinscheduler123` as default username and password in th You can modify some environment variables to change configurations when you are starting servers through Docker. We have an example in [using exists PostgreSQL ZooKeeper](#using-exists-postgresql-zookeeper) to change database and ZooKeeper configurations, -and you could find all environment variables in [all environment variables](https://github.com/apache/dolphinscheduler/blob/3.2.2/script/env/dolphinscheduler_env.sh) +and you could find all environment variables in [all environment variables](https://github.com/apache/dolphinscheduler/blob//script/env/dolphinscheduler_env.sh) and change them if you want. diff --git a/docs/docs/en/history-versions.md b/docs/docs/en/history-versions.md index e0eceab968c2..71035b53a1aa 100644 --- a/docs/docs/en/history-versions.md +++ b/docs/docs/en/history-versions.md @@ -4,10 +4,6 @@ #### Setup instructions, are available for each stable version of Apache DolphinScheduler below: -### Versions: 3.2.2 - -#### Links： [3.2.2 Document](../3.2.2/user_doc/about/introduction.md) - ### Versions: 3.2.1 #### Links： [3.2.1 Document](../3.2.1/user_doc/about/introduction.md) diff --git a/docs/docs/zh/contribute/release.md b/docs/docs/zh/contribute/release.md index c68bf4ced27f..5f4f4bdf7cae 100644 --- a/docs/docs/zh/contribute/release.md +++ b/docs/docs/zh/contribute/release.md @@ -347,7 +347,7 @@ svn --username="${A_USERNAME}" commit -m "release ${VERSION}" #### 检查源码包的文件内容 -解压缩`apache-dolphinscheduler-3.2.2-src.tar.gz`，进行如下检查: +解压缩`apache-dolphinscheduler--src.tar.gz`，进行如下检查: - 检查源码包是否包含由于包含不必要文件，致使 tarball 过于庞大 - 存在`LICENSE`和`NOTICE`文件 @@ -359,7 +359,7 @@ svn --username="${A_USERNAME}" commit -m "release ${VERSION}" #### 检查二进制包的文件内容 -解压缩`apache-dolphinscheduler-3.2.2-bin.tar.gz`进行如下检查: +解压缩`apache-dolphinscheduler--bin.tar.gz`进行如下检查: - 存在`LICENSE`和`NOTICE`文件 - 所有文本文件开头都有 ASF 许可证 @@ -394,7 +394,7 @@ DolphinScheduler 社区投票，发起投票邮件到`dev@dolphinscheduler.apach 标题： ```txt -[VOTE] Release Apache DolphinScheduler 3.2.2 +[VOTE] Release Apache DolphinScheduler ``` 正文： @@ -402,15 +402,15 @@ DolphinScheduler 社区投票，发起投票邮件到`dev@dolphinscheduler.apach ```txt Hello DolphinScheduler Community, -This is a call for vote to release Apache DolphinScheduler version 3.2.2 +This is a call for vote to release Apache DolphinScheduler version -Release notes: https://github.com/apache/dolphinscheduler/releases/tag/3.2.2 +Release notes: https://github.com/apache/dolphinscheduler/releases/tag/ -The release candidates: https://dist.apache.org/repos/dist/dev/dolphinscheduler/3.2.2/ +The release candidates: https://dist.apache.org/repos/dist/dev/dolphinscheduler// Maven 2 staging repository: https://repository.apache.org/content/repositories//org/apache/dolphinscheduler/ -Git tag for the release: https://github.com/apache/dolphinscheduler/tree/3.2.2 +Git tag for the release: https://github.com/apache/dolphinscheduler/tree/ Release Commit ID: https://github.com/apache/dolphinscheduler/commit/ @@ -441,11 +441,11 @@ Checklist for reference: Title： ```txt -[RESULT][VOTE] Release Apache DolphinScheduler 3.2.2 +[RESULT][VOTE] Release Apache DolphinScheduler ``` ```txt -The vote to release Apache DolphinScheduler 3.2.2 has passed.Here is the vote result, +The vote to release Apache DolphinScheduler has passed.Here is the vote result, 4 PMC member +1 votes: @@ -480,17 +480,17 @@ git push --delete "${GH_REMOTE}" "${VERSION}-prepare" ### 更新文档 -官网应该在您发送通知邮件之前完成更新，本节将告诉您如何更改网站。假设发版的版本是 `3.2.2`，需要进行以下更新（注意，当修改 pull requests 被 merge 后就会生效）: +官网应该在您发送通知邮件之前完成更新，本节将告诉您如何更改网站。假设发版的版本是 ``，需要进行以下更新（注意，当修改 pull requests 被 merge 后就会生效）: - **apache/dolphinscheduler-website** 仓库： - - `config/download.json`: 增加 `3.2.2` 版本发布包的下载 - - `scripts/conf.sh`: 在变量 `DEV_RELEASE_DOCS_VERSIONS` 中增加版本为 `3.2.2` 的新键值对 + - `config/download.json`: 增加 `` 版本发布包的下载 + - `scripts/conf.sh`: 在变量 `DEV_RELEASE_DOCS_VERSIONS` 中增加版本为 `` 的新键值对 - **apache/dolphinscheduler** 仓库 (dev 分支)： - `docs/configs/site.js`: - - `docsLatest`: 更新为 `3.2.2` - - `docs0`: 两处 `en-us/zh-cn` 的 `text` 更新为 `latest(3.2.2)` - - `docs/configs/index.md.jsx`: 增加 `'3.2.2': docsxyzConfig,` 以及新的 `import` - - `docs/docs/en/history-versions.md` 和 `docs/docs/zh/history-versions.md`: 增加新的发版版本 `3.2.2` 的链接 + - `docsLatest`: 更新为 `` + - `docs0`: 两处 `en-us/zh-cn` 的 `text` 更新为 `latest()` + - `docs/configs/index.md.jsx`: 增加 `'': docsxyzConfig,` 以及新的 `import` + - `docs/docs/en/history-versions.md` 和 `docs/docs/zh/history-versions.md`: 增加新的发版版本 `` 的链接 - `.github/ISSUE_TEMPLATE/bug-report.yml`: DolphinScheduler 在 GitHub bug report 的 issue 中有版本选择，当有新的版本发版后，需要更新 [bug-report](https://github.com/apache/dolphinscheduler/blob/dev/.github/ISSUE_TEMPLATE/bug-report.yml) 中的 **Version** 部分。 @@ -510,7 +510,7 @@ git push --delete "${GH_REMOTE}" "${VERSION}-prepare" 标题： ```txt -[ANNOUNCE] Release Apache DolphinScheduler 3.2.2 +[ANNOUNCE] Release Apache DolphinScheduler ``` 正文： @@ -518,7 +518,7 @@ git push --delete "${GH_REMOTE}" "${VERSION}-prepare" ```txt Hi all, -We are glad to announce the release of Apache DolphinScheduler 3.2.2. Once again I would like to express my thanks to your help. +We are glad to announce the release of Apache DolphinScheduler . Once again I would like to express my thanks to your help. Dolphin Scheduler is a distributed and easy-to-extend visual workflow scheduler system, dedicated to solving the complex task dependencies in data processing, making the scheduler system out of the box for data processing. @@ -526,14 +526,14 @@ dedicated to solving the complex task dependencies in data processing, making th Download Links: https://dolphinscheduler.apache.org/zh-cn/download -Release Notes: https://github.com/apache/dolphinscheduler/releases/tag/3.2.2 +Release Notes: https://github.com/apache/dolphinscheduler/releases/tag/ Website: https://dolphinscheduler.apache.org/ DolphinScheduler Resources: - Issue: https://github.com/apache/dolphinscheduler/issues/ - Mailing list: dev@dolphinscheduler.apache.org -- Documents: https://dolphinscheduler.apache.org/zh-cn/docs/3.2.2/about/introduction +- Documents: https://dolphinscheduler.apache.org/zh-cn/docs//about/introduction ``` ## News diff --git a/docs/docs/zh/guide/expansion-reduction.md b/docs/docs/zh/guide/expansion-reduction.md index 36d04bed9f27..ad27e32a35c4 100644 --- a/docs/docs/zh/guide/expansion-reduction.md +++ b/docs/docs/zh/guide/expansion-reduction.md @@ -30,9 +30,9 @@ mkdir -p /opt cd /opt # 解压缩 -tar -zxvf apache-dolphinscheduler-3.2.2-bin.tar.gz -C /opt +tar -zxvf apache-dolphinscheduler--bin.tar.gz -C /opt cd /opt -mv apache-dolphinscheduler-3.2.2-bin dolphinscheduler +mv apache-dolphinscheduler--bin dolphinscheduler ``` ```markdown diff --git a/docs/docs/zh/guide/installation/kubernetes.md b/docs/docs/zh/guide/installation/kubernetes.md index 4846d4b3e377..f4b95de27bb0 100644 --- a/docs/docs/zh/guide/installation/kubernetes.md +++ b/docs/docs/zh/guide/installation/kubernetes.md @@ -232,9 +232,9 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n test # with test names 2. 创建一个新的 `Dockerfile`，用于添加 MySQL 的驱动包: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.2.2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-: # 例如 -# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.2.2 +# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools: # 注意，如果构建的是dolphinscheduler-tools镜像 # 需要将下面一行修改为COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/tools/libs @@ -283,9 +283,9 @@ externalDatabase: 2. 创建一个新的 `Dockerfile`，用于添加 MySQL 或者 Oracle 驱动包: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.2.2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-: # 例如 -# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.2 +# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker: # 如果你想支持 MySQL 数据源 COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/libs @@ -315,7 +315,7 @@ docker build -t apache/dolphinscheduler-:new-driver . 1. 创建一个新的 `Dockerfile`，用于安装 pip: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker: COPY requirements.txt /tmp RUN apt-get update && \ apt-get install -y --no-install-recommends python-pip && \ @@ -350,7 +350,7 @@ docker build -t apache/dolphinscheduler-worker:pip . 1. 创建一个新的 `Dockerfile`，用于安装 Python 3: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker: RUN apt-get update && \ apt-get install -y --no-install-recommends python3 && \ rm -rf /var/lib/apt/lists/* diff --git a/docs/docs/zh/guide/installation/standalone.md b/docs/docs/zh/guide/installation/standalone.md index 34cbe8d6b7f5..dbd9ca94b68e 100644 --- a/docs/docs/zh/guide/installation/standalone.md +++ b/docs/docs/zh/guide/installation/standalone.md @@ -10,7 +10,7 @@ Standalone 仅适用于 DolphinScheduler 的快速体验. ## 前置准备工作 - JDK：下载[JDK][jdk] (1.8+)，安装并配置 `JAVA_HOME` 环境变量，并将其下的 `bin` 目录追加到 `PATH` 环境变量中。如果你的环境中已存在，可以跳过这步。 -- 二进制包：在[下载页面](https://dolphinscheduler.apache.org/en-us/download/3.2.2)下载 DolphinScheduler 二进制包 +- 二进制包：在[下载页面](https://dolphinscheduler.apache.org/en-us/download/)下载 DolphinScheduler 二进制包 ## 启动 DolphinScheduler Standalone Server diff --git a/docs/docs/zh/guide/start/docker.md b/docs/docs/zh/guide/start/docker.md index 3ab1d23cb842..2a3a577a7330 100644 --- a/docs/docs/zh/guide/start/docker.md +++ b/docs/docs/zh/guide/start/docker.md @@ -18,7 +18,7 @@ 你可以最快速的体验到 DolphinScheduler 的大部分功能，了解主要和概念和内容。 ```shell -$ DOLPHINSCHEDULER_VERSION=3.2.2 +$ DOLPHINSCHEDULER_VERSION= $ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}" ``` @@ -33,11 +33,11 @@ $ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:2 服务重启的时候保留元数据（如需要挂载到本地路径需要做指定）。他更健壮，能保证用户体验更加完整的 DolphinScheduler 服务。这种方式需要先安装 [docker-compose](https://docs.docker.com/compose/install/)，链接适用于 Mac，Linux，Windows。 -确保 docker-compose 顺利安装后，需要获取 `docker-compose.yaml` 文件，通过[下载页面](https://dolphinscheduler.apache.org/en-us/download/3.2.2) +确保 docker-compose 顺利安装后，需要获取 `docker-compose.yaml` 文件，通过[下载页面](https://dolphinscheduler.apache.org/en-us/download/) 下载对应版本源码包可能是最快的方法，当下载完源码后就可以运行命令进行部署了。 ```shell -$ DOLPHINSCHEDULER_VERSION=3.2.2 +$ DOLPHINSCHEDULER_VERSION= $ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz # Mac Linux 用户 $ cd apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src/deploy/docker @@ -61,7 +61,7 @@ $ docker-compose --profile all up -d ZooKeeper 且不想启动新的服务，可以使用这个方式分别启动 DolphinScheduler 容器。 ```shell -$ DOLPHINSCHEDULER_VERSION=3.2.2 +$ DOLPHINSCHEDULER_VERSION= # 初始化数据库，其确保数据库 已经存在 $ docker run -d --name dolphinscheduler-tools \ -e DATABASE="postgresql" \ diff --git a/docs/docs/zh/history-versions.md b/docs/docs/zh/history-versions.md index 3bbb36a4d454..332a0bb58c4e 100644 --- a/docs/docs/zh/history-versions.md +++ b/docs/docs/zh/history-versions.md @@ -4,10 +4,6 @@ #### 以下是Apache DolphinScheduler每个稳定版本的设置说明。 -### Versions: 3.2.2 - -#### Links： [3.2.2 Document](../3.2.2/user_doc/about/introduction.md) - ### Versions: 3.2.1 #### Links： [3.2.1 Document](../3.2.1/user_doc/about/introduction.md) diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-aliyunVoice/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-aliyunVoice/pom.xml index 9efe69884001..e7dd834a5f88 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-aliyunVoice/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-aliyunVoice/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-aliyunVoice diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-all/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-all/pom.xml index 298db3344177..136ebffb5360 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-all/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-all/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-all diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/pom.xml index c5bda37ab6d1..4ce63942bdbc 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/pom.xml @@ -23,7 +23,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-api 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 7b8d52d8bf5c..db64f7e4f2eb 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-dingtalk jar 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 2452e5ded45d..e088d334580b 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-email jar 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 14d0099c09af..98ab229d1a01 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-feishu jar 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 9be3feca5943..3ce4dfd18604 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-http jar 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 4d16268a3b47..b356e7870395 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-pagerduty jar diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-prometheus/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-prometheus/pom.xml index 467b8d80380f..8182b2fa4988 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-prometheus/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-prometheus/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-prometheus jar 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 655d8a0e0e3c..9a783cb2d575 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-script jar 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 d49220049787..39594d351d67 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-slack jar 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 1e275a453671..cd96676e68d7 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-telegram jar 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 0a7de23ebeaf..99bc262c7033 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-webexteams jar 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 35444883dae1..733ac16cf0c7 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-wechat jar diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml index 43e21ca58dd1..96f92922ce54 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-plugins pom diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml index 808f7123c7ea..844a5983df8f 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-alert - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert-server jar @@ -43,6 +43,11 @@ dolphinscheduler-dao + + org.apache.dolphinscheduler + dolphinscheduler-registry-all + + org.apache.dolphinscheduler dolphinscheduler-extract-alert @@ -115,30 +120,6 @@ - - task-pure - - false - - - - org.apache.dolphinscheduler - dolphinscheduler-registry-pure - - - - - task-all - - true - - - - org.apache.dolphinscheduler - dolphinscheduler-registry-all - - - diff --git a/dolphinscheduler-alert/pom.xml b/dolphinscheduler-alert/pom.xml index 3e88f7cec781..4021d0b6b546 100644 --- a/dolphinscheduler-alert/pom.xml +++ b/dolphinscheduler-alert/pom.xml @@ -23,7 +23,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-alert pom diff --git a/dolphinscheduler-aop/pom.xml b/dolphinscheduler-aop/pom.xml index e113f662b232..25858423ff28 100644 --- a/dolphinscheduler-aop/pom.xml +++ b/dolphinscheduler-aop/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-aop jar diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index 0bcd4499d889..40d556a17ed3 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-api jar @@ -66,14 +66,33 @@ dolphinscheduler-data-quality + + org.apache.dolphinscheduler + dolphinscheduler-datasource-all + ${project.version} + + + + org.apache.dolphinscheduler + dolphinscheduler-task-all + + org.apache.dolphinscheduler dolphinscheduler-ui + + org.apache.dolphinscheduler + dolphinscheduler-registry-all + org.apache.dolphinscheduler dolphinscheduler-scheduler-all + + org.apache.dolphinscheduler + dolphinscheduler-storage-all + org.apache.dolphinscheduler @@ -214,10 +233,6 @@ com.azure.resourcemanager azure-resourcemanager-datafactory - - com.azure - azure-identity - org.apache.dolphinscheduler dolphinscheduler-extract-alert @@ -280,53 +295,5 @@ - - task-pure - - false - - - - org.apache.dolphinscheduler - dolphinscheduler-task-pure - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-pure - - - org.apache.dolphinscheduler - dolphinscheduler-registry-pure - - - org.apache.dolphinscheduler - dolphinscheduler-storage-pure - - - - - task-all - - true - - - - org.apache.dolphinscheduler - dolphinscheduler-task-all - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-all - - - org.apache.dolphinscheduler - dolphinscheduler-registry-all - - - org.apache.dolphinscheduler - dolphinscheduler-storage-all - - - diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml index d81a814b4f86..10c4f0e4a10a 100644 --- a/dolphinscheduler-bom/pom.xml +++ b/dolphinscheduler-bom/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-bom pom diff --git a/dolphinscheduler-common/pom.xml b/dolphinscheduler-common/pom.xml index e8f98335f10b..eda9a72e307f 100644 --- a/dolphinscheduler-common/pom.xml +++ b/dolphinscheduler-common/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-common diff --git a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-api/pom.xml b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-api/pom.xml index b112bfc5167b..d8fad0b6a001 100644 --- a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-api/pom.xml +++ b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-api/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-dao-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-dao-api diff --git a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-h2/pom.xml b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-h2/pom.xml index ff9d88c4222d..1adebd317455 100644 --- a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-h2/pom.xml +++ b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-h2/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-dao-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-dao-h2 diff --git a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-mysql/pom.xml b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-mysql/pom.xml index ed2bb4370370..a05537909ef5 100644 --- a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-mysql/pom.xml +++ b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-mysql/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-dao-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-dao-mysql diff --git a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-plugin-all/pom.xml b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-plugin-all/pom.xml index b9489fb910f0..429336ec4e44 100644 --- a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-plugin-all/pom.xml +++ b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-plugin-all/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-dao-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-dao-plugin-all diff --git a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-postgresql/pom.xml b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-postgresql/pom.xml index e40d608c926a..51489f5f7535 100644 --- a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-postgresql/pom.xml +++ b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-postgresql/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-dao-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-dao-postgresql diff --git a/dolphinscheduler-dao-plugin/pom.xml b/dolphinscheduler-dao-plugin/pom.xml index 767d3eb74fce..ad7227226106 100644 --- a/dolphinscheduler-dao-plugin/pom.xml +++ b/dolphinscheduler-dao-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-dao-plugin diff --git a/dolphinscheduler-dao/pom.xml b/dolphinscheduler-dao/pom.xml index d37762e70b61..f46817c0cc0c 100644 --- a/dolphinscheduler-dao/pom.xml +++ b/dolphinscheduler-dao/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-dao ${project.artifactId} diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql index 4e035295e65b..42c893bb0532 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql +++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql @@ -1070,7 +1070,7 @@ CREATE TABLE t_ds_version -- Records of t_ds_version -- ---------------------------- INSERT INTO t_ds_version -VALUES ('1', '3.2.2'); +VALUES ('1', '3.3.0'); -- ---------------------------- diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql index 278b90949b4d..b30bc13887b8 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql +++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql @@ -1044,7 +1044,7 @@ CREATE TABLE `t_ds_version` ( -- ---------------------------- -- Records of t_ds_version -- ---------------------------- -INSERT IGNORE INTO `t_ds_version` VALUES ('1', '3.2.2'); +INSERT IGNORE INTO `t_ds_version` VALUES ('1', '3.3.0'); -- ---------------------------- diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql index 3f3012ed6637..2d224092c44f 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql +++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql @@ -1063,7 +1063,7 @@ INSERT INTO t_ds_queue(queue_name, queue, create_time, update_time) VALUES ('default', 'default', '2018-11-29 10:22:33', '2018-11-29 10:22:33'); -- Records of t_ds_queue,default queue name : default -INSERT INTO t_ds_version(version) VALUES ('3.2.2'); +INSERT INTO t_ds_version(version) VALUES ('3.3.0'); -- -- Table structure for table t_ds_plugin_define diff --git a/dolphinscheduler-dao/src/main/resources/sql/soft_version b/dolphinscheduler-dao/src/main/resources/sql/soft_version index be94e6f53db6..15a279981720 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/soft_version +++ b/dolphinscheduler-dao/src/main/resources/sql/soft_version @@ -1 +1 @@ -3.2.2 +3.3.0 diff --git a/dolphinscheduler-data-quality/pom.xml b/dolphinscheduler-data-quality/pom.xml index 50b804b64d81..0643fdac5af4 100644 --- a/dolphinscheduler-data-quality/pom.xml +++ b/dolphinscheduler-data-quality/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-data-quality diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml index c5176853edb3..effe3c9abb05 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-all diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml index 32cc377bfb66..a80509f46ee8 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-api diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml index 26c34c670d54..932cc2af293b 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-athena diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/pom.xml index 6e92a04a9c2e..9e36f2ea0783 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-azure-sql diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml index 760852720884..f1c3e5885db4 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-clickhouse diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/pom.xml index 99b8c3ac5be3..f965b1df8f70 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-dameng diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/pom.xml index c6ab8be1bed6..91478998b073 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-databend diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml index c951c4c1c6b5..c596351918dd 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-db2 diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/pom.xml index 2e9a92618d11..a0d31b23e8e7 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-doris diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/pom.xml index 2dea8bfe2180..e35249d9623b 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-hana diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml index ca443afa898e..bcc11a66181b 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-hive diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/pom.xml index 8a5fb52bf1a9..2d51b85fed62 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-k8s diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/pom.xml index 7ad819ddf076..86381d7aadfe 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-kyuubi diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml index a9d8d00cbda0..8c996cb2dfe3 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-mysql diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/pom.xml index cc1a34803347..37e228c9e688 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-oceanbase diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml index e5d28c7373f7..ac8ac1ae6acb 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-oracle diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml index 6dc0745ffb46..d7e379c81a9e 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-postgresql diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml index 6d638e256be2..a0942ea86b04 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-presto diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-pure/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-pure/pom.xml deleted file mode 100644 index 0963017e7236..000000000000 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-pure/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - 4.0.0 - - org.apache.dolphinscheduler - dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT - - - dolphinscheduler-datasource-pure - - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-hive - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-mysql - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-postgresql - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-spark - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-ssh - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-doris - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-k8s - ${project.version} - - - diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml index 8ef7ddc0d632..850aef34d1c9 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-redshift diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/pom.xml index 2313538c6d16..870abed97ad4 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-sagemaker diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/pom.xml index 8604e057f031..26cb50c88415 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-snowflake diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml index 02e65eabcdbc..2f954cb77c51 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-spark diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml index 992ad733fe9b..6e0d48cbf805 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-sqlserver diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/pom.xml index ff86ae089927..6645ee8a9057 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-ssh diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/pom.xml index c070a86caad4..7f1410c99b32 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-starrocks diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/pom.xml index 4848ba8c0407..45cc19d3f57e 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-trino diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/pom.xml index d5b8c55209cb..47f04db5884d 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-vertica diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/pom.xml index 67f1e9259a1e..90c7f1ece5aa 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-zeppelin diff --git a/dolphinscheduler-datasource-plugin/pom.xml b/dolphinscheduler-datasource-plugin/pom.xml index 64b9f323d971..c30a6b42586b 100644 --- a/dolphinscheduler-datasource-plugin/pom.xml +++ b/dolphinscheduler-datasource-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-datasource-plugin pom @@ -56,7 +56,6 @@ dolphinscheduler-datasource-sagemaker dolphinscheduler-datasource-k8s dolphinscheduler-datasource-hana - dolphinscheduler-datasource-pure diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml index 777b86cf91c8..ee4c85589ed3 100644 --- a/dolphinscheduler-dist/pom.xml +++ b/dolphinscheduler-dist/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-dist diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index 6c68096dcd51..84832b2b3238 100644 --- a/dolphinscheduler-dist/release-docs/LICENSE +++ b/dolphinscheduler-dist/release-docs/LICENSE @@ -313,8 +313,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt. jetty-xml 9.4.48.v20220622: https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-xml/9.4.48.v20220622, Apache 2.0 and EPL 1.0 jna 5.10.0: https://mvnrepository.com/artifact/net.java.dev.jna/jna/5.10.0, Apache 2.0 and LGPL 2.1 jna-platform 5.10.0: https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform/5.10.0, Apache 2.0 and LGPL 2.1 - jna 5.5.0: https://mvnrepository.com/artifact/net.java.dev.jna/jna/5.5.0, Apache 2.0 and LGPL 2.1 - jna-platform 5.6.0: https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform/5.6.0, Apache 2.0 and LGPL 2.1 joda-time 2.10.13: https://github.com/JodaOrg/joda-time, Apache 2.0 jose4j 0.7.8: https://mvnrepository.com/artifact/org.bitbucket.b_c/jose4j, Apache 2.0 jpam 1.1: https://mvnrepository.com/artifact/net.sf.jpam/jpam/1.1, Apache 2.0 @@ -511,7 +509,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt. third-party-jackson-core 2.17.282: https://mvnrepository.com/artifact/software.amazon.awssdk/third-party-jackson-core/2.17.282, Apache 2.0 utils 2.17.282: https://mvnrepository.com/artifact/software.amazon.awssdk/utils/2.17.282, Apache 2.0 zt-zip 1.15: https://github.com/zeroturnaround/zt-zip/blob/master/LICENSE, Apache 2.0 - content-type 2.2: https://mvnrepository.com/artifact/com.nimbusds/content-type/2.2, Apache 2.0 jackson-dataformat-xml 2.13.3: https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.13.3, Apache 2.0 lang-tag 1.6: https://mvnrepository.com/artifact/com.nimbusds/lang-tag/1.6, Apache 2.0 diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-alert/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-alert/pom.xml index 0953385220d9..1ba94d750d6f 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-alert/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-alert/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler-extract - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-extract-alert diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-base/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-base/pom.xml index c6df62614d72..9501d55706d9 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-base/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-base/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler-extract - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-extract-base diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-common/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-common/pom.xml index d8900e4cb29b..d7d339ff9fc6 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-common/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-common/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler-extract - 3.2.3-SNAPSHOT + dev-SNAPSHOT org.apache.dolphinscheduler diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml index 7c553c15c31c..955bcd0a1217 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler-extract - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-extract-master diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml index de98b55be6cc..0a42b73a1da7 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler-extract - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-extract-worker diff --git a/dolphinscheduler-extract/pom.xml b/dolphinscheduler-extract/pom.xml index 551491cd8037..09be31ebcce4 100644 --- a/dolphinscheduler-extract/pom.xml +++ b/dolphinscheduler-extract/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-extract diff --git a/dolphinscheduler-master/pom.xml b/dolphinscheduler-master/pom.xml index 65191b35578c..1b99dd97f3e9 100644 --- a/dolphinscheduler-master/pom.xml +++ b/dolphinscheduler-master/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-master @@ -55,11 +55,25 @@ dolphinscheduler-service + + org.apache.dolphinscheduler + dolphinscheduler-registry-all + org.apache.dolphinscheduler dolphinscheduler-scheduler-all + + org.apache.dolphinscheduler + dolphinscheduler-task-all + + + + org.apache.dolphinscheduler + dolphinscheduler-storage-all + + org.apache.dolphinscheduler dolphinscheduler-extract-master @@ -325,51 +339,5 @@ - - task-pure - - false - - - - org.apache.dolphinscheduler - dolphinscheduler-task-pure - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-all - - - - - org.apache.dolphinscheduler - dolphinscheduler-registry-pure - - - org.apache.dolphinscheduler - dolphinscheduler-storage-pure - - - - - task-all - - true - - - - org.apache.dolphinscheduler - dolphinscheduler-task-all - - - org.apache.dolphinscheduler - dolphinscheduler-registry-all - - - org.apache.dolphinscheduler - dolphinscheduler-storage-all - - - diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/metrics/TaskMetrics.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/metrics/TaskMetrics.java index ed56c3450114..9b901d7b6055 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/metrics/TaskMetrics.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/metrics/TaskMetrics.java @@ -24,7 +24,7 @@ import lombok.experimental.UtilityClass; -import com.google.common.collect.ImmutableSet; +import com.facebook.presto.jdbc.internal.guava.collect.ImmutableSet; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Gauge; diff --git a/dolphinscheduler-meter/pom.xml b/dolphinscheduler-meter/pom.xml index abf8dd644e4b..af3771972113 100644 --- a/dolphinscheduler-meter/pom.xml +++ b/dolphinscheduler-meter/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-meter @@ -45,7 +45,7 @@ org.apache.dolphinscheduler dolphinscheduler-common - 3.2.3-SNAPSHOT + dev-SNAPSHOT diff --git a/dolphinscheduler-microbench/pom.xml b/dolphinscheduler-microbench/pom.xml index 719611cd8b37..ae5e62f61041 100644 --- a/dolphinscheduler-microbench/pom.xml +++ b/dolphinscheduler-microbench/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-microbench diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml index f55a23f57417..ee0a30a03a8d 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-registry - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-registry-all diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml index 38668b7b15eb..5e51f68b491a 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml @@ -23,7 +23,7 @@ org.apache.dolphinscheduler dolphinscheduler-registry - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-registry-api diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml index 664203b1ca43..0f5c4d1494ff 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-registry-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-registry-etcd diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml index 32c68b9161b4..7f4b97d3efe5 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-it/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-registry-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-registry-it diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml index 48e2a0611bad..aa592b9da450 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml @@ -23,7 +23,7 @@ org.apache.dolphinscheduler dolphinscheduler-registry-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-registry-jdbc diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml index 4d80a664fdc0..1d93ae87f1fc 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-registry-plugins - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-registry-zookeeper diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml index fcecef0ad922..aa184104d63d 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.dolphinscheduler dolphinscheduler-registry - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-registry-plugins pom diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-pure/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-pure/pom.xml deleted file mode 100644 index 5f147418a6b3..000000000000 --- a/dolphinscheduler-registry/dolphinscheduler-registry-pure/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - org.apache.dolphinscheduler - dolphinscheduler-registry - 3.2.3-SNAPSHOT - - - dolphinscheduler-registry-pure - - - - org.apache.dolphinscheduler - dolphinscheduler-registry-zookeeper - ${project.version} - - - diff --git a/dolphinscheduler-registry/pom.xml b/dolphinscheduler-registry/pom.xml index fd8e3d842cd1..7a273dc1a8c2 100644 --- a/dolphinscheduler-registry/pom.xml +++ b/dolphinscheduler-registry/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-registry pom @@ -30,7 +30,6 @@ dolphinscheduler-registry-api dolphinscheduler-registry-plugins dolphinscheduler-registry-all - dolphinscheduler-registry-pure diff --git a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-all/pom.xml b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-all/pom.xml index 436868f94c57..2de4e05d840a 100644 --- a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-all/pom.xml +++ b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-all/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-scheduler-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-scheduler-all diff --git a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml index d74a485de94b..88a6aef9491b 100644 --- a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml +++ b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-scheduler-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-scheduler-api diff --git a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml index c25dcd33219c..27e5795f5f64 100644 --- a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml +++ b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-scheduler-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-scheduler-quartz diff --git a/dolphinscheduler-scheduler-plugin/pom.xml b/dolphinscheduler-scheduler-plugin/pom.xml index 8651626ccc3f..6bd91494d862 100644 --- a/dolphinscheduler-scheduler-plugin/pom.xml +++ b/dolphinscheduler-scheduler-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-scheduler-plugin diff --git a/dolphinscheduler-service/pom.xml b/dolphinscheduler-service/pom.xml index 5284c34defd0..0bca706c3b11 100644 --- a/dolphinscheduler-service/pom.xml +++ b/dolphinscheduler-service/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-service diff --git a/dolphinscheduler-spi/pom.xml b/dolphinscheduler-spi/pom.xml index eb3c935e7d59..b65e1d13406d 100644 --- a/dolphinscheduler-spi/pom.xml +++ b/dolphinscheduler-spi/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-spi ${project.artifactId} diff --git a/dolphinscheduler-standalone-server/pom.xml b/dolphinscheduler-standalone-server/pom.xml index e5abdd751f62..921eb6bf8c7c 100644 --- a/dolphinscheduler-standalone-server/pom.xml +++ b/dolphinscheduler-standalone-server/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-standalone-server diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml index fd56ccad0de3..e35c6d10fdcd 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-storage-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-storage-abs diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-all/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-all/pom.xml index 504fb50340da..4d6edcd1cc76 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-all/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-all/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-storage-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-storage-all diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/pom.xml index 7a6828c600c4..5e5311dadc4d 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-storage-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-storage-api diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml index 84140c19f748..b193826c834f 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-storage-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-storage-gcs diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml index 02a5af0f9b15..2a0758494830 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-storage-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-storage-hdfs diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml index eddf9af9fbec..d19923498b08 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-storage-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-storage-obs diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml index 97d0ab4e0b1f..90fa9cb5e0f0 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-storage-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-storage-oss diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-pure/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-pure/pom.xml deleted file mode 100644 index 1b40dfea3a6d..000000000000 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-pure/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.apache.dolphinscheduler - dolphinscheduler-storage-plugin - 3.2.3-SNAPSHOT - - - dolphinscheduler-storage-pure - - - - org.apache.dolphinscheduler - dolphinscheduler-storage-api - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-storage-s3 - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-storage-hdfs - ${project.version} - - - - diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml index 8e473e96a3da..b9dfd5d1c9ed 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-storage-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-storage-s3 diff --git a/dolphinscheduler-storage-plugin/pom.xml b/dolphinscheduler-storage-plugin/pom.xml index 06946f109bf6..a6a86bc2a644 100644 --- a/dolphinscheduler-storage-plugin/pom.xml +++ b/dolphinscheduler-storage-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-storage-plugin @@ -36,7 +36,6 @@ dolphinscheduler-storage-gcs dolphinscheduler-storage-abs dolphinscheduler-storage-obs - dolphinscheduler-storage-pure diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml index e0c8ba931b9a..5e4c74b27ad9 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-all diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml index 519b3e681d6e..b115a1b6d14b 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-api jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-chunjun/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-chunjun/pom.xml index 9c419c3e786f..ee6db0c85fb1 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-chunjun/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-chunjun/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-chunjun @@ -31,7 +31,6 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-all - provided diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-datafactory/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-datafactory/pom.xml index 2b875952293c..bbc1e59a1f89 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-datafactory/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-datafactory/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-datafactory diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dataquality/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-dataquality/pom.xml index d36edbda5480..6626234a19ac 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dataquality/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dataquality/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-dataquality @@ -42,7 +42,6 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-all ${project.version} - provided org.apache.commons diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-datasync/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-datasync/pom.xml index 7b3887af3d39..b3e1edb79ff4 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-datasync/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-datasync/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-datasync diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml index 0e8dc988abdb..d0778c02d0f6 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-datax diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/pom.xml index 8d48ceb5dd09..647fbfab5be8 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-dinky diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dms/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-dms/pom.xml index ed124d5b6af9..8a3bb854134c 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dms/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dms/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-dms diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dvc/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-dvc/pom.xml index 7931ec201d8c..93825996f453 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dvc/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dvc/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-dvc diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-emr/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-emr/pom.xml index f58ed1e79b9f..969756a99146 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-emr/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-emr/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-emr diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink-stream/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink-stream/pom.xml index bac93b6dcd9d..2cd1a9f4f22f 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink-stream/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink-stream/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-flink-stream diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml index d619efbc14a4..5a208a89ac5c 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-flink diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-hivecli/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-hivecli/pom.xml index bd955739d1a5..ab458f0e976e 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-hivecli/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-hivecli/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-hivecli diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml index 292c052d288b..fb66bf47064a 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-http diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-java/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-java/pom.xml index 2c930df8238f..b28effa47b99 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-java/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-java/pom.xml @@ -22,7 +22,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-java jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-jupyter/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-jupyter/pom.xml index 3c2740cb540d..8e23678a1367 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-jupyter/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-jupyter/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-jupyter jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-k8s/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-k8s/pom.xml index d890b2417bce..a6b167a218b7 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-k8s/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-k8s/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-k8s @@ -31,7 +31,6 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-all - provided diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-kubeflow/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-kubeflow/pom.xml index 27e73f439f9f..3fab0aeee470 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-kubeflow/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-kubeflow/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-kubeflow @@ -31,7 +31,6 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-all - provided diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-linkis/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-linkis/pom.xml index 2be5b2c3535b..63d4b1e5d549 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-linkis/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-linkis/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-linkis diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-mlflow/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-mlflow/pom.xml index 3443a10ae805..8e3132839070 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-mlflow/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-mlflow/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-mlflow diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml index 5fc6779d157b..d83329e66ac8 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-mr diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml index 92395b8011c5..e36c3d004847 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-openmldb diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/pom.xml index 89bc65df2210..e4f036ae7df9 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/pom.xml @@ -22,7 +22,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-pigeon diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml index 9252c8c35429..2f2e67397a31 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-procedure diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-pure/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-pure/pom.xml deleted file mode 100644 index a2d103e55d1f..000000000000 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-pure/pom.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - 4.0.0 - - org.apache.dolphinscheduler - dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT - - - dolphinscheduler-task-pure - - - - - org.apache.dolphinscheduler - dolphinscheduler-task-dataquality - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-datax - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-flink - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-http - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-mr - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-procedure - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-python - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-seatunnel - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-shell - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-spark - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-sql - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-jupyter - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-k8s - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-java - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-hivecli - ${project.version} - - - - org.apache.dolphinscheduler - dolphinscheduler-task-linkis - ${project.version} - - - org.apache.dolphinscheduler - dolphinscheduler-task-remoteshell - ${project.version} - - - - diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml index 3c586e5552d5..7145437bc7b1 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-python diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/pom.xml index 580624438a18..128c6f21990d 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-pytorch diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-remoteshell/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-remoteshell/pom.xml index a8796c59ef37..1986975ab9e9 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-remoteshell/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-remoteshell/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-remoteshell @@ -31,7 +31,6 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-all - provided diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml index d39a9ebeca40..7caaf28641c3 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-sagemaker @@ -51,7 +51,6 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-all ${project.version} - provided diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/pom.xml index ff4658f8cad7..581635316846 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-seatunnel diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml index 5f6fb5b400bb..73fc5066f09a 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-shell diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml index 816236d36602..046a89d08205 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-spark jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml index e4cc28016f03..e457ed7acdf8 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-sql @@ -54,7 +54,6 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-all ${project.version} - provided org.apache.commons diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml index e888bce90e2f..c44508e7745f 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-sqoop diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/pom.xml index 3626c4f1189d..d136977526b6 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-zeppelin jar @@ -41,7 +41,6 @@ org.apache.dolphinscheduler dolphinscheduler-datasource-all ${project.version} - provided org.apache.zeppelin diff --git a/dolphinscheduler-task-plugin/pom.xml b/dolphinscheduler-task-plugin/pom.xml index a0ed910407ac..f4c15732268e 100644 --- a/dolphinscheduler-task-plugin/pom.xml +++ b/dolphinscheduler-task-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-task-plugin @@ -29,7 +29,6 @@ dolphinscheduler-task-all - dolphinscheduler-task-pure dolphinscheduler-task-api dolphinscheduler-task-shell dolphinscheduler-task-datax diff --git a/dolphinscheduler-tools/pom.xml b/dolphinscheduler-tools/pom.xml index b91769a172be..dbba85d10d03 100644 --- a/dolphinscheduler-tools/pom.xml +++ b/dolphinscheduler-tools/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-tools diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml index 263e7e51aa08..2e61184ef503 100644 --- a/dolphinscheduler-ui/pom.xml +++ b/dolphinscheduler-ui/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-ui diff --git a/dolphinscheduler-worker/pom.xml b/dolphinscheduler-worker/pom.xml index bfec21b5d83d..700ecb90d6dd 100644 --- a/dolphinscheduler-worker/pom.xml +++ b/dolphinscheduler-worker/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT dolphinscheduler-worker @@ -51,6 +51,20 @@ org.apache.dolphinscheduler dolphinscheduler-meter + + org.apache.dolphinscheduler + dolphinscheduler-registry-all + + + + org.apache.dolphinscheduler + dolphinscheduler-task-all + + + + org.apache.dolphinscheduler + dolphinscheduler-storage-all + org.apache.dolphinscheduler @@ -153,53 +167,5 @@ - - task-pure - - false - - - - org.apache.dolphinscheduler - dolphinscheduler-task-pure - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-pure - - - org.apache.dolphinscheduler - dolphinscheduler-registry-pure - - - org.apache.dolphinscheduler - dolphinscheduler-storage-pure - - - - - task-all - - true - - - - org.apache.dolphinscheduler - dolphinscheduler-task-all - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-all - - - org.apache.dolphinscheduler - dolphinscheduler-registry-all - - - org.apache.dolphinscheduler - dolphinscheduler-storage-all - - - diff --git a/pom.xml b/pom.xml index 85d990807fec..fc5e994bf976 100755 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.dolphinscheduler dolphinscheduler - 3.2.3-SNAPSHOT + dev-SNAPSHOT pom ${project.artifactId} Dolphin Scheduler is a distributed and easy-to-expand visual DAG workflow scheduling system, dedicated @@ -199,11 +199,6 @@ dolphinscheduler-registry-all ${project.version} - - org.apache.dolphinscheduler - dolphinscheduler-registry-pure - ${project.version} - org.apache.dolphinscheduler @@ -226,11 +221,6 @@ dolphinscheduler-datasource-all ${project.version} - - org.apache.dolphinscheduler - dolphinscheduler-datasource-pure - ${project.version} - org.apache.dolphinscheduler @@ -242,11 +232,6 @@ dolphinscheduler-task-all ${project.version} - - org.apache.dolphinscheduler - dolphinscheduler-task-pure - ${project.version} - org.apache.dolphinscheduler @@ -258,11 +243,6 @@ dolphinscheduler-storage-all ${project.version} - - org.apache.dolphinscheduler - dolphinscheduler-storage-pure - ${project.version} - org.apache.dolphinscheduler dolphinscheduler-extract-base diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index d21401974e65..33987119db02 100644 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -343,8 +343,6 @@ zeppelin-client-0.10.1.jar zeppelin-common-0.10.1.jar zjsonpatch-0.4.11.jar zt-zip-1.15.jar -jna-5.5.0.jar -jna-platform-5.6.0.jar grpc-api-1.41.0.jar grpc-context-1.41.0.jar grpc-core-1.41.0.jar From 3a4e2e4fe6b41d15d365a567c5c607de308959a0 Mon Sep 17 00:00:00 2001 From: zhuxuetong <594754793@qq.com> Date: Thu, 13 Jun 2024 19:22:40 +0800 Subject: [PATCH 07/10] reduce binary tarball size --- dolphinscheduler-dist/pom.xml | 30 +++++++++ .../src/main/assembly/create-symlinks.sh | 62 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 dolphinscheduler-dist/src/main/assembly/create-symlinks.sh diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml index ee4c85589ed3..648615b7b707 100644 --- a/dolphinscheduler-dist/pom.xml +++ b/dolphinscheduler-dist/pom.xml @@ -77,6 +77,36 @@ apache-dolphinscheduler-${project.version} + + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + docker-build + + exec + + package + + sh + + ${basedir}/../dolphinscheduler-dist/src/main/assembly/create-symlinks.sh + + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + + diff --git a/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh new file mode 100644 index 000000000000..51e16326697b --- /dev/null +++ b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh @@ -0,0 +1,62 @@ +#!/bin/bash +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +set -eu +script_dir=`dirname $0` +cd $script_dir/../../../target +# Check if the package file exists +if ! ls ./apache-dolphinscheduler-*-bin.tar.gz &> /dev/null; then + echo "File apache-dolphinscheduler-*-bin.tar.gz not found" + exit 0 +fi +package_file=$(ls apache-dolphinscheduler-*-bin.tar.gz) +echo $package_file + +decompress_dirname="${package_file%.tar.gz}" +rm -rf $decompress_dirname +#Decompress package file +tar -xf $package_file +cd $decompress_dirname + +SHARED_LIB_DIR="libs" +# create share lib directory +mkdir -p $SHARED_LIB_DIR + +echo 'iterate through the lib directory for all subprojects' +for module in api-server master-server worker-server alert-server tools; do + MODULE_LIB_DIR="$module/libs" + echo "handling $MODULE_LIB_DIR" + + if [ -d "$MODULE_LIB_DIR" ]; then + cd $MODULE_LIB_DIR + + for jar in `ls *.jar`; do + # Move jar file to share lib directory + mv $jar ../../$SHARED_LIB_DIR/ + + # Create a symbolic link in the subproject's lib directory + ln -s ../../$SHARED_LIB_DIR/$jar . + done + + cd - > /dev/null + fi +done +#Recompress the package +cd .. +tar -zcf $package_file $decompress_dirname +rm -rf $decompress_dirname \ No newline at end of file From 3f320551fb7274db3861034051cb70d71fedd07a Mon Sep 17 00:00:00 2001 From: zhuxuetong <594754793@qq.com> Date: Wed, 19 Jun 2024 14:27:42 +0800 Subject: [PATCH 08/10] fix CI --- dolphinscheduler-dist/src/main/assembly/create-symlinks.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh index 51e16326697b..6afaba8ed7d9 100644 --- a/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh +++ b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh @@ -56,6 +56,7 @@ for module in api-server master-server worker-server alert-server tools; do cd - > /dev/null fi done + #Recompress the package cd .. tar -zcf $package_file $decompress_dirname From d453ff5b7d18d8a914da13bb2155b83931435ba1 Mon Sep 17 00:00:00 2001 From: zhuxuetong <594754793@qq.com> Date: Wed, 19 Jun 2024 14:29:46 +0800 Subject: [PATCH 09/10] Optimize shell script --- dolphinscheduler-dist/src/main/assembly/create-symlinks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh index 6afaba8ed7d9..09bc5ba7eaa1 100644 --- a/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh +++ b/dolphinscheduler-dist/src/main/assembly/create-symlinks.sh @@ -45,7 +45,7 @@ for module in api-server master-server worker-server alert-server tools; do if [ -d "$MODULE_LIB_DIR" ]; then cd $MODULE_LIB_DIR - for jar in `ls *.jar`; do + for jar in *.jar; do # Move jar file to share lib directory mv $jar ../../$SHARED_LIB_DIR/ From e5155ac059ce7fda19eb3c5574408bbc2eb52f91 Mon Sep 17 00:00:00 2001 From: zhuxuetong <594754793@qq.com> Date: Thu, 20 Jun 2024 11:39:42 +0800 Subject: [PATCH 10/10] exec-maven-plugin after maven-assembly-plugin --- dolphinscheduler-dist/pom.xml | 50 ++++++++++++++--------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml index 648615b7b707..e1eb61eb27aa 100644 --- a/dolphinscheduler-dist/pom.xml +++ b/dolphinscheduler-dist/pom.xml @@ -77,36 +77,6 @@ apache-dolphinscheduler-${project.version} - - - - org.codehaus.mojo - exec-maven-plugin - ${exec-maven-plugin.version} - - - docker-build - - exec - - package - - sh - - ${basedir}/../dolphinscheduler-dist/src/main/assembly/create-symlinks.sh - - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - @@ -148,6 +118,26 @@ + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + create-symlinks + + exec + + package + + sh + + ${basedir}/../dolphinscheduler-dist/src/main/assembly/create-symlinks.sh + + + + +