You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/06 05:47:59 UTC
[shardingsphere] branch master updated: Update release guide for ShardingSphere about Spring (#22691)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 33f3796fc0a Update release guide for ShardingSphere about Spring (#22691)
33f3796fc0a is described below
commit 33f3796fc0ab5a671570fa4794c3a5ecd8af2956
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Tue Dec 6 13:47:52 2022 +0800
Update release guide for ShardingSphere about Spring (#22691)
---
.../content/involved/release/shardingsphere.cn.md | 59 ++--------------------
.../content/involved/release/shardingsphere.en.md | 59 ++--------------------
2 files changed, 10 insertions(+), 108 deletions(-)
diff --git a/docs/community/content/involved/release/shardingsphere.cn.md b/docs/community/content/involved/release/shardingsphere.cn.md
index 374538d2517..fb9e67fb536 100644
--- a/docs/community/content/involved/release/shardingsphere.cn.md
+++ b/docs/community/content/involved/release/shardingsphere.cn.md
@@ -173,29 +173,7 @@ https://github.com/apache/shardingsphere/blob/${RELEASE.VERSION}-release/RELEASE
GPG 签名文件和哈希校验文件的下载连接应该使用这个前缀：`https://downloads.apache.org/shardingsphere/`。
-### 4. 更新 ShardingSphere-JDBC Spring 文档中 xsd 文件链接
-
-更新目录 `docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace` 下文档内的所有 xsd 链接。
-
-将：
-```
-http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding-${PREVIOUS.RELEASE.VERSION}.xsd
-```
-
-更新为：
-```
-http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding-${RELEASE.VERSION}.xsd
-```
-
-参考命令：
-```shell
-cd docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace
-grep -l -r "${PREVIOUS.RELEASE.VERSION}" . | xargs sed -i -e "s/${PREVIOUS.RELEASE.VERSION}/${RELEASE.VERSION}/g"
-```
-
-在文档中指定 xsd 版本，而不是直接使用 `sharding.xsd`，是为了让历史版本的文档能够对应到正确版本的 xsd 文件。
-
-### 5. 修改 README 文件
+### 4. 修改 README 文件
更新 `README.md` 和 `README_ZH.md` 里的 `${RELEASE.VERSION}` 和 `${NEXT.RELEASE.VERSION}`。
@@ -572,49 +550,22 @@ svn del -m "Archiving release ${PREVIOUS.RELEASE.VERSION}" https://dist.apache.o
参考：[Release Download Pages for Projects](https://infra.apache.org/release-download-pages.html)。
-### 6. 上传 Spring namespace xsd 文件至官方网站
-
-提交 pull request 将源码中的 xsd 文件以及发布版本的 xsd 文件上传至 https://github.com/apache/shardingsphere-doc/tree/asf-site/schema/shardingsphere
-
-应上传的文件列表如下：
-
-- datasource.xsd
-- datasource-${RELEASE.VERSION}.xsd
-- mode/standalone/repository.xsd
-- mode/standalone/repository-${RELEASE.VERSION}.xsd
-- mode/cluster/repository.xsd
-- mode/cluster/repository-${RELEASE.VERSION}.xsd
-- sharding.xsd
-- sharding-${RELEASE.VERSION}.xsd
-- encrypt.xsd
-- encrypt-${RELEASE.VERSION}.xsd
-- readwrite-splitting.xsd
-- readwrite-splitting-${RELEASE.VERSION}.xsd
-- shadow.xsd
-- shadow-${RELEASE.VERSION}.xsd
-- database-discovery.xsd
-- database-discovery-${RELEASE.VERSION}.xsd
-- sql-parser.xsd
-- sql-parser-${RELEASE.VERSION}.xsd
-- sql-translator.xsd
-- sql-translator-${RELEASE.VERSION}.xsd
-
-### 7. 官网首页增加发布版本文档入口
+### 6. 官网首页增加发布版本文档入口
参考以下代码：
- [英文首页](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. 更新示例版本
+### 7. 更新示例版本
更新 examples 模块的 pom，将版本由 ${RELEASE.VERSION} 替换为 ${NEXT.DEVELOPMENT.VERSION}，并提交 PR 到发布分支。
-### 9. 合并 GitHub 的 release 分支到 `master`，合并完成后删除 release 分支
+### 8. 合并 GitHub 的 release 分支到 `master`，合并完成后删除 release 分支
确认下载页面中的新发布版本的链接可用后，在 GitHub 页面创建 Pull Request 将分支 `${RELEASE.VERSION}-release` 合并到 `master`。
如果代码存在冲突，可以先把 master 分支合并到 `${RELEASE.VERSION}-release`。
-### 10. 邮件通知版本发布完成
+### 9. 邮件通知版本发布完成
发送邮件到 `dev@shardingsphere.apache.org` 和 `announce@apache.org` 通知完成版本发布。
diff --git a/docs/community/content/involved/release/shardingsphere.en.md b/docs/community/content/involved/release/shardingsphere.en.md
index 91395fb521f..f90835ec3a3 100644
--- a/docs/community/content/involved/release/shardingsphere.en.md
+++ b/docs/community/content/involved/release/shardingsphere.en.md
@@ -175,29 +175,7 @@ Update the following pages:
GPG signatures and hashes (SHA* etc) should be prefixed with `https://downloads.apache.org/shardingsphere/`
-### 4. Update links of Spring xsd in documents of ShardingSphere-JDBC
-
-Update all links of xsd in documents under `docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace`.
-
-Update from:
-```
-http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding-${PREVIOUS.RELEASE.VERSION}.xsd
-```
-
-to:
-```
-http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding-${RELEASE.VERSION}.xsd
-```
-
-Sample commands:
-```shell
-cd docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace
-grep -l -r "${PREVIOUS.RELEASE.VERSION}" . | xargs sed -i -e "s/${PREVIOUS.RELEASE.VERSION}/${RELEASE.VERSION}/g"
-```
-
-Specifying version of xsd instead of using `sharding.xsd`, is to make legacy documents can be mapped to corresponding version of xsd.
-
-### 5. Update README files
+### 4. Update README files
Update `${RELEASE.VERSION}` and `${NEXT.RELEASE.VERSION}` in README.md and README_ZH.md.
@@ -582,49 +560,22 @@ Incubating stage versions will be archived automatically in [Incubator Archive r
Refer to [Release Download Pages for Projects](https://infra.apache.org/release-download-pages.html).
-### 6. Upload xsd files of Spring namespace to official website
-
-Submit a pull request to upload the xsd files of Spring namespace to https://github.com/apache/shardingsphere-doc/tree/asf-site/schema/shardingsphere
-
-The list of files to be uploaded is as follows:
-
-- datasource.xsd
-- datasource-${RELEASE.VERSION}.xsd
-- mode/standalone/repository.xsd
-- mode/standalone/repository-${RELEASE.VERSION}.xsd
-- mode/cluster/repository.xsd
-- mode/cluster/repository-${RELEASE.VERSION}.xsd
-- sharding.xsd
-- sharding-${RELEASE.VERSION}.xsd
-- encrypt.xsd
-- encrypt-${RELEASE.VERSION}.xsd
-- readwrite-splitting.xsd
-- readwrite-splitting-${RELEASE.VERSION}.xsd
-- shadow.xsd
-- shadow-${RELEASE.VERSION}.xsd
-- database-discovery.xsd
-- database-discovery-${RELEASE.VERSION}.xsd
-- sql-parser.xsd
-- sql-parser-${RELEASE.VERSION}.xsd
-- sql-translator.xsd
-- sql-translator-${RELEASE.VERSION}.xsd
-
-### 7. Add entrance of documents of the new release into home page
+### 6. Add entrance of documents of the new release into home page
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. Update Example Version
+### 7. 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
+### 8. 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.
-### 10. Announce release completed by email
+### 9. Announce release completed by email
Send e-mail to `dev@shardingsphere.apache.org` and `announce@apache.org` to announce the release is finished