From ae33ba594754425a2ac72100450adffd3b5e3971 Mon Sep 17 00:00:00 2001 From: caishunfeng Date: Mon, 26 Sep 2022 21:49:27 +0800 Subject: [PATCH] [maven-release-plugin] prepare release 3.1.0 --- .../dolphinscheduler-alert-api/pom.xml | 13 +- .../dolphinscheduler-alert-dingtalk/pom.xml | 9 +- .../dolphinscheduler-alert-email/pom.xml | 9 +- .../dolphinscheduler-alert-feishu/pom.xml | 9 +- .../dolphinscheduler-alert-http/pom.xml | 9 +- .../dolphinscheduler-alert-pagerduty/pom.xml | 9 +- .../dolphinscheduler-alert-script/pom.xml | 9 +- .../dolphinscheduler-alert-slack/pom.xml | 9 +- .../dolphinscheduler-alert-telegram/pom.xml | 9 +- .../dolphinscheduler-alert-webexteams/pom.xml | 9 +- .../dolphinscheduler-alert-wechat/pom.xml | 9 +- .../dolphinscheduler-alert-plugins/pom.xml | 9 +- .../dolphinscheduler-alert-server/pom.xml | 2 +- dolphinscheduler-alert/pom.xml | 12 +- dolphinscheduler-api/pom.xml | 2 +- dolphinscheduler-bom/pom.xml | 2 +- dolphinscheduler-common/pom.xml | 2 +- dolphinscheduler-dao/pom.xml | 29 ++-- dolphinscheduler-data-quality/pom.xml | 2 +- .../dolphinscheduler-datasource-all/pom.xml | 9 +- .../dolphinscheduler-datasource-api/pom.xml | 20 ++- .../pom.xml | 12 +- .../pom.xml | 13 +- .../dolphinscheduler-datasource-db2/pom.xml | 13 +- .../dolphinscheduler-datasource-hive/pom.xml | 84 ++++++------ .../dolphinscheduler-datasource-mysql/pom.xml | 12 +- .../pom.xml | 11 +- .../pom.xml | 13 +- .../pom.xml | 11 +- .../pom.xml | 11 +- .../dolphinscheduler-datasource-spark/pom.xml | 11 +- .../pom.xml | 16 +-- dolphinscheduler-datasource-plugin/pom.xml | 11 +- dolphinscheduler-dist/pom.xml | 2 +- dolphinscheduler-log-server/pom.xml | 34 +++-- dolphinscheduler-master/pom.xml | 2 +- dolphinscheduler-meter/pom.xml | 35 +++-- dolphinscheduler-microbench/pom.xml | 34 +++-- dolphinscheduler-python/pom.xml | 19 ++- .../dolphinscheduler-registry-all/pom.xml | 9 +- .../dolphinscheduler-registry-api/pom.xml | 10 +- .../dolphinscheduler-registry-etcd/pom.xml | 11 +- .../dolphinscheduler-registry-mysql/pom.xml | 9 +- .../pom.xml | 2 +- .../dolphinscheduler-registry-plugins/pom.xml | 8 +- dolphinscheduler-registry/pom.xml | 43 +++--- dolphinscheduler-remote/pom.xml | 30 ++-- .../dolphinscheduler-scheduler-api/pom.xml | 9 +- .../dolphinscheduler-scheduler-quartz/pom.xml | 9 +- dolphinscheduler-scheduler-plugin/pom.xml | 13 +- dolphinscheduler-server/pom.xml | 47 ++++--- dolphinscheduler-service/pom.xml | 30 ++-- dolphinscheduler-spi/pom.xml | 29 ++-- dolphinscheduler-standalone-server/pom.xml | 2 +- .../dolphinscheduler-task-all/pom.xml | 2 +- .../dolphinscheduler-task-api/pom.xml | 75 +++++----- .../dolphinscheduler-task-blocking/pom.xml | 9 +- .../dolphinscheduler-task-chunjun/pom.xml | 9 +- .../dolphinscheduler-task-conditions/pom.xml | 11 +- .../dolphinscheduler-task-dataquality/pom.xml | 9 +- .../dolphinscheduler-task-datax/pom.xml | 9 +- .../dolphinscheduler-task-dependent/pom.xml | 11 +- .../dolphinscheduler-task-dinky/pom.xml | 13 +- .../dolphinscheduler-task-dvc/pom.xml | 9 +- .../dolphinscheduler-task-emr/pom.xml | 9 +- .../pom.xml | 11 +- .../dolphinscheduler-task-flink/pom.xml | 29 ++-- .../dolphinscheduler-task-hivecli/pom.xml | 2 +- .../dolphinscheduler-task-http/pom.xml | 10 +- .../dolphinscheduler-task-jupyter/pom.xml | 9 +- .../dolphinscheduler-task-k8s/pom.xml | 9 +- .../dolphinscheduler-task-mlflow/pom.xml | 9 +- .../dolphinscheduler-task-mr/pom.xml | 9 +- .../dolphinscheduler-task-openmldb/pom.xml | 9 +- .../dolphinscheduler-task-pigeon/pom.xml | 11 +- .../dolphinscheduler-task-procedure/pom.xml | 9 +- .../dolphinscheduler-task-python/pom.xml | 9 +- .../dolphinscheduler-task-pytorch/pom.xml | 9 +- .../dolphinscheduler-task-sagemaker/pom.xml | 9 +- .../dolphinscheduler-task-seatunnel/pom.xml | 9 +- .../dolphinscheduler-task-shell/pom.xml | 9 +- .../dolphinscheduler-task-spark/pom.xml | 9 +- .../dolphinscheduler-task-sql/pom.xml | 9 +- .../dolphinscheduler-task-sqoop/pom.xml | 9 +- .../dolphinscheduler-task-subprocess/pom.xml | 11 +- .../dolphinscheduler-task-switch/pom.xml | 11 +- .../dolphinscheduler-task-zeppelin/pom.xml | 9 +- dolphinscheduler-task-plugin/pom.xml | 2 +- dolphinscheduler-tools/pom.xml | 25 ++-- dolphinscheduler-ui/pom.xml | 128 +++++++++--------- dolphinscheduler-worker/pom.xml | 2 +- pom.xml | 4 +- 92 files changed, 630 insertions(+), 714 deletions(-) diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-api/pom.xml index 45ec52685..e034b6e1d 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-api/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-api/pom.xml @@ -17,22 +17,21 @@ ~ specific language governing permissions and limitations ~ under the License. --> - - + 4.0.0 - dolphinscheduler-alert org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert + 3.1.0 - 4.0.0 dolphinscheduler-alert-api org.apache.dolphinscheduler - dolphinscheduler-spi + dolphinscheduler-spi + 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 34b1ef333..bf9842bdd 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-alert-plugins org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert-plugins + 3.1.0 - 4.0.0 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 1ec230202..402139c42 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-alert-plugins org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert-plugins + 3.1.0 - 4.0.0 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 93450e08f..b078545a1 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-alert-plugins org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert-plugins + 3.1.0 - 4.0.0 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 007c3cd83..3d5492a56 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-alert-plugins org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert-plugins + 3.1.0 - 4.0.0 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 08a664d53..a6eeef83b 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-alert-plugins org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert-plugins + 3.1.0 - 4.0.0 dolphinscheduler-alert-pagerduty 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 96038b970..aa63737e6 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-alert-plugins org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert-plugins + 3.1.0 - 4.0.0 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 256b1ebd6..2fe88d854 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-alert-plugins org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert-plugins + 3.1.0 - 4.0.0 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 ed761d446..2d6a5ecc8 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-alert-plugins org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert-plugins + 3.1.0 - 4.0.0 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 5668088eb..2bc7f7e25 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-alert-plugins org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert-plugins + 3.1.0 - 4.0.0 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 b293ac6c1..42ec95f17 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-alert-plugins org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert-plugins + 3.1.0 - 4.0.0 dolphinscheduler-alert-wechat jar diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml index a014f8b17..34f717849 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-alert org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-alert + 3.1.0 - 4.0.0 dolphinscheduler-alert-plugins pom diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml index 587619f9f..3c93a8e99 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 - dev-SNAPSHOT + 3.1.0 dolphinscheduler-alert-server jar diff --git a/dolphinscheduler-alert/pom.xml b/dolphinscheduler-alert/pom.xml index ee7e37953..1d1904a8c 100644 --- a/dolphinscheduler-alert/pom.xml +++ b/dolphinscheduler-alert/pom.xml @@ -17,18 +17,16 @@ ~ specific language governing permissions and limitations ~ under the License. --> - - + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler + 3.1.0 - 4.0.0 - pom dolphinscheduler-alert + pom dolphinscheduler-alert-api diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index 0785d350b..ea518d50f 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-api jar diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml index 9b01c52b1..34c020a82 100644 --- a/dolphinscheduler-bom/pom.xml +++ b/dolphinscheduler-bom/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-bom pom diff --git a/dolphinscheduler-common/pom.xml b/dolphinscheduler-common/pom.xml index ea698aeec..6439b4496 100644 --- a/dolphinscheduler-common/pom.xml +++ b/dolphinscheduler-common/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-common diff --git a/dolphinscheduler-dao/pom.xml b/dolphinscheduler-dao/pom.xml index 1090096f6..952eb64d2 100644 --- a/dolphinscheduler-dao/pom.xml +++ b/dolphinscheduler-dao/pom.xml @@ -15,18 +15,29 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - 4.0.0 org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-dao ${project.artifactId} + + + + org.apache.dolphinscheduler + dolphinscheduler-bom + ${project.version} + pom + import + + + + @@ -43,8 +54,8 @@ spring-boot-starter-tomcat - log4j-to-slf4j org.apache.logging.log4j + log4j-to-slf4j @@ -98,18 +109,6 @@ - - - - org.apache.dolphinscheduler - dolphinscheduler-bom - ${project.version} - pom - import - - - - diff --git a/dolphinscheduler-data-quality/pom.xml b/dolphinscheduler-data-quality/pom.xml index 8634ec99f..c11d05fbf 100644 --- a/dolphinscheduler-data-quality/pom.xml +++ b/dolphinscheduler-data-quality/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-data-quality diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml index cd564e2a2..84fd3a4e6 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-all diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml index 21e17068e..600f83258 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml @@ -15,16 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-api @@ -92,8 +90,8 @@ slf4j-log4j12 - servlet-api javax.servlet + servlet-api org.codehaus.jackson @@ -117,20 +115,20 @@ hadoop-mapreduce-client-shuffle - jersey-client com.sun.jersey + jersey-client - jersey-core com.sun.jersey + jersey-core - jaxb-api javax.xml.bind + jaxb-api - log4j log4j + log4j diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml index 0ca15dc16..641ec4b79 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml @@ -15,16 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-athena jar @@ -41,4 +39,4 @@ - \ No newline at end of file + diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml index 20898fcb2..3443e436f 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml @@ -15,19 +15,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-clickhouse - ${project.artifactId} jar + ${project.artifactId} @@ -47,8 +46,8 @@ clickhouse-jdbc - jaxb-api javax.xml.bind + jaxb-api com.fasterxml.jackson.core diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml index 872e502f2..6c24c72ef 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml @@ -15,19 +15,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-db2 - ${project.artifactId} jar + ${project.artifactId} @@ -43,8 +42,6 @@ ${project.version} - - org.mockito mockito-core diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml index cf55ee4a5..14f9100d9 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml @@ -15,19 +15,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-hive - ${project.artifactId} jar + ${project.artifactId} @@ -56,8 +55,8 @@ slf4j-log4j12 - servlet-api javax.servlet + servlet-api org.codehaus.jackson @@ -81,20 +80,20 @@ hadoop-mapreduce-client-shuffle - jersey-client com.sun.jersey + jersey-client - jersey-core com.sun.jersey + jersey-core - jaxb-api javax.xml.bind + jaxb-api - log4j log4j + log4j @@ -105,14 +104,13 @@ ${project.version} - org.apache.hive hive-jdbc - slf4j-log4j12 org.slf4j + slf4j-log4j12 org.eclipse.jetty.aggregate @@ -194,124 +192,124 @@ json - log4j-slf4j-impl org.apache.logging.log4j + log4j-slf4j-impl - javax.servlet org.eclipse.jetty.orbit + javax.servlet - servlet-api-2.5 org.mortbay.jetty + servlet-api-2.5 - jasper-runtime tomcat + jasper-runtime - slider-core org.apache.slider + slider-core - hbase-server org.apache.hbase + hbase-server - jersey-client com.sun.jersey + jersey-client - jersey-core com.sun.jersey + jersey-core - jersey-json com.sun.jersey + jersey-json - jersey-server com.sun.jersey + jersey-server - jersey-guice com.sun.jersey.contribs + jersey-guice - hbase-common org.apache.hbase + hbase-common - hbase-hadoop2-compat org.apache.hbase + hbase-hadoop2-compat - hbase-client org.apache.hbase + hbase-client - hbase-hadoop-compat org.apache.hbase + hbase-hadoop-compat - tephra-hbase-compat-1.0 co.cask.tephra + tephra-hbase-compat-1.0 - jaxb-api javax.xml.bind + jaxb-api - hive-llap-client org.apache.hive + hive-llap-client - hive-llap-common org.apache.hive + hive-llap-common - hive-llap-server org.apache.hive + hive-llap-server - tephra-core co.cask.tephra + tephra-core - ant ant + ant - stringtemplate org.antlr + stringtemplate - antlr-runtime org.antlr + antlr-runtime - hive-shims org.apache.hive + hive-shims - jsp-api javax.servlet + jsp-api - log4j-api org.apache.logging.log4j + log4j-api - log4j-core org.apache.logging.log4j + log4j-core - log4j-web org.apache.logging.log4j + log4j-web - jasper-compiler tomcat + jasper-compiler com.fasterxml.jackson.core diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml index 07604e3d3..35d2ba145 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml @@ -15,19 +15,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-mysql - ${project.artifactId} jar + ${project.artifactId} @@ -48,7 +47,6 @@ mysql-connector-java - org.mockito mockito-core diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml index 7ffa17f73..b04025d95 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml @@ -15,19 +15,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-oracle - ${project.artifactId} jar + ${project.artifactId} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml index e2c20d7c9..eee4ba9ca 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml @@ -15,19 +15,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-postgresql - ${project.artifactId} jar + ${project.artifactId} @@ -48,8 +47,6 @@ postgresql - - org.mockito mockito-core diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml index 9abe5161b..afc6db011 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml @@ -15,19 +15,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-presto - ${project.artifactId} jar + ${project.artifactId} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml index 0a290f31f..730c04983 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-redshift jar @@ -41,4 +40,4 @@ - \ No newline at end of file + diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml index c0f348c4f..2bbf586e8 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml @@ -15,19 +15,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-spark - ${project.artifactId} jar + ${project.artifactId} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml index 9031f7d11..ed59b9073 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml @@ -15,20 +15,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - + 4.0.0 - dolphinscheduler-datasource-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-datasource-plugin + 3.1.0 - 4.0.0 dolphinscheduler-datasource-sqlserver - ${project.artifactId} jar + ${project.artifactId} @@ -47,14 +45,12 @@ mssql-jdbc - azure-keyvault com.microsoft.azure + azure-keyvault - - org.mockito mockito-core diff --git a/dolphinscheduler-datasource-plugin/pom.xml b/dolphinscheduler-datasource-plugin/pom.xml index 80857c2ba..5361abd3f 100644 --- a/dolphinscheduler-datasource-plugin/pom.xml +++ b/dolphinscheduler-datasource-plugin/pom.xml @@ -15,18 +15,17 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler + 3.1.0 - 4.0.0 dolphinscheduler-datasource-plugin - ${project.artifactId} pom + ${project.artifactId} dolphinscheduler-datasource-sqlserver diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml index 22316a261..351118d57 100644 --- a/dolphinscheduler-dist/pom.xml +++ b/dolphinscheduler-dist/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-dist diff --git a/dolphinscheduler-log-server/pom.xml b/dolphinscheduler-log-server/pom.xml index 26244a4e1..c88834e10 100644 --- a/dolphinscheduler-log-server/pom.xml +++ b/dolphinscheduler-log-server/pom.xml @@ -15,19 +15,29 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler + 3.1.0 - 4.0.0 dolphinscheduler-log-server + + + + org.apache.dolphinscheduler + dolphinscheduler-bom + ${project.version} + pom + import + + + + org.apache.dolphinscheduler @@ -49,16 +59,4 @@ - - - - org.apache.dolphinscheduler - dolphinscheduler-bom - ${project.version} - pom - import - - - - diff --git a/dolphinscheduler-master/pom.xml b/dolphinscheduler-master/pom.xml index 9294794a7..ef1c8ae73 100644 --- a/dolphinscheduler-master/pom.xml +++ b/dolphinscheduler-master/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-master diff --git a/dolphinscheduler-meter/pom.xml b/dolphinscheduler-meter/pom.xml index acaee02dc..3a052e08d 100644 --- a/dolphinscheduler-meter/pom.xml +++ b/dolphinscheduler-meter/pom.xml @@ -18,18 +18,29 @@ ~ under the License. ~ --> - + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler + 3.1.0 - 4.0.0 dolphinscheduler-meter + + + + org.apache.dolphinscheduler + dolphinscheduler-bom + ${project.version} + pom + import + + + + org.springframework.boot @@ -50,8 +61,8 @@ spring-boot-starter-tomcat - log4j-to-slf4j org.apache.logging.log4j + log4j-to-slf4j @@ -83,18 +94,6 @@ - - - - org.apache.dolphinscheduler - dolphinscheduler-bom - ${project.version} - pom - import - - - - diff --git a/dolphinscheduler-microbench/pom.xml b/dolphinscheduler-microbench/pom.xml index 9ee35e09d..e7c9c09e2 100644 --- a/dolphinscheduler-microbench/pom.xml +++ b/dolphinscheduler-microbench/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler + 3.1.0 - 4.0.0 dolphinscheduler-microbench jar @@ -35,6 +34,18 @@ benchmarks + + + + org.apache.dolphinscheduler + dolphinscheduler-bom + ${project.version} + pom + import + + + + @@ -67,18 +78,6 @@ - - - - org.apache.dolphinscheduler - dolphinscheduler-bom - ${project.version} - pom - import - - - - @@ -112,5 +111,4 @@ - diff --git a/dolphinscheduler-python/pom.xml b/dolphinscheduler-python/pom.xml index 410180e84..357355e3e 100644 --- a/dolphinscheduler-python/pom.xml +++ b/dolphinscheduler-python/pom.xml @@ -15,18 +15,17 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - 4.0.0 org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-python - ${project.artifactId} jar + ${project.artifactId} @@ -45,10 +44,10 @@ python-api-prepare - prepare-package exec + prepare-package python ${project.basedir}/pydolphinscheduler @@ -64,10 +63,10 @@ python-api-clean - prepare-package exec + prepare-package python ${project.basedir}/pydolphinscheduler @@ -79,10 +78,10 @@ python-api-build - prepare-package exec + prepare-package python ${project.basedir}/pydolphinscheduler @@ -95,10 +94,10 @@ python-pkg-rename-tar - prepare-package exec + prepare-package bash ${project.basedir}/pydolphinscheduler @@ -110,10 +109,10 @@ python-pkg-rename-whl - prepare-package exec + prepare-package bash ${project.basedir}/pydolphinscheduler @@ -125,10 +124,10 @@ sign-source - prepare-package exec + prepare-package ${python.sign.skip} bash @@ -142,10 +141,10 @@ sign-wheel - prepare-package exec + prepare-package ${python.sign.skip} bash diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml index 682e66830..c5f60700a 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler dolphinscheduler-registry - dev-SNAPSHOT + 3.1.0 - 4.0.0 dolphinscheduler-registry-all @@ -44,4 +43,4 @@ ${project.version} - \ No newline at end of file + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml index b704c4131..f6364a5b0 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml @@ -17,16 +17,14 @@ ~ specific language governing permissions and limitations ~ under the License. --> - - + 4.0.0 - dolphinscheduler-registry org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-registry + 3.1.0 - 4.0.0 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 f55aa022e..292da146f 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-registry-plugins org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-registry-plugins + 3.1.0 - 4.0.0 dolphinscheduler-registry-etcd @@ -64,4 +63,4 @@ slf4j-api - \ No newline at end of file + diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-mysql/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-mysql/pom.xml index 150b05835..de8f31e86 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-mysql/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-mysql/pom.xml @@ -17,15 +17,14 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + 4.0.0 org.apache.dolphinscheduler dolphinscheduler-registry-plugins - dev-SNAPSHOT + 3.1.0 - 4.0.0 dolphinscheduler-registry-mysql @@ -53,4 +52,4 @@ - \ No newline at end of file + 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 8f8bd7b64..efa2e5cee 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 - dev-SNAPSHOT + 3.1.0 dolphinscheduler-registry-zookeeper diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml index 8c3c10857..e6c363a0c 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml @@ -17,17 +17,15 @@ ~ specific language governing permissions and limitations ~ under the License. --> - - + 4.0.0 org.apache.dolphinscheduler dolphinscheduler-registry - dev-SNAPSHOT + 3.1.0 dolphinscheduler-registry-plugins - 4.0.0 pom diff --git a/dolphinscheduler-registry/pom.xml b/dolphinscheduler-registry/pom.xml index e71190055..262f021e2 100644 --- a/dolphinscheduler-registry/pom.xml +++ b/dolphinscheduler-registry/pom.xml @@ -15,35 +15,17 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler + 3.1.0 - 4.0.0 dolphinscheduler-registry pom - - - org.springframework - spring-context - provided - - - org.springframework.boot - spring-boot-autoconfigure - provided - - - javax.annotation - javax.annotation-api - - - dolphinscheduler-registry-api dolphinscheduler-registry-plugins @@ -61,4 +43,21 @@ + + + + org.springframework + spring-context + provided + + + org.springframework.boot + spring-boot-autoconfigure + provided + + + javax.annotation + javax.annotation-api + + diff --git a/dolphinscheduler-remote/pom.xml b/dolphinscheduler-remote/pom.xml index c3a4be155..cf1a240b9 100644 --- a/dolphinscheduler-remote/pom.xml +++ b/dolphinscheduler-remote/pom.xml @@ -17,17 +17,29 @@ --> + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler + 3.1.0 - 4.0.0 dolphinscheduler-remote dolphinscheduler-remote + + + + org.apache.dolphinscheduler + dolphinscheduler-bom + ${project.version} + pom + import + + + + @@ -73,16 +85,4 @@ - - - - - org.apache.dolphinscheduler - dolphinscheduler-bom - ${project.version} - pom - import - - - diff --git a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml index 230c59282..081c01aba 100644 --- a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml +++ b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler dolphinscheduler-scheduler-plugin - dev-SNAPSHOT + 3.1.0 - 4.0.0 dolphinscheduler-scheduler-api @@ -34,4 +33,4 @@ - \ No newline at end of file + diff --git a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml index d3afa0e70..997ddcc82 100644 --- a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml +++ b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler dolphinscheduler-scheduler-plugin - dev-SNAPSHOT + 3.1.0 - 4.0.0 dolphinscheduler-scheduler-quartz @@ -75,4 +74,4 @@ - \ No newline at end of file + diff --git a/dolphinscheduler-scheduler-plugin/pom.xml b/dolphinscheduler-scheduler-plugin/pom.xml index 65b887367..5eef11417 100644 --- a/dolphinscheduler-scheduler-plugin/pom.xml +++ b/dolphinscheduler-scheduler-plugin/pom.xml @@ -15,18 +15,17 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler + 3.1.0 - 4.0.0 - pom dolphinscheduler-scheduler-plugin + pom dolphinscheduler-scheduler-api @@ -44,4 +43,4 @@ - \ No newline at end of file + diff --git a/dolphinscheduler-server/pom.xml b/dolphinscheduler-server/pom.xml index 40c8d166b..afebdfca0 100644 --- a/dolphinscheduler-server/pom.xml +++ b/dolphinscheduler-server/pom.xml @@ -15,18 +15,29 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - 4.0.0 org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-server - dolphinscheduler-server jar + dolphinscheduler-server + + + + + org.apache.dolphinscheduler + dolphinscheduler-bom + ${project.version} + pom + import + + + @@ -62,8 +73,8 @@ jdk.tools - servlet-api javax.servlet + servlet-api javax.servlet @@ -127,16 +138,16 @@ jsp-api - jersey-json com.sun.jersey + jersey-json - jersey-server com.sun.jersey + jersey-server - jersey-core com.sun.jersey + jersey-core @@ -154,8 +165,8 @@ slf4j-log4j12 - servlet-api javax.servlet + servlet-api org.codehaus.jackson @@ -179,37 +190,25 @@ hadoop-mapreduce-client-shuffle - jersey-client com.sun.jersey + jersey-client - jersey-core com.sun.jersey + jersey-core - jaxb-api javax.xml.bind + jaxb-api - log4j log4j + log4j - - - - org.apache.dolphinscheduler - dolphinscheduler-bom - ${project.version} - pom - import - - - - diff --git a/dolphinscheduler-service/pom.xml b/dolphinscheduler-service/pom.xml index 8b450f9f5..1ffb6f59d 100644 --- a/dolphinscheduler-service/pom.xml +++ b/dolphinscheduler-service/pom.xml @@ -17,17 +17,29 @@ --> + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler + 3.1.0 - 4.0.0 dolphinscheduler-service dolphinscheduler-service + + + + org.apache.dolphinscheduler + dolphinscheduler-bom + ${project.version} + pom + import + + + + @@ -63,16 +75,4 @@ - - - - - org.apache.dolphinscheduler - dolphinscheduler-bom - ${project.version} - pom - import - - - diff --git a/dolphinscheduler-spi/pom.xml b/dolphinscheduler-spi/pom.xml index ea831b6f4..d4aaecd14 100644 --- a/dolphinscheduler-spi/pom.xml +++ b/dolphinscheduler-spi/pom.xml @@ -15,16 +15,29 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-spi ${project.artifactId} + + + + org.apache.dolphinscheduler + dolphinscheduler-bom + ${project.version} + pom + import + + + + @@ -54,16 +67,4 @@ guava - - - - - org.apache.dolphinscheduler - dolphinscheduler-bom - ${project.version} - pom - import - - - diff --git a/dolphinscheduler-standalone-server/pom.xml b/dolphinscheduler-standalone-server/pom.xml index 7bc450fd8..6a5b41ea7 100644 --- a/dolphinscheduler-standalone-server/pom.xml +++ b/dolphinscheduler-standalone-server/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-standalone-server diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml index efabfbf9c..49fe21ecc 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 - dev-SNAPSHOT + 3.1.0 dolphinscheduler-task-all diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml index a53870d25..bc659f7f0 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml @@ -15,17 +15,16 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 - jar dolphinscheduler-task-api + jar @@ -73,8 +72,8 @@ provided - slf4j-log4j12 org.slf4j + slf4j-log4j12 org.eclipse.jetty.aggregate @@ -157,128 +156,128 @@ json - log4j-slf4j-impl org.apache.logging.log4j + log4j-slf4j-impl - javax.servlet org.eclipse.jetty.orbit + javax.servlet - servlet-api-2.5 org.mortbay.jetty + servlet-api-2.5 - jasper-runtime tomcat + jasper-runtime - slider-core org.apache.slider + slider-core - hbase-server org.apache.hbase + hbase-server - jersey-client com.sun.jersey + jersey-client - jersey-core com.sun.jersey + jersey-core - jersey-json com.sun.jersey + jersey-json - jersey-server com.sun.jersey + jersey-server - jersey-guice com.sun.jersey.contribs + jersey-guice - hbase-common org.apache.hbase + hbase-common - hbase-hadoop2-compat org.apache.hbase + hbase-hadoop2-compat - hbase-client org.apache.hbase + hbase-client - hbase-hadoop-compat org.apache.hbase + hbase-hadoop-compat - tephra-hbase-compat-1.0 co.cask.tephra + tephra-hbase-compat-1.0 - jaxb-api javax.xml.bind + jaxb-api - hive-llap-client org.apache.hive + hive-llap-client - hive-llap-common org.apache.hive + hive-llap-common - hive-llap-server org.apache.hive + hive-llap-server - tephra-core co.cask.tephra + tephra-core - ant ant + ant - stringtemplate org.antlr + stringtemplate - antlr-runtime org.antlr + antlr-runtime - hive-shims org.apache.hive + hive-shims - jsp-api javax.servlet + jsp-api - log4j-api org.apache.logging.log4j + log4j-api - log4j-core org.apache.logging.log4j + log4j-core - log4j-web org.apache.logging.log4j + log4j-web - jasper-compiler tomcat + jasper-compiler - commons-lang commons-lang + commons-lang diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-blocking/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-blocking/pom.xml index 6ed207715..546d769fe 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-blocking/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-blocking/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-blocking jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-chunjun/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-chunjun/pom.xml index 6929353a9..b554501b0 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-chunjun/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-chunjun/pom.xml @@ -15,13 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-chunjun jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-conditions/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-conditions/pom.xml index 97e6c0981..f22f26940 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-conditions/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-conditions/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-conditions jar @@ -41,4 +40,4 @@ - \ No newline at end of file + diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dataquality/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-dataquality/pom.xml index 4311fa80c..3afe65a70 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dataquality/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dataquality/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-dataquality jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml index 02b4428e8..9e906bc9d 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-datax jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dependent/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-dependent/pom.xml index fc7a4eb28..b51a6682a 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dependent/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dependent/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-dependent jar @@ -41,4 +40,4 @@ - \ No newline at end of file + diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/pom.xml index ec3259c0b..8093a0f81 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/pom.xml @@ -15,18 +15,17 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 - jar dolphinscheduler-task-dinky + jar org.apache.dolphinscheduler @@ -47,4 +46,4 @@ httpcore - \ No newline at end of file + diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dvc/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-dvc/pom.xml index a0435647c..cfd88b4e2 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dvc/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dvc/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-dvc jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-emr/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-emr/pom.xml index 7a4e9913a..b536e47d3 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-emr/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-emr/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-emr jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink-stream/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink-stream/pom.xml index e2dd5753f..3d1a3cfbb 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink-stream/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink-stream/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-flink-stream jar @@ -45,4 +44,4 @@ ${project.version} - \ No newline at end of file + diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml index c43d507d3..f4e3e5101 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/pom.xml @@ -15,29 +15,28 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-flink jar - - org.apache.dolphinscheduler - dolphinscheduler-spi - provided - - - org.apache.dolphinscheduler - dolphinscheduler-task-api - ${project.version} - + + org.apache.dolphinscheduler + dolphinscheduler-spi + provided + + + org.apache.dolphinscheduler + dolphinscheduler-task-api + ${project.version} + diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-hivecli/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-hivecli/pom.xml index ab458f0e9..21d74187e 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 - dev-SNAPSHOT + 3.1.0 dolphinscheduler-task-hivecli diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml index 015d3193e..470ac6c30 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-http/pom.xml @@ -21,12 +21,12 @@ org.apache.dolphinscheduler dolphinscheduler-task-plugin - dev-SNAPSHOT + 3.1.0 - + dolphinscheduler-task-http jar - + org.apache.dolphinscheduler @@ -38,7 +38,7 @@ dolphinscheduler-task-api ${project.version} - + org.apache.commons commons-collections4 @@ -51,7 +51,7 @@ org.apache.httpcomponents httpcore - + com.squareup.okhttp3 mockwebserver diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-jupyter/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-jupyter/pom.xml index c81ffc613..3ec949888 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-jupyter/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-jupyter/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 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 b517bd6bf..de0d073e7 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-k8s/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-k8s/pom.xml @@ -15,13 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-k8s jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-mlflow/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-mlflow/pom.xml index 7e21ccab7..b3b511893 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-mlflow/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-mlflow/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-mlflow jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml index 2e0076573..0631614a9 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-mr/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-mr jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml index 065d99386..c5c4c4404 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-openmldb/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-openmldb jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/pom.xml index c58710e0d..7bb73f58b 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/pom.xml @@ -15,17 +15,16 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 - dolphinscheduler-task-pigeon jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml index 586c47e3e..ef0f7e653 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-procedure jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml index be3fc479e..0821150e4 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-python jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/pom.xml index 0a0107d0e..3cb5ab2b4 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-pytorch/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-pytorch jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml index 66f761d82..0bfeff07e 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-sagemaker jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/pom.xml index 5a0da75c7..2c6c45d1a 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-seatunnel jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml index e7ddd6dd1..49681289f 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-shell jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml index 45c2923c2..b5a4fe6d9 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-spark/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 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 4896aecc4..a58c1c31c 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-sql jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml index d285977a4..13e885fc7 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-sqoop jar diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-subprocess/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-subprocess/pom.xml index f723207ca..ba74c3e0f 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-subprocess/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-subprocess/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-subprocess jar @@ -41,4 +40,4 @@ - \ No newline at end of file + diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/pom.xml index 41159491f..679b05baa 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-switch jar @@ -41,4 +40,4 @@ - \ No newline at end of file + diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/pom.xml index 4ae533bcc..ba69b9bc3 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler-task-plugin + 3.1.0 - 4.0.0 dolphinscheduler-task-zeppelin jar diff --git a/dolphinscheduler-task-plugin/pom.xml b/dolphinscheduler-task-plugin/pom.xml index 528e21f45..c43d3d17c 100644 --- a/dolphinscheduler-task-plugin/pom.xml +++ b/dolphinscheduler-task-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-task-plugin diff --git a/dolphinscheduler-tools/pom.xml b/dolphinscheduler-tools/pom.xml index 4212bcf4b..fc8618b38 100644 --- a/dolphinscheduler-tools/pom.xml +++ b/dolphinscheduler-tools/pom.xml @@ -18,25 +18,17 @@ ~ under the License. ~ --> - + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler - dev-SNAPSHOT + dolphinscheduler + 3.1.0 - 4.0.0 dolphinscheduler-tools - - - org.apache.dolphinscheduler - dolphinscheduler-dao - - - @@ -49,6 +41,13 @@ + + + org.apache.dolphinscheduler + dolphinscheduler-dao + + + @@ -65,10 +64,10 @@ dolphinscheduler-tools - package single + package tools diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml index ed8dc6fcd..e20b7a179 100644 --- a/dolphinscheduler-ui/pom.xml +++ b/dolphinscheduler-ui/pom.xml @@ -15,73 +15,73 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> + + 4.0.0 + + org.apache.dolphinscheduler + dolphinscheduler + 3.1.0 + - - - dolphinscheduler - org.apache.dolphinscheduler - dev-SNAPSHOT - - 4.0.0 + dolphinscheduler-ui - dolphinscheduler-ui + ${project.artifactId} - ${project.artifactId} + + v16.13.1 + v6.32.6 + src + 1.12.1 + - - v16.13.1 - v6.32.6 - src - 1.12.1 - + + + release + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-maven-plugin.version} + + false + + + + install node and pnpm + + install-node-and-pnpm + + + ${node.version} + ${pnpm.version} + + + + pnpm install + + pnpm + + generate-resources + + install + + + + pnpm run build:prod + + pnpm + + + run build:prod + + + + + - - - release - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-maven-plugin.version} - - false - - - - install node and pnpm - - install-node-and-pnpm - - - ${node.version} - ${pnpm.version} - - - - pnpm install - - pnpm - - generate-resources - - install - - - - pnpm run build:prod - - pnpm - - - run build:prod - - - - - - - - - + + + diff --git a/dolphinscheduler-worker/pom.xml b/dolphinscheduler-worker/pom.xml index e558deb9c..f8ac6dad1 100644 --- a/dolphinscheduler-worker/pom.xml +++ b/dolphinscheduler-worker/pom.xml @@ -24,7 +24,7 @@ org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 dolphinscheduler-worker diff --git a/pom.xml b/pom.xml index 8000b56ad..7ad409044 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.dolphinscheduler dolphinscheduler - dev-SNAPSHOT + 3.1.0 pom ${project.artifactId} Dolphin Scheduler is a distributed and easy-to-expand visual DAG workflow scheduling system, dedicated @@ -765,7 +765,7 @@ scm:git:https://github.com/apache/dolphinscheduler.git scm:git:https://github.com/apache/dolphinscheduler.git https://github.com/apache/dolphinscheduler - HEAD + 3.1.0 -- GitLab