This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 d65ce29fdf7 Update example pom version, readme.md and release document
(#20894)
d65ce29fdf7 is described below
commit d65ce29fdf73b515d38353ffb7eb6f40c98b412c
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Fri Sep 9 08:28:48 2022 +0800
Update example pom version, readme.md and release document (#20894)
---
README.md | 4 ++--
README_ZH.md | 4 ++--
docs/community/content/involved/release/shardingsphere.cn.md | 12 ++++++++----
docs/community/content/involved/release/shardingsphere.en.md | 12 ++++++++----
examples/pom.xml | 2 +-
5 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 66948980fbb..1f607be4ad0 100644
--- a/README.md
+++ b/README.md
@@ -88,9 +88,9 @@ We deeply appreciate [community
contributors](https://shardingsphere.apache.org/
🔗 For the release notes, follow this link to the relevant [GitHub
page](https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md).
-:soon: Version 5.1.3
+:soon: Version 5.2.1
-We are currently working towards our 5.1.3 milestone.
+We are currently working towards our 5.2.1 milestone.
Keep an eye on the [milestones
page](https://github.com/apache/shardingsphere/milestones) of this repo to stay
up to date.
[comment]: <> (##)
diff --git a/README_ZH.md b/README_ZH.md
index a01152b61a9..88141a3d534 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -82,9 +82,9 @@ ShardingSphere 已于 2020 年 4 月 16 日成为 [Apache 软件基金会](https
🔗 请访问
[发布说明](https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md)
获得更详细的信息.
-:soon: Version 5.1.3
+:soon: Version 5.2.1
-我们目前正在开发 5.1.3 里程碑。
+我们目前正在开发 5.2.1 里程碑。
请访问[里程碑](https://github.com/apache/shardingsphere/milestones) 获取最新信息。
##
diff --git a/docs/community/content/involved/release/shardingsphere.cn.md
b/docs/community/content/involved/release/shardingsphere.cn.md
index 5239d81e6e5..ed09264a63d 100644
--- a/docs/community/content/involved/release/shardingsphere.cn.md
+++ b/docs/community/content/involved/release/shardingsphere.cn.md
@@ -163,7 +163,7 @@ git push origin ${RELEASE.VERSION}-release
https://github.com/apache/shardingsphere/blob/${RELEASE.VERSION}-release/RELEASE-NOTES.md
```
-更新 `examples` 模块的 pom，将版本由 `${CURRENT.VERSION}` 替换为 `${RELEASE.VERSION}`，并提交
PR 到发布分支。
+更新 `examples` 模块的 pom，将版本由 `${DEVELOPMENT.VERSION}` 替换为
`${RELEASE.VERSION}`，并提交 PR 到发布分支。
### 3. 更新下载页面
@@ -197,7 +197,7 @@ grep -l -r "${PREVIOUS.RELEASE.VERSION}" . | xargs sed -i
-e "s/${PREVIOUS.RELEA
### 5. 修改 README 文件
-将 `README.md` 和 `README_ZH.md` 里的 `${PREVIOUS.RELEASE.VERSION}` 修改为
`${RELEASE.VERSION}`。
+更新 `README.md` 和 `README_ZH.md` 里的 `${RELEASE.VERSION}` 和
`${NEXT.RELEASE.VERSION}`。
## 发布 Apache Maven 中央仓库
@@ -605,12 +605,16 @@ svn del -m "Archiving release
${PREVIOUS.RELEASE.VERSION}" https://dist.apache.o
-
[英文首页](https://github.com/apache/shardingsphere-doc/blob/10fb1b5f610fe2cac00c66abe2df7a8cc30c2a18/index.html#L88-L126)
-
[中文首页](https://github.com/apache/shardingsphere-doc/blob/10fb1b5f610fe2cac00c66abe2df7a8cc30c2a18/index_zh.html#L88-L125)
-### 8. 合并 GitHub 的 release 分支到 `master`，合并完成后删除 release 分支
+### 8. 更新示例版本
+
+更新 examples 模块的 pom，将版本由 ${RELEASE.VERSION} 替换为
${NEXT.DEVELOPMENT.VERSION}，并提交 PR 到发布分支。
+
+### 9. 合并 GitHub 的 release 分支到 `master`，合并完成后删除 release 分支
确认下载页面中的新发布版本的链接可用后，在 GitHub 页面创建 Pull Request 将分支
`${RELEASE.VERSION}-release` 合并到 `master`。
如果代码存在冲突，可以先把 master 分支合并到 `${RELEASE.VERSION}-release`。
-### 9. 邮件通知版本发布完成
+### 10. 邮件通知版本发布完成
发送邮件到 `[email protected]` 和 `[email protected]` 通知完成版本发布。
diff --git a/docs/community/content/involved/release/shardingsphere.en.md
b/docs/community/content/involved/release/shardingsphere.en.md
index 86a32c3526c..dcce534ee0e 100644
--- a/docs/community/content/involved/release/shardingsphere.en.md
+++ b/docs/community/content/involved/release/shardingsphere.en.md
@@ -165,7 +165,7 @@ Update the following file in release branch, and submit a
PR to release branch:
https://github.com/apache/shardingsphere/blob/${RELEASE.VERSION}-release/RELEASE-NOTES.md
```
-Update the POM of the module `examples`, changing the version from
${CURRENT.VERSION} to ${RELEASE.VERSION}, and submit a PR to release branch.
+Update the POM of the module `examples`, changing the version from
${DEVELOPMENT.VERSION} to ${RELEASE.VERSION}, and submit a PR to release branch.
### 3. Update the download page
@@ -199,7 +199,7 @@ Specifying version of xsd instead of using `sharding.xsd`,
is to make legacy doc
### 5. Update README files
-Update `${PREVIOUS.RELEASE.VERSION}` to `${RELEASE.VERSION}` in README.md and
README_ZH.md
+Update `${RELEASE.VERSION}` and `${NEXT.RELEASE.VERSION}` in README.md and
README_ZH.md.
## Apache Maven Central Repository Release
@@ -615,12 +615,16 @@ Refer to:
- [English home
page](https://github.com/apache/shardingsphere-doc/blob/10fb1b5f610fe2cac00c66abe2df7a8cc30c2a18/index.html#L88-L126)
- [Chinese home
page](https://github.com/apache/shardingsphere-doc/blob/10fb1b5f610fe2cac00c66abe2df7a8cc30c2a18/index_zh.html#L88-L125)
-### 8. Merge release branch to `master` and delete release branch on GitHub
+### 8. Update Example Version
+
+Update the POM of the module examples, changing the version from
${RELEASE.VERSION} to ${NEXT.DEVELOPMENT.VERSION}, and submit a PR to release
branch.
+
+### 9. Merge release branch to `master` and delete release branch on GitHub
After confirmed that download links of new release in download pages are
available, create a Pull Request on GitHub to merge
`${RELEASE.VERSION}-release` into `master.
If code conflicted, you may merge `master` into `${RELEASE.VERSION}-release`
before merging Pull Request.
-### 9. Announce release completed by email
+### 10. Announce release completed by email
Send e-mail to `[email protected]` and `[email protected]` to
announce the release is finished
diff --git a/examples/pom.xml b/examples/pom.xml
index 525dcb1b958..77f27bc9bf3 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -36,7 +36,7 @@
</modules>
<properties>
- <revision>5.2.0</revision>
+ <revision>5.2.1-SNAPSHOT</revision>
<java.version>1.8</java.version>
<maven.version.range>[3.0.4,)</maven.version.range>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
