Skip to content

Commit 9be0b0a

Browse files
author
SbloodyS
committed
release prepare
1 parent 94b357f commit 9be0b0a

File tree

25 files changed

+403
-395
lines changed

25 files changed

+403
-395
lines changed

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache DolphinScheduler
2-
Copyright 2019-2024 The Apache Software Foundation
2+
Copyright 2019-2025 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).

deploy/docker/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# under the License.
1717
#
1818
HUB=apache
19-
TAG=dev
19+
TAG=3.3.1
2020

2121
TZ=Asia/Shanghai
2222
DATABASE=postgresql

deploy/kubernetes/dolphinscheduler/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ type: application
3535

3636
# This is the chart version. This version number should be incremented each time you make changes
3737
# to the chart and its templates, including the app version.
38-
version: 3.1.0
38+
version: 3.3.1
3939

4040
# This is the version number of the application being deployed. This version number should be
4141
# incremented each time you make changes to the application.
42-
appVersion: 3.1.0
42+
appVersion: 3.3.1
4343

4444
dependencies:
4545
- name: postgresql

deploy/kubernetes/dolphinscheduler/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ image:
3333
# -- Docker image repository for the DolphinScheduler
3434
registry: apache
3535
# -- Docker image version for the DolphinScheduler
36-
tag: latest
36+
tag: 3.3.1
3737
# -- Image pull policy. Options: Always, Never, IfNotPresent
3838
pullPolicy: "IfNotPresent"
3939
# -- Specify a imagePullSecrets

docs/configs/docsdev.js

Lines changed: 294 additions & 294 deletions
Large diffs are not rendered by default.

docs/docs/en/contribute/release.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ SVN_DIR=<PATH-TO-SVN-ROOT> # to keep binary package checkout from SVN, the sub
176176
177177
> Note: We can use the variable directly in you bash after we set environment, without changing anything. For example, we
178178
> can use command `git clone -b "${VERSION}"-prepare https://github.com/apache/dolphinscheduler.git` to clone the release branch
179-
> and it can be successful by converting the `"${VERSION}"` to `<THE-VERSION-YOU-RELEASE>`. But you have to change `<VERSION>` manually in
180-
> some of not bash step like [vote mail](#vote-procedure), we are using `<VERSION>` instead of `"${VERSION}"` to notice release
179+
> and it can be successful by converting the `"${VERSION}"` to `<THE-VERSION-YOU-RELEASE>`. But you have to change `3.3.1` manually in
180+
> some of not bash step like [vote mail](#vote-procedure), we are using `3.3.1` instead of `"${VERSION}"` to notice release
181181
> manager they have to change by hand.
182182
183183
### Update Documentation or Code Version
@@ -198,7 +198,7 @@ We need to update some documentation before the Maven release. For example, to r
198198
- `config`
199199
- `install-plugins.sh`: `dev-SNAPSHOT` needs to be updated to x.y.z
200200
- Version in the docs:
201-
- Change the placeholder `<version>`(except `pom`) to the `x.y.z` in directory `docs`
201+
- Change the placeholder `3.3.1`(except `pom`) to the `x.y.z` in directory `docs`
202202
- Add new history version
203203
- `docs/docs/en/history-versions.md` and `docs/docs/zh/history-versions.md`: Add the new version and link for `x.y.z`
204204
- `docs/configs/docsdev.js`: change `/dev/` to `/x.y.z/`, **DO NOT** change this filename, is will be auto change by website tools.
@@ -360,7 +360,7 @@ svn --username="${A_USERNAME}" commit -m "release ${VERSION}"
360360
361361
#### Check source package
362362
363-
Decompress `apache-dolphinscheduler-<VERSION>-src.tar.gz` then check the following items:
363+
Decompress `apache-dolphinscheduler-3.3.1-src.tar.gz` then check the following items:
364364
365365
- Check whether source tarball is oversized for including nonessential files
366366
- `LICENSE` and `NOTICE` files exist
@@ -373,7 +373,7 @@ Decompress `apache-dolphinscheduler-<VERSION>-src.tar.gz` then check the followi
373373
374374
#### Check binary packages
375375
376-
Decompress `apache-dolphinscheduler-<VERSION>-bin.tar.gz` to check the following items:
376+
Decompress `apache-dolphinscheduler-3.3.1-bin.tar.gz` to check the following items:
377377
378378
- `LICENSE` and `NOTICE` files exist
379379
- Correct year in `NOTICE` file
@@ -409,23 +409,23 @@ Announce the vote result: send the result vote e-mail to `dev@dolphinscheduler.a
409409
Title:
410410
411411
```txt
412-
[VOTE] Release Apache DolphinScheduler <VERSION>
412+
[VOTE] Release Apache DolphinScheduler 3.3.1
413413
```
414414
415415
Body:
416416
417417
```txt
418418
Hello DolphinScheduler Community,
419419
420-
This is a call for vote to release Apache DolphinScheduler version <VERSION>
420+
This is a call for vote to release Apache DolphinScheduler version 3.3.1
421421
422-
Release notes: https://github.com/apache/dolphinscheduler/releases/tag/<VERSION>
422+
Release notes: https://github.com/apache/dolphinscheduler/releases/tag/3.3.1
423423
424-
The release candidates: https://dist.apache.org/repos/dist/dev/dolphinscheduler/<VERSION>/
424+
The release candidates: https://dist.apache.org/repos/dist/dev/dolphinscheduler/3.3.1/
425425
426426
Maven 2 staging repository: https://repository.apache.org/content/repositories/<STAGING.REPOSITORY>/org/apache/dolphinscheduler/
427427
428-
Git tag for the release: https://github.com/apache/dolphinscheduler/tree/<VERSION>
428+
Git tag for the release: https://github.com/apache/dolphinscheduler/tree/3.3.1
429429
430430
Release Commit ID: https://github.com/apache/dolphinscheduler/commit/<SHA-VALUE>
431431
@@ -456,13 +456,13 @@ Checklist for reference:
456456
Title:
457457
458458
```txt
459-
[RESULT][VOTE] Release Apache DolphinScheduler <VERSION>
459+
[RESULT][VOTE] Release Apache DolphinScheduler 3.3.1
460460
```
461461
462462
Body:
463463
464464
```txt
465-
The vote to release Apache DolphinScheduler <VERSION> has passed.Here is the vote result,
465+
The vote to release Apache DolphinScheduler 3.3.1 has passed.Here is the vote result,
466466
467467
4 PMC member +1 votes:
468468
@@ -495,19 +495,19 @@ and then find DolphinScheduler in [apache staging repositories](https://reposito
495495
### Update Document
496496
497497
Website should be present before you send the announce mail this section will tell you how to change the website. For example,
498-
the release version is `<VERSION>`, the following updates are required(note it will take effect immediately when the PR is merged):
498+
the release version is `3.3.1`, the following updates are required(note it will take effect immediately when the PR is merged):
499499
500500
- Repository **apache/dolphinscheduler-website**:
501-
- `config/download.json`: add the download of the `<VERSION>` release package
502-
- `scripts/conf.sh`: Add new release version `<VERSION>` key-value pair to variable `DEV_RELEASE_DOCS_VERSIONS`
501+
- `config/download.json`: add the download of the `3.3.1` release package
502+
- `scripts/conf.sh`: Add new release version `3.3.1` key-value pair to variable `DEV_RELEASE_DOCS_VERSIONS`
503503
- Repository **apache/dolphinscheduler** (dev branch):
504504
- `docs/configs/site.js`:
505-
- `docsLatest`: update to `<VERSION>`
506-
- `docs0`: The `text` of two places of `en-us/zh-cn` needs to be updated to `latest(<VERSION>)`
507-
- `docs/configs/index.md.jsx`: Add `<VERSION>: docsxyzConfig` and add new `import` for the new `docsxyzConfig`
508-
- `docs/docs/en/history-versions.md` and `docs/docs/zh/history-versions.md`: Add new `<VERSION>` release docs.
505+
- `docsLatest`: update to `3.3.1`
506+
- `docs0`: The `text` of two places of `en-us/zh-cn` needs to be updated to `latest(3.3.1)`
507+
- `docs/configs/index.md.jsx`: Add `3.3.1: docsxyzConfig` and add new `import` for the new `docsxyzConfig`
508+
- `docs/docs/en/history-versions.md` and `docs/docs/zh/history-versions.md`: Add new `3.3.1` release docs.
509509
- `.github/ISSUE_TEMPLATE/bug-report.yml`: DolphinScheduler's GitHub [bug-report](https://github.com/apache/dolphinscheduler/blob/dev/.github/ISSUE_TEMPLATE/bug-report.yml)
510-
issue template have **Version** selection bottom. So after released we should add the new `<VERSION>` to
510+
issue template have **Version** selection bottom. So after released we should add the new `3.3.1` to
511511
bug-report.yml
512512
513513
### Publish Docker Image and Helm Chart
@@ -528,30 +528,30 @@ Announcement e-mail template as below:
528528
Title:
529529
530530
```txt
531-
[ANNOUNCE] Release Apache DolphinScheduler <VERSION>
531+
[ANNOUNCE] Release Apache DolphinScheduler 3.3.1
532532
```
533533
534534
Body:
535535
536536
```txt
537537
Hi all,
538538
539-
We are glad to announce the release of Apache DolphinScheduler <VERSION>. Once again I would like to express my thanks to your help.
539+
We are glad to announce the release of Apache DolphinScheduler 3.3.1. Once again I would like to express my thanks to your help.
540540
541541
Dolphin Scheduler is a distributed and easy-to-extend visual workflow scheduler system,
542542
dedicated to solving the complex task dependencies in data processing, making the scheduler system out of the box for data processing.
543543
544544
545545
Download Links: https://dolphinscheduler.apache.org/en-us/download
546546
547-
Release Notes: https://github.com/apache/dolphinscheduler/releases/tag/<VERSION>
547+
Release Notes: https://github.com/apache/dolphinscheduler/releases/tag/3.3.1
548548
549549
Website: https://dolphinscheduler.apache.org/
550550
551551
DolphinScheduler Resources:
552552
- Issue: https://github.com/apache/dolphinscheduler/issues/
553553
- Mailing list: dev@dolphinscheduler.apache.org
554-
- Documents: https://dolphinscheduler.apache.org/en-us/docs/<VERSION>/about/introduction
554+
- Documents: https://dolphinscheduler.apache.org/en-us/docs/3.3.1/about/introduction
555555
```
556556
557557
## Remove prepare branch

docs/docs/en/faq.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ A : Will hive pom
280280
<dependency>
281281
<groupId>org.apache.hive</groupId>
282282
<artifactId>hive-jdbc</artifactId>
283-
<version>2.3.9</version>
283+
3.3.12.3.9</version>
284284
</dependency>
285285
```
286286

@@ -290,7 +290,7 @@ change into
290290
<dependency>
291291
<groupId>org.apache.hive</groupId>
292292
<artifactId>hive-jdbc</artifactId>
293-
<version>1.1.0</version>
293+
3.3.11.1.0</version>
294294
</dependency>
295295
```
296296

@@ -484,7 +484,7 @@ A: 1, Edit project root dir maven config file, remove scope test property so tha
484484
<dependency>
485485
<groupId>mysql</groupId>
486486
<artifactId>mysql-connector-java</artifactId>
487-
<version>${mysql.connector.version}</version>
487+
3.3.1${mysql.connector.version}</version>
488488
<scope>test<scope>
489489
</dependency>
490490
```

docs/docs/en/guide/expansion-reduction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Attention: DolphinScheduler itself does not depend on Hadoop, Hive, Spark, but w
3030
mkdir -p /opt
3131
cd /opt
3232
# decompress
33-
tar -zxvf apache-dolphinscheduler-<version>-bin.tar.gz -C /opt
33+
tar -zxvf apache-dolphinscheduler-3.3.1-bin.tar.gz -C /opt
3434
cd /opt
35-
mv apache-dolphinscheduler-<version>-bin dolphinscheduler
35+
mv apache-dolphinscheduler-3.3.1-bin dolphinscheduler
3636
```
3737

3838
```markdown

docs/docs/en/guide/installation/kubernetes.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ If you are a new hand and want to experience DolphinScheduler functions, we reco
1616

1717
```bash
1818
# Choose the corresponding version yourself
19-
helm upgrade --install dolphinscheduler --create-namespace --namespace dolphinscheduler oci://registry-1.docker.io/apache/dolphinscheduler-helm --version <version>
19+
helm upgrade --install dolphinscheduler --create-namespace --namespace dolphinscheduler oci://registry-1.docker.io/apache/dolphinscheduler-helm --version 3.3.1
2020
```
2121

2222
These commands are used to deploy DolphinScheduler on the Kubernetes cluster by default. The [Appendix-Configuration](#appendix-configuration) section lists the parameters that can be configured during installation.
@@ -98,7 +98,7 @@ helm install keda kedacore/keda \
9898
Secondly, you need to set `worker.keda.enabled` to `true` in `values.yaml` or install the chart by:
9999

100100
```bash
101-
helm upgrade --install dolphinscheduler --create-namespace --namespace dolphinscheduler oci://registry-1.docker.io/apache/dolphinscheduler-helm --version <version> --set worker.keda.enabled=true
101+
helm upgrade --install dolphinscheduler --create-namespace --namespace dolphinscheduler oci://registry-1.docker.io/apache/dolphinscheduler-helm --version 3.3.1 --set worker.keda.enabled=true
102102
```
103103

104104
Once autoscaling enabled, the number of workers will scale between `minReplicaCount` and `maxReplicaCount` based on the states
@@ -219,9 +219,9 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n test # with test names
219219
2. Create a new `Dockerfile` to add MySQL driver:
220220

221221
```
222-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:<version>
222+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:3.3.1
223223
# For example
224-
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:<version>
224+
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.3.1
225225
226226
# Attention Please, If the build is dolphinscheduler-tools image
227227
# You need to change the following line to: COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/tools/libs
@@ -270,9 +270,9 @@ externalDatabase:
270270
2. Create a new `Dockerfile` to add MySQL or Oracle driver:
271271

272272
```
273-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:<version>
273+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:3.3.1
274274
# For example
275-
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
275+
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.3.1
276276
277277
# If you want to support MySQL Datasource
278278
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/libs
@@ -302,7 +302,7 @@ docker build -t apache/dolphinscheduler-<service>:new-driver .
302302
1. Create a new `Dockerfile` to install pip:
303303

304304
```
305-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
305+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.3.1
306306
COPY requirements.txt /tmp
307307
RUN apt-get update && \
308308
apt-get install -y --no-install-recommends python-pip && \
@@ -337,7 +337,7 @@ docker build -t apache/dolphinscheduler-worker:pip .
337337
1. Create a new `Dockerfile` to install Python 3:
338338
339339
```
340-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
340+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.3.1
341341
RUN apt-get update && \
342342
apt-get install -y --no-install-recommends python3 && \
343343
rm -rf /var/lib/apt/lists/*
@@ -490,15 +490,15 @@ For example, if you need to deploy worker to both CPU and GPU servers in a clust
490490

491491
```bash
492492
# Install master, api-server, alert-server, and other default components, but do not install worker
493-
helm upgrade --install dolphinscheduler --create-namespace --namespace dolphinscheduler oci://registry-1.docker.io/apache/dolphinscheduler-helm --version <version> --set worker.enabled=false
493+
helm upgrade --install dolphinscheduler --create-namespace --namespace dolphinscheduler oci://registry-1.docker.io/apache/dolphinscheduler-helm --version 3.3.1 --set worker.enabled=false
494494
# Disable the installation of other components, only install worker, use the self-built CPU image, deploy to CPU servers with the `x86` label through nodeselector, and use zookeeper as the external registry center
495-
helm upgrade --install dolphinscheduler-cpu-worker --create-namespace --namespace dolphinscheduler oci://registry-1.docker.io/apache/dolphinscheduler-helm --version <version> \
495+
helm upgrade --install dolphinscheduler-cpu-worker --create-namespace --namespace dolphinscheduler oci://registry-1.docker.io/apache/dolphinscheduler-helm --version 3.3.1 \
496496
--set minio.enabled=false --set postgresql.enabled=false --set zookeeper.enabled=false \
497497
--set master.enabled=false --set api.enabled=false --set alert.enabled=false \
498498
--set worker.enabled=true --set image.tag=latest-cpu --set worker.nodeSelector.cpu="x86" \
499499
--set externalRegistry.registryPluginName=zookeeper --set externalRegistry.registryServers=dolphinscheduler-zookeeper:2181
500500
# Disable the installation of other components, only install worker, use the self-built GPU image, deploy to GPU servers with the `a100` label through nodeselector, and use zookeeper as the external registry center
501-
helm upgrade --install dolphinscheduler-gpu-worker --create-namespace --namespace dolphinscheduler oci://registry-1.docker.io/apache/dolphinscheduler-helm --version <version> \
501+
helm upgrade --install dolphinscheduler-gpu-worker --create-namespace --namespace dolphinscheduler oci://registry-1.docker.io/apache/dolphinscheduler-helm --version 3.3.1 \
502502
--set minio.enabled=false --set postgresql.enabled=false --set zookeeper.enabled=false \
503503
--set master.enabled=false --set api.enabled=false --set alert.enabled=false \
504504
--set worker.enabled=true --set image.tag=latest-gpu --set worker.nodeSelector.gpu="a100" \

docs/docs/en/guide/installation/standalone.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ If you want to deploy DolphinScheduler in production, we recommend you follow [c
1212
## Preparation
1313

1414
- JDK:download [JDK][jdk] (1.8 or 11), 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.
15-
- Binary package: download the DolphinScheduler binary package at [download page](https://dolphinscheduler.apache.org/en-us/download/<version>). <!-- markdown-link-check-disable-line -->
15+
- Binary package: download the DolphinScheduler binary package at [download page](https://dolphinscheduler.apache.org/en-us/download/3.3.1). <!-- markdown-link-check-disable-line -->
1616

1717
## Download Plugin Dependencies
1818

0 commit comments

Comments
 (0)