You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/10/24 15:49:26 UTC
[shardingsphere] branch master updated: Update release doc with
example version modification (#7907)
This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 707ce15 Update release doc with example version modification (#7907)
707ce15 is described below
commit 707ce15bd370a149e148d064c89ca951e3e11079
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Oct 24 23:49:04 2020 +0800
Update release doc with example version modification (#7907)
---
docs/community/content/contribute/release-elasticjob.cn.md | 8 ++++----
docs/community/content/contribute/release-elasticjob.en.md | 6 +++---
docs/community/content/contribute/release.cn.md | 8 ++++----
docs/community/content/contribute/release.en.md | 4 +++-
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/docs/community/content/contribute/release-elasticjob.cn.md b/docs/community/content/contribute/release-elasticjob.cn.md
index 97818ee..1d31823 100644
--- a/docs/community/content/contribute/release-elasticjob.cn.md
+++ b/docs/community/content/contribute/release-elasticjob.cn.md
@@ -31,14 +31,16 @@ chapter = true
</servers>
</settings>
```
-**2. 更新版本说明**
+**2. 更新版本说明和示例版本**
在Github主干上更新如下文件，并提交PR到主干：
-
+
```
https://github.com/apache/shardingsphere-elasticjob/blob/master/RELEASE-NOTES.md
```
+更新`examples`模块的pom，将版本由${CURRENT.VERSION}替换为${RELEASE.VERSION}。
+
**3. 创建发布分支**
假设从github下载的ElasticJob源代码在`~/elasticjob/`目录；假设即将发布的版本为`${RELEASE.VERSION}`。
@@ -73,8 +75,6 @@ mvn release:prepare -Prelease -Darguments="-DskipTests" -DautoVersionSubmodules=
mvn release:clean
```
-然后准备执行发布。发布之前需要更新`examples`模块的pom，将版本由${CURRENT.VERSION}替换为${RELEASE.VERSION}。
-
```shell
mvn release:prepare -Prelease -Darguments="-DskipTests" -DautoVersionSubmodules=true -DpushChanges=false -Dusername=${Github用户名}
```
diff --git a/docs/community/content/contribute/release-elasticjob.en.md b/docs/community/content/contribute/release-elasticjob.en.md
index cd8765d..dd8d3b9 100644
--- a/docs/community/content/contribute/release-elasticjob.en.md
+++ b/docs/community/content/contribute/release-elasticjob.en.md
@@ -32,7 +32,7 @@ For encryption settings, please see [here](http://maven.apache.org/guides/mini/g
</settings>
```
-**2. Update Release Notes**
+**2. Update Release Notes And Example Version**
Update the following file in master branch, and submit a PR to master branch:
@@ -40,6 +40,8 @@ Update the following file in master branch, and submit a PR to master branch:
https://github.com/apache/shardingsphere-elasticjob/blob/master/RELEASE-NOTES.md
```
+Update the POM of the module `examples`, changing the version from ${CURRENT.VERSION} to ${RELEASE.VERSION}.
+
**3. Create Release Branch**
Suppose ElasticJob source codes downloaded from github is under `~/elasticjob/` directory and the version to be released is `${RELEASE.VERSION}`.
@@ -74,8 +76,6 @@ First, clean local pre-release check information.
mvn release:clean
```
-Then, prepare to execute the release. Before releasing, update the POM of the module `examples`, changing the version from ${CURRENT.VERSION} to ${RELEASE.VERSION}.
-
```shell
mvn release:prepare -Prelease -Darguments="-DskipTests" -DautoVersionSubmodules=true -DpushChanges=false -Dusername=${Github username}
```
diff --git a/docs/community/content/contribute/release.cn.md b/docs/community/content/contribute/release.cn.md
index 451f76e..5a928d3 100644
--- a/docs/community/content/contribute/release.cn.md
+++ b/docs/community/content/contribute/release.cn.md
@@ -123,14 +123,16 @@ gpg --keyserver hkp://pool.sks-keyservers.net --send-key 700E6065
</settings>
```
-**2. 更新版本说明**
+**2. 更新版本说明和示例版本**
在Github主干上更新如下文件，并提交PR到主干：
-
+
```
https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md
```
+更新`examples`模块的pom，将版本由${CURRENT.VERSION}替换为${RELEASE.VERSION}。
+
**3. 创建发布分支**
假设从github下载的ShardingSphere源代码在`~/shardingsphere/`目录；假设即将发布的版本为`${RELEASE.VERSION}`。
@@ -165,8 +167,6 @@ mvn release:prepare -Prelease -Darguments="-DskipTests" -DautoVersionSubmodules=
mvn release:clean
```
-然后准备执行发布。发布之前需要更新examples和shardingsphere-ui两个模块的pom，将版本由${CURRENT.VERSION}替换为${RELEASE.VERSION}。
-
```shell
mvn release:prepare -Prelease -Darguments="-DskipTests" -DautoVersionSubmodules=true -DpushChanges=false -Dusername=${Github用户名}
```
diff --git a/docs/community/content/contribute/release.en.md b/docs/community/content/contribute/release.en.md
index ca6976b..cec3d64 100644
--- a/docs/community/content/contribute/release.en.md
+++ b/docs/community/content/contribute/release.en.md
@@ -124,7 +124,7 @@ For encryption settings, please see [here](http://maven.apache.org/guides/mini/g
</settings>
```
-**2. Update Release Notes**
+**2. Update Release Notes And Example Version**
Update the following file in master branch, and submit a PR to master branch:
@@ -132,6 +132,8 @@ Update the following file in master branch, and submit a PR to master branch:
https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md
```
+Update the POM of the module `examples`, changing the version from ${CURRENT.VERSION} to ${RELEASE.VERSION}.
+
**3. Create Release Branch**
Suppose ShardingSphere source codes downloaded from github is under `~/shardingsphere/` directory and the version to be released is `4.0.0-RC`.