You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2020/02/22 09:13:21 UTC

[servicecomb-website] branch master updated (2813f20 -> 75d0dbf)

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git.


    from 2813f20  release ServiceComb Java Chassis 2.0.0
     new ccd0e0a  [SCB-1778] update java-chassis release guide and verification guide
     new 75d0dbf  [SCB-1778] add notes to delete temporary artifacts

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 _developers/cn/release_guide.md            | 133 ++++++++++++++++-------------
 _developers/cn/release_validation_guide.md |  13 +--
 _developers/release_guide.md               | 128 ++++++++++++++++++---------
 _developers/release_validation_guide.md    |  11 +--
 4 files changed, 180 insertions(+), 105 deletions(-)


[servicecomb-website] 01/02: [SCB-1778] update java-chassis release guide and verification guide

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git

commit ccd0e0a21b44151533bea4ca8b4926bf6c4b1982
Author: liubao <bi...@qq.com>
AuthorDate: Thu Feb 20 22:22:21 2020 +0800

    [SCB-1778] update java-chassis release guide and verification guide
---
 _developers/cn/release_guide.md            | 131 ++++++++++++++++-------------
 _developers/cn/release_validation_guide.md |  13 +--
 _developers/release_guide.md               | 125 ++++++++++++++++++---------
 _developers/release_validation_guide.md    |  11 +--
 4 files changed, 175 insertions(+), 105 deletions(-)

diff --git a/_developers/cn/release_guide.md b/_developers/cn/release_guide.md
index 1971ec2..d4ce9ee 100755
--- a/_developers/cn/release_guide.md
+++ b/_developers/cn/release_guide.md
@@ -114,107 +114,124 @@ gvt restore
 
 
 ## 发行Java-Chassis
+发布版本前,首先确定该版本所有的 apache issues 都已经关闭, 并且
+登录 [apache issue 网站](https://issues.apache.org/jira/projects/SCB), 点击发布, 生成该版本的 release notes. 
 
-***准备和校验发行包***
+***准备待发布版本***
+
+clone 需要发布版本的分支到开发环境(比如 master), 修改版本号, 并提交代码到仓库。假设当前版本为 `2.0.0-SNAPSHOT`,发布版
+本为 `2.0.0`。
+
+执行:
+```shell script
+mvn versions:set -DgenerateBackupPoms=false -DnewVersion=2.0.0
+```
+
+然后执行:
+```shell script
+mvn clean install -Pit
+```
+
+如果编译成功,可以提交PR,代码检视通过后合入仓库。
+
+***进行软件包发布***
+
+需要准备 Linux 开发环境,并确保网络能够往 maven 中央库上传文件。
 
 1. 如果`~/.gnupg`中没有GPG密钥文件,则将GPG密钥文件拷贝至`~/.gnupg`文件夹。
-  ```
-  gpg.conf
-  pubring.gpg
-  random_seed
-  secring.gpg
-  trustdb.gpg
-  ```
+    ```
+    gpg.conf
+    pubring.gpg
+    random_seed
+    secring.gpg
+    trustdb.gpg
+    ```
 
 2. 更新`~/.m2/settings.xml`文件中的GPG密码。
 
 3. 更新`~/.m2/settings.xml`文件中的Apache帐户用户名和密码。
 
 4. 克隆java-chassis代码
-```
-git clone https://github.com/apache/servicecomb-java-chassis.git
-```
-
-5. 使用以下perl命令,替换所有pom.xml文件中的版本号并提交改动至本地
-```
-find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g'
-```
-
-6. 在需要release的分支上打上准备发布版本的标签。
-
-7. 运行以下命令
-```
-mvn clean deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
-```
+    ```
+    git clone https://github.com/apache/servicecomb-java-chassis.git
+    ```
+   
+5. 运行以下命令
+    ```
+    mvn clean deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
+    ```
 
-8. 如果执行失败,需要解决问题,从步骤7重新开始。
+6. 如果执行失败,需要解决问题。 并参考第7步关闭临时仓库,重新执行第5步。
 
-9. 如果步骤7命令执行成功,则所有的jar包都已经成功上传至maven临时仓库。  
-   使用apache帐号登录到[Apache Nexus](https://repository.apache.org/),点击“Staging Repositories”,搜索“servicecomb”,根据时间找到最近的java-chassis相关的记录,close该条记录,得到maven临时仓库的链接,例如:`https://repository.apache.org/content/repositories/orgapacheservicecomb-1385`
+7. 如果步骤5命令执行成功,则所有的jar包都已经成功上传至maven临时仓库。  
+   使用apache帐号登录到[Apache Nexus](https://repository.apache.org/),点击“Staging Repositories”,搜索“servicecomb”,根据时间找到最近的java-chassis相关的记录,close该条记录,得到maven临时仓库的链接,例如:`https://repository.apache.org/content/repositories/orgapacheservicecomb-1385`。
 
-10. 将release分支以及标签分别push至主仓库。
+8. 在 servicecomb-java-chassis 的 github 的 release 页面,点击 release, 发布 pre release 版本, 打上 tag 。
 
 ***给发行包签名***
 
-11. 从临时仓库下载二进制包及签名  
+1. 从临时仓库下载二进制包及签名  
   例如:  
   `https://repository.apache.org/content/repositories/orgapacheservicecomb-1385/org/apache/servicecomb/apache-servicecomb-java-chassis-distribution/1.2.0/apache-servicecomb-java-chassis-distribution-1.2.0-bin.zip`  
   `https://repository.apache.org/content/repositories/orgapacheservicecomb-1385/org/apache/servicecomb/apache-servicecomb-java-chassis-distribution/1.2.0/apache-servicecomb-java-chassis-distribution-1.2.0-bin.zip.asc`
 
-12. 从临时仓库下载源码包及签名  
+2. 从临时仓库下载源码包及签名  
   例如:  
   `https://repository.apache.org/content/repositories/orgapacheservicecomb-1385/org/apache/servicecomb/apache-servicecomb-java-chassis-distribution/1.2.0/apache-servicecomb-java-chassis-distribution-1.2.0-src.zip`  
   `https://repository.apache.org/content/repositories/orgapacheservicecomb-1385/org/apache/servicecomb/apache-servicecomb-java-chassis-distribution/1.2.0/apache-servicecomb-java-chassis-distribution-1.2.0-src.zip.asc`
 
-13. 生成二进制包和源码包的校验和  
+3. 生成二进制包和源码包的校验和  
   例如:  
   `sha512sum -b apache-servicecomb-java-chassis-distribution-1.2.0-bin.zip > apache-servicecomb-java-chassis-distribution-1.2.0-bin.zi.sha512`  
   `sha512sum -b apache-servicecomb-java-chassis-distribution-1.2.0-src.zip > apache-servicecomb-java-chassis-distribution-1.2.0-src.zip.sha512`  
 
-14. 将步骤11、12、13相关的文件,上传到[Apache开发仓库](https://dist.apache.org/repos/dist/dev/servicecomb/servicecomb-java-chassis/).  
+4. 将上述步骤相关的文件,上传到[Apache开发仓库](https://dist.apache.org/repos/dist/dev/servicecomb/servicecomb-java-chassis/).  
   SVN命令:
-  ```
-  svn co https://dist.apache.org/repos/dist/dev/servicecomb/servicecomb-java-chassis
-  cd serviecomb-java-chassis
-  mkdir -p 1.2.0/rc01
-  cp xxx/* 1.2.0/rc01
-  svn add 1.2.0/rc01
-  svn ci 1.2.0/rc01
-  ```
+    ```
+    svn co https://dist.apache.org/repos/dist/dev/servicecomb/servicecomb-java-chassis
+    cd serviecomb-java-chassis
+    mkdir -p 1.2.0/rc01
+    cp xxx/* 1.2.0/rc01
+    svn add 1.2.0
+    svn ci 1.2.0
+    ```
 
-15. 从SVN下载发行包,验证签名和校验。
+5. 从SVN下载发行包,验证签名和校验。
 
 ***PMC批准***
 
-17. 发送投票邮件至 ***dev@servicecomb.apache.org***, 发起PMC批准.
+1. 发送投票邮件至 ***dev@servicecomb.apache.org***, 发起PMC批准.
 
-18. 等待72小时,或者获得3票+1并且没有-1。如果有-1票,修正问题,并删除主仓库的release版本对应的标签,并从***第1步***重新开始。
+2. 等待72小时,或者获得3票+1并且没有-1。如果有-1票,修正问题,并删除主仓库的release版本对应的标签,重新开始版本发布流程。
 
-19. 将投票结果发布到dev@servicecomb.apache.org。
+3. 将投票结果发布到dev@servicecomb.apache.org。
 
 
-***通告***
+***更新文档和通告***
+
+1. 在 servicecomb-java-chassis 的 github 的 release 页面,将 pre release 修改为正式 release。完成 release notes书写。
 
-20. 将[dev](https://dist.apache.org/repos/dist/dev)的文件移动到[release](https://dist.apache.org/repos/dist/release)目录中,同时确认已经被存档,同时更新网站上相关链接。
-    同时删除[Apache开发仓库](https://dist.apache.org/repos/dist/dev/servicecomb/servicecomb-java-chassis/)中的目录
+2. 将[dev](https://dist.apache.org/repos/dist/dev)的文件移动到[release](https://dist.apache.org/repos/dist/release)目录中。
+    ```
+    cp dev/servicecomb/servicecomb-java-chassis/2.0.0/* release/servicecomb/servicecomb-java-chassis/2.0.0/
+    cd release/servicecomb/servicecomb-java-chassis/
+    svn add 2.0.0
+    svn ci 2.0.0
+    ```
+    同时删除[dev](https://dist.apache.org/repos/dist/dev)的临时内容。
     ```
     svn rm -r 1.2.0
-    checkin?
+    svn ci .
     ```
-    使用apache帐号登录到[Apache Nexus](https://repository.apache.org/),点击“Staging Repositories”,搜索“servicecomb”,选中java-chassis相关的所有记录,点击“Drop”。
 
-    使用apache帐号登录到[Apache Nexus](https://repository.apache.org/),点击“Staging Repositories”,搜索“servicecomb”,找到需要发布的java-chassis记录,点击“Release”。
+3. 使用apache帐号登录到[Apache Nexus](https://repository.apache.org/),点击“Staging Repositories”,搜索“servicecomb”,找到需要发布的java-chassis记录,点击“Release”。
 
-21. 等待24小时,让所有镜像同步。
+4. 等待24小时,让所有镜像同步。
 
-22. 上传发行页面至ServiceComb网站。
-   fork https://github.com/apache/servicecomb-website/
-   1.总版本,url
-   2.java-chassis的RN和download(url)
-   3.中文、英文
-   PR
+5. 更新官网发布信息。 修改内容可以参考 [1.3.0 RP](https://github.com/apache/servicecomb-website/pull/210)
+或者 [2.0.0 RP](https://github.com/apache/servicecomb-website/pull/240)
 
-23. 发送发行通告邮件到dev@servicecomb.apache.org, announce@apache.org。
+6. 发送发行通告邮件到dev@servicecomb.apache.org, announce@apache.org。
 
 
 ## 发行Pack
diff --git a/_developers/cn/release_validation_guide.md b/_developers/cn/release_validation_guide.md
index 9f4d80d..158430a 100644
--- a/_developers/cn/release_validation_guide.md
+++ b/_developers/cn/release_validation_guide.md
@@ -74,12 +74,12 @@ unzip xxx-src.zip
 使用`cd`命令切换到解压出来的源代码根目录下,执行:
 
 ```bash
-mvn clean install -Pdocker -Pit
+mvn clean install -Pdocker -Pit -Pdemo-run-release
 ```
 
 >提示:如果如果验证环境操作系统是Windows:
 >```bash
->mvn clean install -Pdocker -Pit -Pdocker-machine
+>mvn clean install -Pdocker -Pit -Pdocker-machine -Pdemo-run-release
 >```
 
 等待所有的测试通过,依据配置环境不同,约耗时10~30分钟。
@@ -134,12 +134,12 @@ Staging Repository : https://repository.apache.org/content/repositories/orgapach
 一切就绪后,使用`cd`命令切换到**源代码demo目录(注意不是根目录)下**,执行:
 
 ```bash
-mvn clean install -Pdocker -Pstaging
+mvn clean install -Pdocker -Pstaging -Pit -Pdemo-run-release
 ```
 
 >提示:如果如果验证环境操作系统是Windows:
 >```bash
->mvn clean install -Pdocker -Pstaging -Pdocker-machine
+>mvn clean install -Pdocker -Pstaging -Pdocker-machine  -Pit -Pdemo-run-release
 >```
 
 **测试过程中可以观察到Java Chassis的依赖将从我们之前指定的Apache Staging Repository下载:**
@@ -180,4 +180,7 @@ mvn clean verify -Pdocker -Pstaging
 等待所有的测试通过,依据配置环境不同,约耗时5~10分钟。
 
 ### 验证Samples是否正确(可选)
-在源代码的sample下有很多例子,可以任选几个测试,例如使用BMI做验证;sample验证的方法请参见对应目录下README.md中的说明即可。
\ No newline at end of file
+
+下载 [samples 代码](https://github.com/apache/servicecomb-samples), 由于 samples 较多, 可以选择部分
+进行验证, 详细参考每一个 sample 提供的 README 文件。
+ 
\ No newline at end of file
diff --git a/_developers/release_guide.md b/_developers/release_guide.md
index b5c54fd..9de508c 100755
--- a/_developers/release_guide.md
+++ b/_developers/release_guide.md
@@ -136,78 +136,127 @@ gvt restore
 5. Send the announcement mails to dev@servicecomb.apache.org, announce@apache.org
 
 
-
-
 ## Major Steps for doing Java-Chassis Release
+Before release, make sure all apache issues are closed. Log in
+ [apache issue website](https://issues.apache.org/jira/projects/SCB), click `release` and generate release notes. 
 
-***Make and Verify the Release***
+***Prepare the release code***
 
-1. Clone the java-chassis code.
-```
-git clone https://github.com/apache/servicecomb-java-chassis.git
-```
+clone java-chassis code to your development environment, change version to release version and push to github.
+Assume code version is `2.0.0-SNAPSHOT` and release version is `2.0.0`. 
 
-2. Cut the release using perl command to replace all the versions in pom.xml files
+Run:
+```shell script
+mvn versions:set -DgenerateBackupPoms=false -DnewVersion=2.0.0
 ```
-find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g'
+
+Then:
+```shell script
+mvn clean install -Pit
 ```
 
-3. Create a Tag from the master branch using the version number.
+If the build is successful, submit a PR and merge code after review.
 
-4. Clear all the redundant servicecomb releases in repository.apache.org
+***Release maven artifacts***
 
-5. Add the keys in a reference folder.
+Prepare Linux environment, and make sure can upload artifacts to maven central.
 
-6. Update the key path and passphrase in ~/.m2/settings.xml file.
+1. Copy GPG keys to `~/.gnupg`
+    ```
+    gpg.conf
+    pubring.gpg
+    random_seed
+    secring.gpg
+    trustdb.gpg
+    ```
 
-7. Update the apache account username and password in the settings file.
+2. Update PGR password in `~/.m2/settings.xml`
 
-8. Run the maven deploy command.
-```
-mvn deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
-```
+3. Update apache maven server user name and password in `~/.m2/settings.xml`
 
-9. Once every thing is uploaded then use the staging repo to verify the build using Company workshop.
+4. clone java-chassis
+    ```
+    git clone https://github.com/apache/servicecomb-java-chassis.git
+    ```
+   
+5. Run
+    ```
+    mvn clean deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
+    ```
 
-10. Share the staging repo with peers to verify on different OS and machines using the demo.
+6. If failed in step 5, close the temporary repository in apache Nexus and start from step 5 again.
 
-11. If everything is fine then push the tag to master.
+7. If step 5 is successful, all artifacts are uploaded to a temporary repository. Using your apache account and 
+   log in to  [Apache Nexus](https://repository.apache.org/). Click  `Staging Repositories`, search `servicecomb`,
+   find the latest repository, click "close", and get the staging repository link like `https://repository.apache.org/content/repositories/orgapacheservicecomb-1385`
 
-12. Close the staging repo is apache repositories
+8. In servicecomb-java-chassis  release page,click release, do a `pre release`
 
-***Sign the Releases***
+***Sign the distributions***
 
-1. Download the source code and distribution from the staging repo.
+1. Download binary distributions from the temporary repository.
+  e.g.  
+  `https://repository.apache.org/content/repositories/orgapacheservicecomb-1385/org/apache/servicecomb/apache-servicecomb-java-chassis-distribution/1.2.0/apache-servicecomb-java-chassis-distribution-1.2.0-bin.zip`  
+  `https://repository.apache.org/content/repositories/orgapacheservicecomb-1385/org/apache/servicecomb/apache-servicecomb-java-chassis-distribution/1.2.0/apache-servicecomb-java-chassis-distribution-1.2.0-bin.zip.asc`
 
-2. Sign the 2 releases(distribution, src) and checksum.
+2. Download source distributions from the temporary repository.
+  e.g.
+  `https://repository.apache.org/content/repositories/orgapacheservicecomb-1385/org/apache/servicecomb/apache-servicecomb-java-chassis-distribution/1.2.0/apache-servicecomb-java-chassis-distribution-1.2.0-src.zip`  
+  `https://repository.apache.org/content/repositories/orgapacheservicecomb-1385/org/apache/servicecomb/apache-servicecomb-java-chassis-distribution/1.2.0/apache-servicecomb-java-chassis-distribution-1.2.0-src.zip.asc`
 
-3. Create a new directory [Apache dev Release SVN](https://dist.apache.org/repos/dist/dev/servicecomb/servicecomb-java-chassis/) with release package name and release candidate number. (for example : if you want to release 1.0.0-m2 and this is the first attempt of the release then the folder structure will be `1.0.0-m2/rc01`)
+3. generate checksum.
+  e.g.
+  `sha512sum -b apache-servicecomb-java-chassis-distribution-1.2.0-bin.zip > apache-servicecomb-java-chassis-distribution-1.2.0-bin.zi.sha512`  
+  `sha512sum -b apache-servicecomb-java-chassis-distribution-1.2.0-src.zip > apache-servicecomb-java-chassis-distribution-1.2.0-src.zip.sha512`  
 
-4. Upload the release to  directory created in last step.
+4. upload all file to [Apache development svn](https://dist.apache.org/repos/dist/dev/servicecomb/servicecomb-java-chassis/).  
+  Run
+    ```
+    svn co https://dist.apache.org/repos/dist/dev/servicecomb/servicecomb-java-chassis
+    cd serviecomb-java-chassis
+    mkdir -p 1.2.0/rc01
+    cp xxx/* 1.2.0/rc01
+    svn add 1.2.0
+    svn ci 1.2.0
+    ```
 
-5. Download all the releases from SVN and verify the signature and checksum.
+5. download the files and verify the sign.
 
-***PMC approval***
+***Sending mail for permission***
 
-1. Send the voting mail in dev@servicecomb.apache.org for PMC approval.
+1. Send mail to `dev@servicecomb.apache.org` and waiting for voting result.
 
-2. Wait for 72 hours or unless you get 3 +1 binding vote with no -1 vote. If you get even one -1 binding vote then fix the issue and start again from Step 1.
+2. Waiting 72 hours and if got three + 1 and no -1, the voting is successful. 
 
-3. Publish the result of the vote in dev@servicecomb.apache.org.
+3. Send the voting result to `dev@servicecomb.apache.org`
 
-***Announcements***
 
-1. Upload the releases to [Apache release repository](https://dist.apache.org/repos/dist/release/servicecomb/servicecomb-java-chassis/).
+***Update documents and announcements***
 
-2. Wait for 24 hours to replicate the release in all the mirrors.
+1. In servicecomb-java-chassis  github release page,set `pre release` to `formal release` and write release notes.
 
-3. Delete old releases from [dev](https://dist.apache.org/repos/dist/dev) and [release] (https://dist.apache.org/repos/dist/release) and check for the old release in archive, update the same links in the website for old releases.
+2. Move [dev](https://dist.apache.org/repos/dist/dev) to [release](https://dist.apache.org/repos/dist/release)
+    ```
+    cp dev/servicecomb/servicecomb-java-chassis/2.0.0/* release/servicecomb/servicecomb-java-chassis/2.0.0/
+    cd release/servicecomb/servicecomb-java-chassis/
+    svn add 2.0.0
+    svn ci 2.0.0
+    ```
+    And delete [dev](https://dist.apache.org/repos/dist/dev)
+    ```
+    svn rm -r 1.2.0
+    svn ci .
+    ```
 
-4. Upload the release page of ServiceComb Website.
+3. Log in to [Apache Nexus](https://repository.apache.org/), find `Staging Repositories` and search 
+`servicecomb`,find the last `closed` repository, and click `release`. 
 
-5. Send the announcement mails to dev@servicecomb.apache.org, announce@apache.org
+4. Waiting for 24 hour for all mirror in sync.
 
+5. Update the servicecomb-website, see [1.3.0 RP](https://github.com/apache/servicecomb-website/pull/210)
+or [2.0.0 RP](https://github.com/apache/servicecomb-website/pull/240)
 
+6. Send announcements to dev@servicecomb.apache.org, announce@apache.org。
 
 
 ## Major Steps for doing Saga Release
diff --git a/_developers/release_validation_guide.md b/_developers/release_validation_guide.md
index 0116e23..b631a86 100644
--- a/_developers/release_validation_guide.md
+++ b/_developers/release_validation_guide.md
@@ -74,12 +74,12 @@ unzip xxx-src.zip
 Run test case under source code root:
 
 ```bash
-mvn clean install -Pdocker -Pit
+mvn clean install -Pdocker -Pit -Pdemo-run-release
 ```
 
 >Hint: If the OS of environment is Windows:
 >```bash
->mvn clean install -Pdocker -Pit -Pdocker-machine
+>mvn clean install -Pdocker -Pit -Pdocker-machine -Pdemo-run-release
 >```
 
 Wait all test case check passed, may use 10~30 minutes.
@@ -134,12 +134,12 @@ Then add this Staging Repository address into `settings.xml` of maven:
 After that, enter **demo folder under the source code(not root folder of source code)** and run:
 
 ```bash
-mvn clean install -Pdocker -Pstaging
+mvn clean install -Pdocker -Pstaging -Pdemo-run-release
 ```
 
 >Hint: If the OS of environment is Windows:
 >```bash
->mvn clean install -Pdocker -Pstaging -Pdocker-machine
+>mvn clean install -Pdocker -Pstaging -Pdocker-machine -Pdemo-run-release
 >```
 
 **When test cases are running, we can see the Java Chassis dependencies will download from Apache Staging Repository that had configured:**
@@ -180,4 +180,5 @@ mvn clean verify -Pdocker -Pstaging
 Wait all test case check passed, may use 5~10 minutes.
 
 ### Verify Samples(Optional)
-In samples folder of source code, there are many java chassis sample, we can choose some of them do verification such as BMI; you can read README.md in each sample in order to known how to run.
\ No newline at end of file
+Download [samples code](https://github.com/apache/servicecomb-samples). There are many samples here, choose 
+some of them and change the version and do verifications. See each README of samples for details.


[servicecomb-website] 02/02: [SCB-1778] add notes to delete temporary artifacts

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git

commit 75d0dbf3047a354150aac8c95f24a4f4d28a3f3d
Author: liubao <bi...@qq.com>
AuthorDate: Fri Feb 21 22:32:49 2020 +0800

    [SCB-1778] add notes to delete temporary artifacts
---
 _developers/cn/release_guide.md | 8 +++++---
 _developers/release_guide.md    | 9 ++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/_developers/cn/release_guide.md b/_developers/cn/release_guide.md
index d4ce9ee..d736725 100755
--- a/_developers/cn/release_guide.md
+++ b/_developers/cn/release_guide.md
@@ -161,7 +161,7 @@ mvn clean install -Pit
     mvn clean deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
     ```
 
-6. 如果执行失败,需要解决问题。 并参考第7步关闭临时仓库,重新执行第5步。
+6. 如果执行失败,需要解决问题。 并参考第7步`drop`临时仓库,重新执行第5步。
 
 7. 如果步骤5命令执行成功,则所有的jar包都已经成功上传至maven临时仓库。  
    使用apache帐号登录到[Apache Nexus](https://repository.apache.org/),点击“Staging Repositories”,搜索“servicecomb”,根据时间找到最近的java-chassis相关的记录,close该条记录,得到maven临时仓库的链接,例如:`https://repository.apache.org/content/repositories/orgapacheservicecomb-1385`。
@@ -202,7 +202,8 @@ mvn clean install -Pit
 
 1. 发送投票邮件至 ***dev@servicecomb.apache.org***, 发起PMC批准.
 
-2. 等待72小时,或者获得3票+1并且没有-1。如果有-1票,修正问题,并删除主仓库的release版本对应的标签,重新开始版本发布流程。
+2. 等待72小时,或者获得3票+1并且没有-1。如果有-1票,修正问题,重新开始版本发布流程(视具体的失败情况,可能
+需要重新生成 release notes,删除svn临时文件,删除临时`Staging repositories`等)。
 
 3. 将投票结果发布到dev@servicecomb.apache.org。
 
@@ -224,7 +225,8 @@ mvn clean install -Pit
     svn ci .
     ```
 
-3. 使用apache帐号登录到[Apache Nexus](https://repository.apache.org/),点击“Staging Repositories”,搜索“servicecomb”,找到需要发布的java-chassis记录,点击“Release”。
+3. 使用apache帐号登录到[Apache Nexus](https://repository.apache.org/),点击“Staging Repositories”,搜索“servicecomb”,
+找到需要发布的java-chassis记录,点击“Release”。 如果由其他临时“Staging Repositories”,可以点击“Drop”一并删除。
 
 4. 等待24小时,让所有镜像同步。
 
diff --git a/_developers/release_guide.md b/_developers/release_guide.md
index 9de508c..c9f5194 100755
--- a/_developers/release_guide.md
+++ b/_developers/release_guide.md
@@ -184,7 +184,7 @@ Prepare Linux environment, and make sure can upload artifacts to maven central.
     mvn clean deploy -DskipTests -Prelease -Pdistribution -Ppassphrase
     ```
 
-6. If failed in step 5, close the temporary repository in apache Nexus and start from step 5 again.
+6. If failed in step 5, `drop` the temporary repository in apache Nexus and start from step 5 again.
 
 7. If step 5 is successful, all artifacts are uploaded to a temporary repository. Using your apache account and 
    log in to  [Apache Nexus](https://repository.apache.org/). Click  `Staging Repositories`, search `servicecomb`,
@@ -226,7 +226,9 @@ Prepare Linux environment, and make sure can upload artifacts to maven central.
 
 1. Send mail to `dev@servicecomb.apache.org` and waiting for voting result.
 
-2. Waiting 72 hours and if got three + 1 and no -1, the voting is successful. 
+2. Waiting 72 hours and if got three + 1 and no -1, the voting is successful. If there are some problems,
+start a new round of release. (According to the problem, please notice to clean up release notes,
+temporary svn files, and temporary stating repositories. )
 
 3. Send the voting result to `dev@servicecomb.apache.org`
 
@@ -249,7 +251,8 @@ Prepare Linux environment, and make sure can upload artifacts to maven central.
     ```
 
 3. Log in to [Apache Nexus](https://repository.apache.org/), find `Staging Repositories` and search 
-`servicecomb`,find the last `closed` repository, and click `release`. 
+`servicecomb`,find the last `closed` repository, and click `release`. If there are any temporary `Staging Repositories`,
+`drop` them. 
 
 4. Waiting for 24 hour for all mirror in sync.