You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tubemq.apache.org by gi...@apache.org on 2020/09/28 11:36:53 UTC
[incubator-tubemq-website] branch asf-site updated: Automated
deployment: Mon Sep 28 11:36:40 UTC 2020
3b9228c6aba86a7fdfc1f4f40dc2869148fcb2f3
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new c630d55 Automated deployment: Mon Sep 28 11:36:40 UTC 2020 3b9228c6aba86a7fdfc1f4f40dc2869148fcb2f3
c630d55 is described below
commit c630d5546fddbccfe14e52c5d3fb19d0e456d419
Author: gosonzhang <go...@users.noreply.github.com>
AuthorDate: Mon Sep 28 11:36:40 2020 +0000
Automated deployment: Mon Sep 28 11:36:40 UTC 2020 3b9228c6aba86a7fdfc1f4f40dc2869148fcb2f3
---
docs/en-us/development/how-to-release.md | 25 ++++++---------------
docs/zh-cn/development/how-to-release.md | 24 +++++---------------
en-us/docs/development/how-to-release.html | 35 +++++++++---------------------
en-us/docs/development/how-to-release.json | 2 +-
en-us/docs/development/how-to-release.md | 25 ++++++---------------
zh-cn/docs/development/how-to-release.html | 35 +++++++++---------------------
zh-cn/docs/development/how-to-release.json | 2 +-
zh-cn/docs/development/how-to-release.md | 24 +++++---------------
8 files changed, 48 insertions(+), 124 deletions(-)
diff --git a/docs/en-us/development/how-to-release.md b/docs/en-us/development/how-to-release.md
index 64ffd0d..6c708e5 100644
--- a/docs/en-us/development/how-to-release.md
+++ b/docs/en-us/development/how-to-release.md
@@ -133,10 +133,10 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
```shell
➜ ~ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq /tmp/tubemq-dist-dev
-# 这个步骤比较慢，会把所有版本都拷贝下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
+# 这个步骤比较慢，会把所有版本都考下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
➜ ~ cd tubemq-dist-dev
➜ tubemq-dist-dev ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-dev ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-dev ~ svn add .
➜ tubemq-dist-dev ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
@@ -145,8 +145,8 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
```shell
➜ ~ svn co https://dist.apache.org/repos/dist/release/incubator/tubemq /tmp/tubemq-dist-release
➜ ~ cd tubemq-dist-release
-➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-release ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS
+➜ tubemq-dist-release ~ svn add .
➜ tubemq-dist-release ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
@@ -194,28 +194,17 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
## 3. 编译打包
### 3.1 准备分支
- 从主干分支拉取新分支作为发布分支，release-${release_version}
-
- 更新`CHANGES.md`
-
- 检查代码是否正常，包括编译成功、单元测试全部成功，RAT检查成功等等
-
- ```shell
- # build检查
- $ mvn clean package -Dmaven.javadoc.skip=true
- # RAT检查
- $ mvn apache-rat:check
- ```
-
- 更改版本号
+
### 3.2 创建tag
> 创建tag前，要确保代码已经检查无误，包括：编译成功、单元测试全部成功，RAT检查成功等
**创建一个带签名的tag**
```shell
-$ git tag -s ${release_version}-${rc_version} -m "Tagging the ${release_version} first Releae Candidate (Candidates start at zero)"
-# 如果遇到错误 gpg: signing failed: secret key not available，先配置下私钥
-$ git config user.signingkey ${KEY_ID}
+git tag -s ${release_version}-${rc_version} -m "Tagging the ${release_version} first Releae Candidate (Candidates start at zero)"
```
### 3.3 打包源码
@@ -287,7 +276,7 @@ svn commit -m 'prepare for ${release_version} ${rc_version}'# 提交至svn远程
```
### 4.4 关闭Apache Staging仓库
> 请确保所有的artifact都是ok的
-1. **先登录**http://repository.apache.org , 使用Apache账号登录
+1. 登录http://repository.apache.org , 使用Apache账号登录
2. 点击左侧的Staging repositories，
3. 搜索TubeMQ关键字，选择你最近上传的仓库
4. 点击上方的Close按钮，这个过程会进行一系列检查
diff --git a/docs/zh-cn/development/how-to-release.md b/docs/zh-cn/development/how-to-release.md
index cdf5ca0..2d3bfab 100644
--- a/docs/zh-cn/development/how-to-release.md
+++ b/docs/zh-cn/development/how-to-release.md
@@ -130,10 +130,10 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
```shell
➜ ~ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq /tmp/tubemq-dist-dev
-# 这个步骤比较慢，会把所有版本都拷贝下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
+# 这个步骤比较慢，会把所有版本都考下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
➜ ~ cd tubemq-dist-dev
➜ tubemq-dist-dev ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-dev ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-dev ~ svn add .
➜ tubemq-dist-dev ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
@@ -142,8 +142,8 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
```shell
➜ ~ svn co https://dist.apache.org/repos/dist/release/incubator/tubemq /tmp/tubemq-dist-release
➜ ~ cd tubemq-dist-release
-➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-release ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS
+➜ tubemq-dist-release ~ svn add .
➜ tubemq-dist-release ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
@@ -191,18 +191,8 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
## 3. 编译打包
### 3.1 准备分支
- 从主干分支拉取新分支作为发布分支，release-${release_version}
-
- 更新`CHANGES.md`
-
- 检查代码是否正常，包括编译成功、单元测试全部成功，RAT检查成功等等
-
- ```shell
- # build检查
- $ mvn clean package -Dmaven.javadoc.skip=true
- # RAT检查
- $ mvn apache-rat:check
- ```
-
- 更改版本号
@@ -211,9 +201,7 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
**创建一个带签名的tag**
```shell
-$ git tag -s ${release_version}-${rc_version} -m "Tagging the ${release_version} first Releae Candidate (Candidates start at zero)"
-# 如果遇到错误 gpg: signing failed: secret key not available，先配置下私钥
-$ git config user.signingkey ${KEY_ID}
+git tag -s ${release_version}-${rc_version} -m "Tagging the ${release_version} first Releae Candidate (Candidates start at zero)"
```
### 3.3 打包源码
@@ -285,7 +273,7 @@ svn commit -m 'prepare for ${release_version} ${rc_version}'# 提交至svn远程
```
### 4.4 关闭Apache Staging仓库
> 请确保所有的artifact都是ok的
-1. **先登录**http://repository.apache.org , 使用Apache账号登录
+1. 登录http://repository.apache.org , 使用Apache账号登录
2. 点击左侧的Staging repositories，
3. 搜索TubeMQ关键字，选择你最近上传的仓库
4. 点击上方的Close按钮，这个过程会进行一系列检查
diff --git a/en-us/docs/development/how-to-release.html b/en-us/docs/development/how-to-release.html
index 9202af2..54fa5b4 100644
--- a/en-us/docs/development/how-to-release.html
+++ b/en-us/docs/development/how-to-release.html
@@ -126,17 +126,17 @@ sub rsa4096 2020-05-18 [E]
<p>Release分支的SVN库是 <a href="https://dist.apache.org/repos/dist/release/incubator/tubemq">https://dist.apache.org/repos/dist/release/incubator/tubemq</a></p>
<h4>1.5.1 在dev分支中添加公钥到KEYS，用于发布RC版本</h4>
<pre><code class="language-shell">➜ ~ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq /tmp/tubemq-dist-dev
-<span class="hljs-meta">#</span><span class="bash"> 这个步骤比较慢，会把所有版本都拷贝下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传</span>
+<span class="hljs-meta">#</span><span class="bash"> 这个步骤比较慢，会把所有版本都考下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传</span>
➜ ~ cd tubemq-dist-dev
➜ tubemq-dist-dev ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-dev ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-dev ~ svn add .
➜ tubemq-dist-dev ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
</code></pre>
<h4>1.5.2 在release分支中添加公钥到KEYS，用于发布正式版本</h4>
<pre><code class="language-shell">➜ ~ svn co https://dist.apache.org/repos/dist/release/incubator/tubemq /tmp/tubemq-dist-release
➜ ~ cd tubemq-dist-release
-➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-release ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS
+➜ tubemq-dist-release ~ svn add .
➜ tubemq-dist-release ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
</code></pre>
<h3>1.6 上传GPG公钥到Github账户</h3>
@@ -179,32 +179,17 @@ sub rsa4096 2020-05-18 [E]
<h2>3. 编译打包</h2>
<h3>3.1 准备分支</h3>
<ul>
-<li>
-<p>从主干分支拉取新分支作为发布分支，release-${release_version}</p>
-</li>
-<li>
-<p>更新<code>CHANGES.md</code></p>
-</li>
-<li>
-<p>检查代码是否正常，包括编译成功、单元测试全部成功，RAT检查成功等等</p>
-<pre><code class="language-shell"><span class="hljs-meta">#</span><span class="bash"> build检查</span>
-<span class="hljs-meta">$</span><span class="bash"> mvn clean package -Dmaven.javadoc.skip=<span class="hljs-literal">true</span></span>
-<span class="hljs-meta">#</span><span class="bash"> RAT检查</span>
-<span class="hljs-meta">$</span><span class="bash"> mvn apache-rat:check</span>
-</code></pre>
-</li>
-<li>
-<p>更改版本号</p>
-</li>
+<li>从主干分支拉取新分支作为发布分支，release-${release_version}</li>
+<li>更新<code>CHANGES.md</code></li>
+<li>检查代码是否正常，包括编译成功、单元测试全部成功，RAT检查成功等等</li>
+<li>更改版本号</li>
</ul>
<h3>3.2 创建tag</h3>
<blockquote>
<p>创建tag前，要确保代码已经检查无误，包括：编译成功、单元测试全部成功，RAT检查成功等</p>
</blockquote>
<p><strong>创建一个带签名的tag</strong></p>
-<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> git tag -s <span class="hljs-variable">${release_version}</span>-<span class="hljs-variable">${rc_version}</span> -m <span class="hljs-string">"Tagging the <span class="hljs-variable">${release_version}</span> first Releae Candidate (Candidates start at zero)"</span></span>
-<span class="hljs-meta">#</span><span class="bash"> 如果遇到错误 gpg: signing failed: secret key not available，先配置下私钥</span>
-<span class="hljs-meta">$</span><span class="bash"> git config user.signingkey <span class="hljs-variable">${KEY_ID}</span></span>
+<pre><code class="language-shell">git tag -s ${release_version}-${rc_version} -m "Tagging the ${release_version} first Releae Candidate (Candidates start at zero)"
</code></pre>
<h3>3.3 打包源码</h3>
<blockquote>
@@ -266,7 +251,7 @@ svn commit -m 'prepare for ${release_version} ${rc_version}'# 提交至svn远程
<p>请确保所有的artifact都是ok的</p>
</blockquote>
<ol>
-<li><strong>先登录</strong><a href="http://repository.apache.org">http://repository.apache.org</a> , 使用Apache账号登录</li>
+<li>登录http://repository.apache.org , 使用Apache账号登录</li>
<li>点击左侧的Staging repositories，</li>
<li>搜索TubeMQ关键字，选择你最近上传的仓库</li>
<li>点击上方的Close按钮，这个过程会进行一系列检查</li>
diff --git a/en-us/docs/development/how-to-release.json b/en-us/docs/development/how-to-release.json
index 2460639..8b32303 100644
--- a/en-us/docs/development/how-to-release.json
+++ b/en-us/docs/development/how-to-release.json
@@ -1,6 +1,6 @@
{
"filename": "how-to-release.md",
- "__html": "<h1>如何发布版本</h1>\n<p><font color=\"#dd0000\" size=\"4\">TODO: This page needs to be translated into English. If you are interested, just do it.</font></p>\n<blockquote>\n<p>本文主要介绍了Release Manager如何按照Apache的流程发布版本，</p>\n</blockquote>\n<h2>0. 前言</h2>\n<p>Source Release是Apache关注的重点，也是发布的必须内容；\nBinary Release是可选项，TubeMQ可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。</p>\n<p>请参考以下链接，找到更多关于ASF的发布指南:</p>\n<p><a href=\"https://incubator.apache.org/guides/releasemanagement.html\">Apache Release [...]
+ "__html": "<h1>如何发布版本</h1>\n<p><font color=\"#dd0000\" size=\"4\">TODO: This page needs to be translated into English. If you are interested, just do it.</font></p>\n<blockquote>\n<p>本文主要介绍了Release Manager如何按照Apache的流程发布版本，</p>\n</blockquote>\n<h2>0. 前言</h2>\n<p>Source Release是Apache关注的重点，也是发布的必须内容；\nBinary Release是可选项，TubeMQ可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。</p>\n<p>请参考以下链接，找到更多关于ASF的发布指南:</p>\n<p><a href=\"https://incubator.apache.org/guides/releasemanagement.html\">Apache Release [...]
"link": "/en-us/docs/development/how-to-release.html",
"meta": {
"title": "How to Release - Apache TubeMQ"
diff --git a/en-us/docs/development/how-to-release.md b/en-us/docs/development/how-to-release.md
index 64ffd0d..6c708e5 100644
--- a/en-us/docs/development/how-to-release.md
+++ b/en-us/docs/development/how-to-release.md
@@ -133,10 +133,10 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
```shell
➜ ~ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq /tmp/tubemq-dist-dev
-# 这个步骤比较慢，会把所有版本都拷贝下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
+# 这个步骤比较慢，会把所有版本都考下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
➜ ~ cd tubemq-dist-dev
➜ tubemq-dist-dev ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-dev ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-dev ~ svn add .
➜ tubemq-dist-dev ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
@@ -145,8 +145,8 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
```shell
➜ ~ svn co https://dist.apache.org/repos/dist/release/incubator/tubemq /tmp/tubemq-dist-release
➜ ~ cd tubemq-dist-release
-➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-release ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS
+➜ tubemq-dist-release ~ svn add .
➜ tubemq-dist-release ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
@@ -194,28 +194,17 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
## 3. 编译打包
### 3.1 准备分支
- 从主干分支拉取新分支作为发布分支，release-${release_version}
-
- 更新`CHANGES.md`
-
- 检查代码是否正常，包括编译成功、单元测试全部成功，RAT检查成功等等
-
- ```shell
- # build检查
- $ mvn clean package -Dmaven.javadoc.skip=true
- # RAT检查
- $ mvn apache-rat:check
- ```
-
- 更改版本号
+
### 3.2 创建tag
> 创建tag前，要确保代码已经检查无误，包括：编译成功、单元测试全部成功，RAT检查成功等
**创建一个带签名的tag**
```shell
-$ git tag -s ${release_version}-${rc_version} -m "Tagging the ${release_version} first Releae Candidate (Candidates start at zero)"
-# 如果遇到错误 gpg: signing failed: secret key not available，先配置下私钥
-$ git config user.signingkey ${KEY_ID}
+git tag -s ${release_version}-${rc_version} -m "Tagging the ${release_version} first Releae Candidate (Candidates start at zero)"
```
### 3.3 打包源码
@@ -287,7 +276,7 @@ svn commit -m 'prepare for ${release_version} ${rc_version}'# 提交至svn远程
```
### 4.4 关闭Apache Staging仓库
> 请确保所有的artifact都是ok的
-1. **先登录**http://repository.apache.org , 使用Apache账号登录
+1. 登录http://repository.apache.org , 使用Apache账号登录
2. 点击左侧的Staging repositories，
3. 搜索TubeMQ关键字，选择你最近上传的仓库
4. 点击上方的Close按钮，这个过程会进行一系列检查
diff --git a/zh-cn/docs/development/how-to-release.html b/zh-cn/docs/development/how-to-release.html
index ad1aad7..16f8c67 100644
--- a/zh-cn/docs/development/how-to-release.html
+++ b/zh-cn/docs/development/how-to-release.html
@@ -124,17 +124,17 @@ sub rsa4096 2020-05-18 [E]
<p>Release分支的SVN库是 <a href="https://dist.apache.org/repos/dist/release/incubator/tubemq">https://dist.apache.org/repos/dist/release/incubator/tubemq</a></p>
<h4>1.5.1 在dev分支中添加公钥到KEYS，用于发布RC版本</h4>
<pre><code class="language-shell">➜ ~ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq /tmp/tubemq-dist-dev
-<span class="hljs-meta">#</span><span class="bash"> 这个步骤比较慢，会把所有版本都拷贝下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传</span>
+<span class="hljs-meta">#</span><span class="bash"> 这个步骤比较慢，会把所有版本都考下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传</span>
➜ ~ cd tubemq-dist-dev
➜ tubemq-dist-dev ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-dev ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-dev ~ svn add .
➜ tubemq-dist-dev ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
</code></pre>
<h4>1.5.2 在release分支中添加公钥到KEYS，用于发布正式版本</h4>
<pre><code class="language-shell">➜ ~ svn co https://dist.apache.org/repos/dist/release/incubator/tubemq /tmp/tubemq-dist-release
➜ ~ cd tubemq-dist-release
-➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-release ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS
+➜ tubemq-dist-release ~ svn add .
➜ tubemq-dist-release ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
</code></pre>
<h3>1.6 上传GPG公钥到Github账户</h3>
@@ -177,32 +177,17 @@ sub rsa4096 2020-05-18 [E]
<h2>3. 编译打包</h2>
<h3>3.1 准备分支</h3>
<ul>
-<li>
-<p>从主干分支拉取新分支作为发布分支，release-${release_version}</p>
-</li>
-<li>
-<p>更新<code>CHANGES.md</code></p>
-</li>
-<li>
-<p>检查代码是否正常，包括编译成功、单元测试全部成功，RAT检查成功等等</p>
-<pre><code class="language-shell"><span class="hljs-meta">#</span><span class="bash"> build检查</span>
-<span class="hljs-meta">$</span><span class="bash"> mvn clean package -Dmaven.javadoc.skip=<span class="hljs-literal">true</span></span>
-<span class="hljs-meta">#</span><span class="bash"> RAT检查</span>
-<span class="hljs-meta">$</span><span class="bash"> mvn apache-rat:check</span>
-</code></pre>
-</li>
-<li>
-<p>更改版本号</p>
-</li>
+<li>从主干分支拉取新分支作为发布分支，release-${release_version}</li>
+<li>更新<code>CHANGES.md</code></li>
+<li>检查代码是否正常，包括编译成功、单元测试全部成功，RAT检查成功等等</li>
+<li>更改版本号</li>
</ul>
<h3>3.2 创建tag</h3>
<blockquote>
<p>创建tag前，要确保代码已经检查无误，包括：编译成功、单元测试全部成功，RAT检查成功等</p>
</blockquote>
<p><strong>创建一个带签名的tag</strong></p>
-<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> git tag -s <span class="hljs-variable">${release_version}</span>-<span class="hljs-variable">${rc_version}</span> -m <span class="hljs-string">"Tagging the <span class="hljs-variable">${release_version}</span> first Releae Candidate (Candidates start at zero)"</span></span>
-<span class="hljs-meta">#</span><span class="bash"> 如果遇到错误 gpg: signing failed: secret key not available，先配置下私钥</span>
-<span class="hljs-meta">$</span><span class="bash"> git config user.signingkey <span class="hljs-variable">${KEY_ID}</span></span>
+<pre><code class="language-shell">git tag -s ${release_version}-${rc_version} -m "Tagging the ${release_version} first Releae Candidate (Candidates start at zero)"
</code></pre>
<h3>3.3 打包源码</h3>
<blockquote>
@@ -264,7 +249,7 @@ svn commit -m 'prepare for ${release_version} ${rc_version}'# 提交至svn远程
<p>请确保所有的artifact都是ok的</p>
</blockquote>
<ol>
-<li><strong>先登录</strong><a href="http://repository.apache.org">http://repository.apache.org</a> , 使用Apache账号登录</li>
+<li>登录http://repository.apache.org , 使用Apache账号登录</li>
<li>点击左侧的Staging repositories，</li>
<li>搜索TubeMQ关键字，选择你最近上传的仓库</li>
<li>点击上方的Close按钮，这个过程会进行一系列检查</li>
diff --git a/zh-cn/docs/development/how-to-release.json b/zh-cn/docs/development/how-to-release.json
index 302fed2..c628636 100644
--- a/zh-cn/docs/development/how-to-release.json
+++ b/zh-cn/docs/development/how-to-release.json
@@ -1,6 +1,6 @@
{
"filename": "how-to-release.md",
- "__html": "<h1>如何发布版本</h1>\n<blockquote>\n<p>本文主要介绍了Release Manager如何按照Apache的流程发布版本，</p>\n</blockquote>\n<p>Source Release是Apache关注的重点，也是发布的必须内容；\nBinary Release是可选项，TubeMQ可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。</p>\n<p>请参考以下链接，找到更多关于ASF的发布指南:</p>\n<p><a href=\"https://incubator.apache.org/guides/releasemanagement.html\">Apache Release Guide</a></p>\n<p><a href=\"https://incubator.apache.org/\">Apache incubator 官网</a></p>\n<h2>1. 添加GPG KEY</h2>\n<blockquote>\n<p>本章节主要参考：<a href=\"https:/ [...]
+ "__html": "<h1>如何发布版本</h1>\n<blockquote>\n<p>本文主要介绍了Release Manager如何按照Apache的流程发布版本，</p>\n</blockquote>\n<p>Source Release是Apache关注的重点，也是发布的必须内容；\nBinary Release是可选项，TubeMQ可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。</p>\n<p>请参考以下链接，找到更多关于ASF的发布指南:</p>\n<p><a href=\"https://incubator.apache.org/guides/releasemanagement.html\">Apache Release Guide</a></p>\n<p><a href=\"https://incubator.apache.org/\">Apache incubator 官网</a></p>\n<h2>1. 添加GPG KEY</h2>\n<blockquote>\n<p>本章节主要参考：<a href=\"https:/ [...]
"link": "/zh-cn/docs/development/how-to-release.html",
"meta": {
"title": "如何发布版本- Apache TubeMQ"
diff --git a/zh-cn/docs/development/how-to-release.md b/zh-cn/docs/development/how-to-release.md
index cdf5ca0..2d3bfab 100644
--- a/zh-cn/docs/development/how-to-release.md
+++ b/zh-cn/docs/development/how-to-release.md
@@ -130,10 +130,10 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
```shell
➜ ~ svn co https://dist.apache.org/repos/dist/dev/incubator/tubemq /tmp/tubemq-dist-dev
-# 这个步骤比较慢，会把所有版本都拷贝下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
+# 这个步骤比较慢，会把所有版本都考下来，如果网断了，用svn cleanup删掉锁，重新执行一下，会断点续传
➜ ~ cd tubemq-dist-dev
➜ tubemq-dist-dev ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-dev ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-dev ~ svn add .
➜ tubemq-dist-dev ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
@@ -142,8 +142,8 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
```shell
➜ ~ svn co https://dist.apache.org/repos/dist/release/incubator/tubemq /tmp/tubemq-dist-release
➜ ~ cd tubemq-dist-release
-➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS # 追加你生成的KEY到文件KEYS中, 追加后最好检查一下是否正确
-➜ tubemq-dist-release ~ svn add . # 如果之前存在KEYS文件，则不需要
+➜ tubemq-dist-release ~ (gpg --list-sigs YOUR_NAME@apache.org && gpg --export --armor YOUR_NAME@apache.org) >> KEYS
+➜ tubemq-dist-release ~ svn add .
➜ tubemq-dist-release ~ svn ci -m "add gpg key for YOUR_NAME" # 接下来会要求输入用户名和密码，就用你的apache的用户名和密码。
```
@@ -191,18 +191,8 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
## 3. 编译打包
### 3.1 准备分支
- 从主干分支拉取新分支作为发布分支，release-${release_version}
-
- 更新`CHANGES.md`
-
- 检查代码是否正常，包括编译成功、单元测试全部成功，RAT检查成功等等
-
- ```shell
- # build检查
- $ mvn clean package -Dmaven.javadoc.skip=true
- # RAT检查
- $ mvn apache-rat:check
- ```
-
- 更改版本号
@@ -211,9 +201,7 @@ Release分支的SVN库是 https://dist.apache.org/repos/dist/release/incubator/t
**创建一个带签名的tag**
```shell
-$ git tag -s ${release_version}-${rc_version} -m "Tagging the ${release_version} first Releae Candidate (Candidates start at zero)"
-# 如果遇到错误 gpg: signing failed: secret key not available，先配置下私钥
-$ git config user.signingkey ${KEY_ID}
+git tag -s ${release_version}-${rc_version} -m "Tagging the ${release_version} first Releae Candidate (Candidates start at zero)"
```
### 3.3 打包源码
@@ -285,7 +273,7 @@ svn commit -m 'prepare for ${release_version} ${rc_version}'# 提交至svn远程
```
### 4.4 关闭Apache Staging仓库
> 请确保所有的artifact都是ok的
-1. **先登录**http://repository.apache.org , 使用Apache账号登录
+1. 登录http://repository.apache.org , 使用Apache账号登录
2. 点击左侧的Staging repositories，
3. 搜索TubeMQ关键字，选择你最近上传的仓库
4. 点击上方的Close按钮，这个过程会进行一系列检查