This is an automated email from the ASF dual-hosted git repository.
zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 1e2b21175c [Chore] Some release improvement (#17107)
1e2b21175c is described below
commit 1e2b21175c3b873a8db9c1f69043f8bd29b0e95a
Author: xiangzihao <[email protected]>
AuthorDate: Mon Apr 7 17:48:39 2025 +0800
[Chore] Some release improvement (#17107)
---
docs/docs/en/contribute/backend/spi/alert.md | 2 +-
docs/docs/en/contribute/release.md | 2 ++
docs/docs/en/guide/task/dinky.md | 2 +-
docs/docs/en/guide/task/mlflow.md | 16 ++++++++--------
docs/docs/zh/contribute/backend/spi/alert.md | 2 +-
docs/docs/zh/contribute/release.md | 2 ++
docs/docs/zh/guide/task/dinky.md | 2 +-
docs/docs/zh/guide/task/mlflow.md | 14 +++++++-------
dolphinscheduler-dist/pom.xml | 7 +++++++
.../src/main/assembly/assembly-plugins.sh | 3 +++
.../src/main/assembly/dolphinscheduler-bin.xml | 5 +++++
dolphinscheduler-ui/pom.xml | 7 +++++++
script/install-plugins.sh | 10 +++-------
tools/dependencies/known-dependencies.txt | 1 +
14 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/docs/docs/en/contribute/backend/spi/alert.md
b/docs/docs/en/contribute/backend/spi/alert.md
index b7934242e1..0b39a4e485 100644
--- a/docs/docs/en/contribute/backend/spi/alert.md
+++ b/docs/docs/en/contribute/backend/spi/alert.md
@@ -50,7 +50,7 @@ Under this package, we currently only encapsulate RadioParam,
TextParam, and Pas
AbsPluginParams This class is the base class of all parameters, RadioParam
these classes all inherit this class. Each DS alert plug-in will return a list
of AbsPluginParams in the implementation of AlertChannelFactory.
-The specific design of alert_spi can be seen in the issue: [Alert Plugin
Design](https://github.com/apache/incubator-dolphinscheduler/issues/3049)
+The specific design of alert_spi can be seen in the issue: [Alert Plugin
Design](https://github.com/apache/dolphinscheduler/issues/3049)
#### Alert SPI built-in implementation
diff --git a/docs/docs/en/contribute/release.md
b/docs/docs/en/contribute/release.md
index bcac545072..a80cff5e3b 100644
--- a/docs/docs/en/contribute/release.md
+++ b/docs/docs/en/contribute/release.md
@@ -195,6 +195,8 @@ We need to update some documentation before the Maven
release. For example, to r
- `deploy/kubernetes/dolphinscheduler`:
- `Chart.yaml`: `appVersion` and `version` needs to be updated to x.y.z
- `values.yaml`: `image.tag` needs to be updated to x.y.z
+ - `config`
+ - `install-plugins.sh`: `dev-SNAPSHOT` needs to be updated to x.y.z
- Version in the docs:
- Change the placeholder `<version>`(except `pom`) to the `x.y.z` in
directory `docs`
- Add new history version
diff --git a/docs/docs/en/guide/task/dinky.md b/docs/docs/en/guide/task/dinky.md
index b758fa8691..66ae5f6868 100644
--- a/docs/docs/en/guide/task/dinky.md
+++ b/docs/docs/en/guide/task/dinky.md
@@ -3,7 +3,7 @@
## Overview
Use `Dinky Task` to create a dinky-type task and support one-stop development,
debugging, operation and maintenance of FlinkSql, Flink jar and SQL. When the
worker executes `Dinky Task`,
-it will call `Dinky API` to trigger dinky task. Click
[here](http://www.dlink.top/) for details about `Dinky`.
+it will call `Dinky API` to trigger dinky task. Click
[here](https://www.dinky.org.cn/) for details about `Dinky`.
## Create Task
diff --git a/docs/docs/en/guide/task/mlflow.md
b/docs/docs/en/guide/task/mlflow.md
index d500e4cbf6..a29a7317d7 100644
--- a/docs/docs/en/guide/task/mlflow.md
+++ b/docs/docs/en/guide/task/mlflow.md
@@ -46,14 +46,14 @@ The MLflow plugin currently supports and will support the
following:
**Task Parameters**
-| **Parameter** |
**Description** [...]
-|------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
-| Register Model | Register the model or not. If register is selected,
the following parameters are expanded.
[...]
-| Model Name | The registered model name is added to the original
model version and registered as Production.
[...]
-| Data Path | The absolute path of the file or folder. Ends with
.csv for file or contain train.csv and test.csv for folder（In the suggested
way, users should build their own test sets for model evaluation.
[...]
-| Parameters | Parameter when initializing the algorithm/AutoML
model, which can be empty. For example, parameters
`"time_budget=30;estimator_list=['lgbm']"` for flaml. The convention will be
passed with '; ' shards each parameter, using the name before the equal sign as
the parameter name, and using the name after the equal sign to get the
corresponding parameter value through `python eval()`. <ul><li>[Logistic
Regression](https://scikit-learn.org/stable/modules/generated/sk [...]
-| Algorithm | The selected algorithm currently supports `LR`,
`SVM`, `LightGBM` and `XGboost` based on
[scikit-learn](https://scikit-learn.org/) form.
[...]
-| Parameter Search Space | Parameter search space when running the
corresponding algorithm, which can be empty. For example, the parameter
`max_depth=[5, 10];n_estimators=[100, 200]` for lightgbm. The convention will
be passed with '; 'shards each parameter, using the name before the equal sign
as the parameter name, and using the name after the equal sign to get the
corresponding parameter value through `python eval()`.
[...]
+| **Parameter** |
**Description** [...]
+|------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
+| Register Model | Register the model or not. If register is selected,
the following parameters are expanded.
[...]
+| Model Name | The registered model name is added to the original
model version and registered as Production.
[...]
+| Data Path | The absolute path of the file or folder. Ends with
.csv for file or contain train.csv and test.csv for folder（In the suggested
way, users should build their own test sets for model evaluation.
[...]
+| Parameters | Parameter when initializing the algorithm/AutoML
model, which can be empty. For example, parameters
`"time_budget=30;estimator_list=['lgbm']"` for flaml. The convention will be
passed with '; ' shards each parameter, using the name before the equal sign as
the parameter name, and using the name after the equal sign to get the
corresponding parameter value through `python eval()`. <ul><li>[Logistic
Regression](https://scikit-learn.org/stable/modules/generated/sk [...]
+| Algorithm | The selected algorithm currently supports `LR`,
`SVM`, `LightGBM` and `XGboost` based on
[scikit-learn](https://scikit-learn.org/) form.
[...]
+| Parameter Search Space | Parameter search space when running the
corresponding algorithm, which can be empty. For example, the parameter
`max_depth=[5, 10];n_estimators=[100, 200]` for lightgbm. The convention will
be passed with '; 'shards each parameter, using the name before the equal sign
as the parameter name, and using the name after the equal sign to get the
corresponding parameter value through `python eval()`.
[...]
#### AutoML
diff --git a/docs/docs/zh/contribute/backend/spi/alert.md
b/docs/docs/zh/contribute/backend/spi/alert.md
index 78dec78224..702a7c0da3 100644
--- a/docs/docs/zh/contribute/backend/spi/alert.md
+++ b/docs/docs/zh/contribute/backend/spi/alert.md
@@ -50,7 +50,7 @@ org.apache.dolphinscheduler.spi.params
AbsPluginParams 该类是所有参数的基类，RadioParam 这些类都继承了该类。每个 DS 的告警插件都会在
AlertChannelFactory 的实现中返回一个 AbsPluginParams 的 list。
-alert_spi 具体设计可见 issue：[Alert Plugin
Design](https://github.com/apache/incubator-dolphinscheduler/issues/3049)
+alert_spi 具体设计可见 issue：[Alert Plugin
Design](https://github.com/apache/dolphinscheduler/issues/3049)
#### Alert SPI 内置实现
diff --git a/docs/docs/zh/contribute/release.md
b/docs/docs/zh/contribute/release.md
index cdd7aeb171..842569cf41 100644
--- a/docs/docs/zh/contribute/release.md
+++ b/docs/docs/zh/contribute/release.md
@@ -199,6 +199,8 @@ SVN_DIR=<PATH-TO-SVN-ROOT> # to keep binary package
checkout from SVN, the sub
- `deploy/kubernetes/dolphinscheduler`:
- `Chart.yaml`: `appVersion` 和 `version` 版本更新为 x.y.z
- `values.yaml`: `image.tag` 版本更新为 x.y.z
+ - `config`
+ - `install-plugins.sh`: `version` 版本 `dev-SNAPSHOT` 更新为 x.y.z
- 修改文档（docs 模块）中的版本号:
- 将 `docs` 文件夹下文件的占位符 `<version>` (除了 pom.xml 相关的) 修改成 `x.y.z`
- 新增历史版本
diff --git a/docs/docs/zh/guide/task/dinky.md b/docs/docs/zh/guide/task/dinky.md
index 6b7ab3cc4b..ef02519f25 100644
--- a/docs/docs/zh/guide/task/dinky.md
+++ b/docs/docs/zh/guide/task/dinky.md
@@ -3,7 +3,7 @@
## Overview
`Dinky`任务类型，用于创建并执行`Dinky`类型任务以支撑一站式的开发、调试、运维 FlinkSQL、Flink Jar、SQL。worker
执行该任务的时候，会通过`Dinky API`触发`Dinky 的作业`。
-点击[这里](http://www.dlink.top/) 获取更多关于`Dinky`的信息。
+点击[这里](https://www.dinky.org.cn/) 获取更多关于`Dinky`的信息。
## Create Task
diff --git a/docs/docs/zh/guide/task/mlflow.md
b/docs/docs/zh/guide/task/mlflow.md
index 12d2bc5089..b4677063c3 100644
--- a/docs/docs/zh/guide/task/mlflow.md
+++ b/docs/docs/zh/guide/task/mlflow.md
@@ -45,13 +45,13 @@ MLflow 组件用于执行 MLflow 任务，目前包含Mlflow Projects，和MLflo
-| **任务参数** |
**描述**
[...]
-|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
-| 注册模型 | 是否注册模型，若选择注册，则会展开以下参数
[...]
-| 注册的模型名称 | 注册的模型名称，会在原来的基础上加上一个模型版本，并注册为Production
[...]
-| 数据路径 |
文件/文件夹的绝对路径，若文件需以.csv结尾（自动切分训练集与测试集），文件夹需包含train.csv和test.csv（建议方式，用户应自行构建测试集用于模型评估）。详细的参数列表如下:
[LogisticRegression](https://scikit-learn.org/stable/modules/generated/sklearn.linear_model.LogisticRegression.html#sklearn.linear_model.LogisticRegression)
[SVM](https://scikit-learn.org/stable/modules/generated/sklearn.svm.SVC.html?highlight=svc#sklearn.svm.SVC)
[lightgbm](https://lightgbm.readthedocs.io/en/latest/pythonapi/lightgbm.LGBMClassifier.html#lightgbm.LGBMClassifier)
[...]
-| 算法 | 选择的算法，目前基于 [scikit-learn](https://scikit-learn.org/) 形式支持
`lr`，`svm`，`lightgbm`，`xgboost`
[...]
-| 参数搜索空间 | 运行对应算法的参数搜索空间，可为空。如针对lightgbm 的 `max_depth=[5,
10];n_estimators=[100, 200]` 则会进行对应搜索。约定传入后会以;切分各个参数，等号前的名字作为参数名，等号后的名字将以python
eval执行得到对应的参数值
[...]
+| **任务参数** |
**描述**
[...]
+|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
+| 注册模型 | 是否注册模型，若选择注册，则会展开以下参数
[...]
+| 注册的模型名称 | 注册的模型名称，会在原来的基础上加上一个模型版本，并注册为Production
[...]
+| 数据路径 |
文件/文件夹的绝对路径，若文件需以.csv结尾（自动切分训练集与测试集），文件夹需包含train.csv和test.csv（建议方式，用户应自行构建测试集用于模型评估）。详细的参数列表如下:
[LogisticRegression](https://scikit-learn.org/stable/modules/generated/sklearn.linear_model.LogisticRegression.html#sklearn.linear_model.LogisticRegression)
[SVM](https://scikit-learn.org/stable/modules/generated/sklearn.svm.SVC.html?highlight=svc#sklearn.svm.SVC)
[lightgbm](https://lightgbm.readthedocs.io/en/latest/pythonapi/lightgbm.LGBMClassifier.html#lightgbm.LGBMClassifier)
[...]
+| 算法 | 选择的算法，目前基于 [scikit-learn](https://scikit-learn.org/) 形式支持
`lr`，`svm`，`lightgbm`，`xgboost`
[...]
+| 参数搜索空间 | 运行对应算法的参数搜索空间，可为空。如针对lightgbm 的 `max_depth=[5,
10];n_estimators=[100, 200]` 则会进行对应搜索。约定传入后会以;切分各个参数，等号前的名字作为参数名，等号后的名字将以python
eval执行得到对应的参数值
[...]
#### AutoML
diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml
index 2b63dee475..c5d304c7e6 100644
--- a/dolphinscheduler-dist/pom.xml
+++ b/dolphinscheduler-dist/pom.xml
@@ -187,6 +187,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/dolphinscheduler-dist/src/main/assembly/assembly-plugins.sh
b/dolphinscheduler-dist/src/main/assembly/assembly-plugins.sh
index 80f7dd6860..da85c23c19 100755
--- a/dolphinscheduler-dist/src/main/assembly/assembly-plugins.sh
+++ b/dolphinscheduler-dist/src/main/assembly/assembly-plugins.sh
@@ -74,6 +74,9 @@ do
done
done
+# create symbolic link for standalone-server
+cd $BIN_DIR/standalone-server && ln -s ../tools/sql/sql sql
+
# repack bin tar
BIN_TAR_FILE_NAME=$(basename $BIN_TAR_FILE)
cd $DIST_DIR && tar -zcf $BIN_TAR_FILE_NAME apache-dolphinscheduler-*-bin
diff --git a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
index 1dba381630..eaf5461ee8 100644
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
@@ -122,6 +122,11 @@
<outputDirectory>.</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>${basedir}/../.mvn/</directory>
+ <outputDirectory>.mvn</outputDirectory>
+ </fileSet>
+
<fileSet>
<directory>${basedir}/release-docs</directory>
<outputDirectory>.</outputDirectory>
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 117af4ed9f..ec518e2903 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -77,6 +77,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/script/install-plugins.sh b/script/install-plugins.sh
index 67bb05d16d..ece1a6f033 100755
--- a/script/install-plugins.sh
+++ b/script/install-plugins.sh
@@ -24,15 +24,11 @@ set -eo pipefail
# get ds home
DOLPHINSCHEDULER_HOME=$(cd $(dirname $0);cd ../;pwd)
-# plugins default version is 3.3.0, you can also choose a custom version. eg:
3.3.0: bash install-plugins.sh 3.3.0
-version=3.3.0
+# plugins default version is dev-SNAPSHOT, you can also choose a custom
version. eg: dev-SNAPSHOT: bash install-plugins.sh dev-SNAPSHOT
+version=dev-SNAPSHOT
if [ -n "$1" ]; then
- if [ "$1" == "dev" ]; then
- version="dev-SNAPSHOT"
- else
- version="$1"
- fi
+ version="$1"
fi
echo "Install Dolphinscheduler plugins, usage version is ${version}"
diff --git a/tools/dependencies/known-dependencies.txt
b/tools/dependencies/known-dependencies.txt
index 30d0749b49..ee686bd3e1 100644
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -447,4 +447,5 @@ semver-5.7.2.jar
sigmund-1.0.1.jar
wrappy-1.0.2.jar
yallist-2.1.2.jar
+maven-wrapper.jar
