You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by vi...@apache.org on 2019/06/06 06:56:36 UTC
[dubbo-website] branch asf-site updated: modify 2.7.2-release
This is an automated email from the ASF dual-hosted git repository.
victory pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new e24be04 modify 2.7.2-release
e24be04 is described below
commit e24be040b0e8854a1080e12ed8dffa46d54f57d5
Author: cvictory <sh...@gmail.com>
AuthorDate: Thu Jun 6 14:56:17 2019 +0800
modify 2.7.2-release
---
blog/en-us/download.md | 25 ++--
blog/zh-cn/download.md | 18 ++-
build/blog.js | 2 +-
build/blogDetail.js | 2 +-
build/community.js | 2 +-
build/documentation.js | 4 +-
build/home.js | 2 +-
.../committer-guide/release-guide_dev.md | 122 ++++++-------------
.../committer-guide/release-guide_dev.md | 132 ++++++---------------
en-us/blog/download.html | 24 ++--
en-us/blog/download.json | 2 +-
.../committer-guide/release-guide_dev.html | 119 +++++--------------
.../committer-guide/release-guide_dev.json | 2 +-
zh-cn/blog/download.html | 18 ++-
zh-cn/blog/download.json | 2 +-
zh-cn/docs/dev/design.html | 4 +-
.../committer-guide/release-guide_dev.html | 122 ++++++-------------
.../committer-guide/release-guide_dev.json | 2 +-
zh-cn/docs/source_code_guide/refer-service.html | 2 +-
zh-cn/docs/source_code_guide/refer-service.json | 2 +-
.../user/references/metadata/introduction.html | 2 +-
.../user/references/metadata/introduction.json | 2 +-
22 files changed, 209 insertions(+), 403 deletions(-)
diff --git a/blog/en-us/download.md b/blog/en-us/download.md
index c1036f2..31036b3 100644
--- a/blog/en-us/download.md
+++ b/blog/en-us/download.md
@@ -9,21 +9,28 @@ description: This article will introduce you how to understand the details of ea
## Verification
-you can follow these [procedures](https://www.apache.org/info/verification) and the [KEYS](https://www.apache.org/dist/incubator/dubbo/KEYS) file to verify the download files
+you can follow these [procedures](https://www.apache.org/info/verification) and the [KEYS](https://www.apache.org/dist/dubbo/KEYS) file to verify the download files
## Apache Dubbo
-> GitHub: https://github.com/apache/incubator-dubbo \
-> Release Notes: https://github.com/apache/incubator-dubbo/releases
+> GitHub: https://github.com/apache/dubbo \
+> Release Notes: https://github.com/apache/dubbo/releases
+
+### 2.7.2 (2019-06-06)
+
+* [source](https://www.apache.org/dyn/closer.cgi?path=dubbo/2.7.2/apache-dubbo-2.7.2-src.zip) |
+[asc](https://www.apache.org/dist/dubbo/2.7.2/apache-dubbo-2.7.2-src.zip.asc) |
+[sha512](https://www.apache.org/dist/dubbo/2.7.2/apache-dubbo-2.7.2-src.zip.sha512)
### 2.7.1 (2019-03-26)
-* [source](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip) |
-[asc](https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.asc) |
-[sha512](https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.sha512)
-* [binary](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip) |
-[asc](https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.asc) |
-[sha512](https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.sha512)
+* [source](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip) |
+[asc](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.asc) |
+[sha512](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.sha512)
+* [binary](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip) |
+[asc](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.asc) |
+[sha512](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.sha512)
+
### 2.7.0 (2019-01-29)
diff --git a/blog/zh-cn/download.md b/blog/zh-cn/download.md
index 4dcc644..16c2db6 100644
--- a/blog/zh-cn/download.md
+++ b/blog/zh-cn/download.md
@@ -17,14 +17,20 @@ description: 本文将向你介绍如何点击了解各版本详情和升级注
> GitHub: https://github.com/apache/incubator-dubbo \
> 发布说明：https://github.com/apache/incubator-dubbo/releases
+### 2.7.2 (2019-06-06)
+
+* [source](https://www.apache.org/dyn/closer.cgi?path=dubbo/2.7.2/apache-dubbo-2.7.2-src.zip) |
+[asc](https://www.apache.org/dist/dubbo/2.7.2/apache-dubbo-2.7.2-src.zip.asc) |
+[sha512](https://www.apache.org/dist/dubbo/2.7.2/apache-dubbo-2.7.2-src.zip.sha512)
+
### 2.7.1 (2019-03-26)
-* [source](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip) |
-[asc](https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.asc) |
-[sha512](https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.sha512)
-* [binary](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip) |
-[asc](https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.asc) |
-[sha512](https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.sha512)
+* [source](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip) |
+[asc](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.asc) |
+[sha512](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.sha512)
+* [binary](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip) |
+[asc](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.asc) |
+[sha512](https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.sha512)
### 2.7.0 (2019-01-29)
diff --git a/build/blog.js b/build/blog.js
index e7e5939..c1b858f 100644
--- a/build/blog.js
+++ b/build/blog.js
@@ -3,4 +3,4 @@
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof r;if("string"===o||"number"===o)e.push(r);else if(Array.isArray(r)&&r.length){var a=n.apply(null,r);a&&e.push(a)}else if("object"===o)for(var u in r)i.call(r,u)&&r[u]&&e.push(u)}}return e.join(" ")}var i={}.hasOwnProperty;void 0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
+!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof r;if("string"===o||"number"===o)e.push(r);else if(Array.isArray(r)&&r.length){var a=n.apply(null,r);a&&e.push(a)}else if("object"===o)for(var u in r)i.call(r,u)&&r[u]&&e.push(u)}}return e.join(" ")}var i={}.hasOwnProperty;void 0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
diff --git a/build/blogDetail.js b/build/blogDetail.js
index e600c0f..d3f45b3 100644
--- a/build/blogDetail.js
+++ b/build/blogDetail.js
@@ -3,4 +3,4 @@
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof r;if("string"===o||"number"===o)e.push(r);else if(Array.isArray(r)&&r.length){var a=n.apply(null,r);a&&e.push(a)}else if("object"===o)for(var u in r)i.call(r,u)&&r[u]&&e.push(u)}}return e.join(" ")}var i={}.hasOwnProperty;void 0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
+!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof r;if("string"===o||"number"===o)e.push(r);else if(Array.isArray(r)&&r.length){var a=n.apply(null,r);a&&e.push(a)}else if("object"===o)for(var u in r)i.call(r,u)&&r[u]&&e.push(u)}}return e.join(" ")}var i={}.hasOwnProperty;void 0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
diff --git a/build/community.js b/build/community.js
index cbea2d7..987d309 100644
--- a/build/community.js
+++ b/build/community.js
@@ -3,4 +3,4 @@
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof r;if("string"===o||"number"===o)e.push(r);else if(Array.isArray(r)&&r.length){var a=n.apply(null,r);a&&e.push(a)}else if("object"===o)for(var l in r)i.call(r,l)&&r[l]&&e.push(l)}}return e.join(" ")}var i={}.hasOwnProperty;void 0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
+!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof r;if("string"===o||"number"===o)e.push(r);else if(Array.isArray(r)&&r.length){var a=n.apply(null,r);a&&e.push(a)}else if("object"===o)for(var l in r)i.call(r,l)&&r[l]&&e.push(l)}}return e.join(" ")}var i={}.hasOwnProperty;void 0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
diff --git a/build/documentation.js b/build/documentation.js
index ba46293..03452f4 100644
--- a/build/documentation.js
+++ b/build/documentation.js
@@ -1,6 +1,6 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=81) [...]
+!function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=81) [...]
Copyright (c) 2017 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof r;if("string"===o||"number"===o)e.push(r);else if(Array.isArray(r)&&r.length){var l=n.apply(null,r);l&&e.push(l)}else if("object"===o)for(var s in r)i.call(r,s)&&r[s]&&e.push(s)}}return e.join(" ")}var i={}.hasOwnProperty;void 0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
+!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof r;if("string"===o||"number"===o)e.push(r);else if(Array.isArray(r)&&r.length){var l=n.apply(null,r);l&&e.push(l)}else if("object"===o)for(var s in r)i.call(r,s)&&r[s]&&e.push(s)}}return e.join(" ")}var i={}.hasOwnProperty;void 0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
diff --git a/build/home.js b/build/home.js
index e81a185..d60eb23 100644
--- a/build/home.js
+++ b/build/home.js
@@ -3,4 +3,4 @@
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
-!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof r;if("string"===o||"number"===o)e.push(r);else if(Array.isArray(r)&&r.length){var i=n.apply(null,r);i&&e.push(i)}else if("object"===o)for(var u in r)a.call(r,u)&&r[u]&&e.push(u)}}return e.join(" ")}var a={}.hasOwnProperty;void 0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
+!function(){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++){var r=arguments[t];if(r){var o=typeof r;if("string"===o||"number"===o)e.push(r);else if(Array.isArray(r)&&r.length){var i=n.apply(null,r);i&&e.push(i)}else if("object"===o)for(var u in r)a.call(r,u)&&r[u]&&e.push(u)}}return e.join(" ")}var a={}.hasOwnProperty;void 0!==e&&e.exports?(n.default=n,e.exports=n):(r=[],void 0!==(o=function(){return n}.apply(t,r))&&(e.exports=o))}()},function(e,t,n){"use strict";funct [...]
\ No newline at end of file
diff --git a/docs/en-us/developers/committer-guide/release-guide_dev.md b/docs/en-us/developers/committer-guide/release-guide_dev.md
index 54b91dc..d5f7422 100644
--- a/docs/en-us/developers/committer-guide/release-guide_dev.md
+++ b/docs/en-us/developers/committer-guide/release-guide_dev.md
@@ -168,15 +168,15 @@ modifications and taggings related to ${release_version} Release Candidates are
This push the snapshot package to the maven central repository.
-3. Release with maven-release-plugin
+3. ~~Release with maven-release-plugin~~ (`Deprecated`，Skip this step and refer to next step)
- - verify with dryRun
+ - ~~verify with dryRun~~
```shell
$ mvn release:prepare -Prelease -Darguments="-Dmaven.test.skip=true" -DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID -DdryRun=true
```
- - After verification, run release:prepare
+ - ~~After verification, run release:prepare~~
```shell
$ mvn release:clean
@@ -194,7 +194,7 @@ modifications and taggings related to ${release_version} Release Candidates are
If `-DpushChanges=false` is specified, you will have to manually push the commit to remote repository before go to next step.
- - Run release:perform
+ - ~~Run release:perform~~
```shell
$ mvn release:perform -Prelease -Darguments="-Dmaven.test.skip=true" -DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID
@@ -202,6 +202,19 @@ modifications and taggings related to ${release_version} Release Candidates are
Maven will download the source code from the tag you just pushed, compile it, and deploy to remote maven repsoitry in staging state.
+### use `mvn deploy` to deploy
+
+> Requirement：maven 3.5+
+
+modify pom version from 2.7.x-SNAPSHOT to 2.7.x . You can search the full-text in the dubbo project.
+
+```shell
+$ mvn clean install -Prelease
+$ mvn deploy -Prelease -DskipTests
+```
+
+After this, maven will deploy jar to remote maven repsoitry in staging state.
+
### Note
> When you deploy the package into repository, it will be interrupted for network. So you must restart to desploy.
@@ -214,18 +227,18 @@ modifications and taggings related to ${release_version} Release Candidates are
2. Checkout dubbo to local directory
```shell
- $ svn checkout https://dist.apache.org/repos/dist/dev/incubator/dubbo
+ $ svn checkout https://dist.apache.org/repos/dist/dev/dubbo
```
- Assume that the local directory is `~/apache/incubator/dubbo`
+ Assume that the local directory is `~/apache/dubbo`
3. The current release version is ${release_version}, new directory
```shell
- $ cd ~/apache/incubator/dubbo # dubbo svn root directory
+ $ cd ~/apache/dubbo # dubbo svn root directory
$ mkdir ${release_version}
```
-4. Add public key to [KEYS](https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS) file if you are the first time to be a release manager. KEYS is mainly used to allow people who participate in the voting to be imported locally to verify the correctness of the sign.
+4. Add public key to [KEYS](https://dist.apache.org/repos/dist/dev/dubbo/KEYS) file if you are the first time to be a release manager. KEYS is mainly used to allow people who participate in the voting to be imported locally to verify the correctness of the sign.
```shell
$ (gpg --list-sigs <your name> && gpg --armor --export <your name>) >> KEYS
@@ -298,7 +311,7 @@ $ shasum -c apache-dubbo-${release_version}-bin-release.zip.sha512
If it's your first time verify a release candidte, you should import public keys first.
```sh
- $ curl https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS >> KEYS # download public keys to local directory
+ $ curl https://dist.apache.org/repos/dist/dev/dubbo/KEYS >> KEYS # download public keys to local directory
$ gpg --import KEYS # import keys
$ gpg —edit-key liujun
> trust # type trust command
@@ -314,8 +327,6 @@ gpg --verify apache-dubbo-2.6.3-bin-release.zip.asc apache-dubbo-2.6.3-bin-relea
Unzip apache-dubbo-${release_version}-source-release.zip to the default directory and check the following:
-- Directory with 'incubating' in name
- `apache-dubbo-${release_version}-source-release`
- DISCLAIMER exists
- LICENSE and NOTICE exists and contents are good
- All files and no binary files exist
@@ -350,27 +361,25 @@ If one dependency is dual/multiple licensed, just choose the most permissive one
Unzip apache-dubbo-${release_version}-bin-release.zip and check:
* Check signatures are good
-* 'incubating' in name
* LICENSE and NOTICE exists and contents are good
Note that if the binary distribution contains third party files, you may need to update LICENSE file by adding the 3rd party license files. If these dependency is Apache License 2.0, and it contains NOTICE file, you may also need to update NOTICE file as well.
## Release vote
-The voting is divided into two phases:
+The voting just only one round:
-1. Dubbo community votes and sends the voting email to dev@dubbo.apache.org. After reviewing by community developers and winning 3 binding tickets that agree to release, you can go to the next stage of voting.
-2. Apache community votes and sends the voting email to general@incubator.apache.org. After reviewing by Apache IPMC(Incubator PMC) members and winning 3 binding votes that agree to release, you will be allowed to release officially.
+Dubbo community votes and sends the voting email to dev@dubbo.apache.org. After reviewing by community developers and winning 3 binding tickets that agree to release, you can go to the next stage of voting.
The mail template for Apache Dubbo vote：
```tex
Hello Dubbo Community,
-This is a call for vote to release Apache Dubbo (Incubating) version 2.6.2.
+This is a call for vote to release Apache Dubbo version 2.7.2.
The release candidates:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/2.6.2/
+https://dist.apache.org/repos/dist/dev/dubbo/2.7.2/
The staging repo:
https://repository.apache.org/content/repositories/orgapachedubbo-1005
@@ -385,7 +394,7 @@ Release Notes:
https://github.com/apache/dubbo/releases/tag/untagged-4775c0a22c60fca55118
The artifacts have been signed with Key : 28681CB1, which can be found in the keys file:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS
+https://dist.apache.org/repos/dist/dev/dubbo/KEYS
The vote will be open for at least 72 hours or until necessary number of votes are reached.
@@ -396,65 +405,10 @@ Please vote accordingly:
[ ] -1 disapprove with the reason
Thanks,
-The Apache Dubbo (Incubating) Team
+The Apache Dubbo Team
```
-The mail template for Apache Incubator vote：
-
-```text
-Hello all,
-
-This is a call for vote to release Apache Dubbo (Incubating) version 2.6.4.
-
-The Apache Dubbo community has voted on and approved a proposal to release
-Apache Dubbo (Incubating) version 2.6.4.
-We now kindly request the Incubator PMC members review and vote on this
-incubator release.
-
-Apache Dubbo™ is a high-performance, java based, open source
-RPC framework. Dubbo offers three key functionalities, which include
-interface based remote call, fault tolerance & load balancing, and
-automatic service registration & discovery.
-
-Dubbo community vote and result thread:
-https://lists.apache.org/thread.html/8d5c39eece6288beed2e22ca976350728c571d2a9cef1c9a9e56a409@%3Cdev.dubbo.apache.org%3E
-A minor issue also can be found in the above thread.
-
-The release candidates (RC1):
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/2.6.4
-
-The staging repo:
-https://repository.apache.org/content/repositories/orgapachedubbo-1005
-
-Git tag for the release (RC1):
-https://github.com/apache/dubbo/tree/dubbo-2.6.4
-
-Hash for the release tag:
-88037747a3b69d3225c73f6fbcda36ebd8435887
-
-Release Notes:
-*https://github.com/apache/dubbo/blob/dubbo-2.6.4/CHANGES.md
-<https://github.com/apache/dubbo/blob/dubbo-2.6.4/CHANGES.md>*
-
-The artifacts have been signed with Key : 7955FB6D1DD21CF7, which can be
-found in the keys file:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS
-
-Look at here for how to verify this release candidate:
-https://github.com/apache/dubbo-website/blob/asf-site/blog/en-us/prepare-an-apache-release.md#prepare-apache-release
-
-The vote will be open for at least 72 hours or until necessary number of
-votes are reached.
-
-Please vote accordingly:
-[ ] +1 approve
-[ ] +0 no opinion
-[ ] -1 disapprove with the reason
-
-Thanks,
-The Apache Dubbo (Incubating) Team
-```
The mail template to announce the vote result:
@@ -467,10 +421,10 @@ We’ve received 3 +1 binding votes and one +1 non-binding vote:
+1 non-binding, Jerrick
-I will create a new vote thread in Apache community now.
+I will release this version today.
Best regards,
-The Apache Dubbo (Incubating) Team
+The Apache Dubbo Team
```
## Official Release
@@ -478,14 +432,14 @@ The Apache Dubbo (Incubating) Team
When the release vote has passed,
-1. Add the release files to [official release directory](https://dist.apache.org/repos/dist/release/incubator/dubbo)
-2. Remove the release files in [dev directory](https://dist.apache.org/repos/dist/dev/incubator/dubbo)
-3. Remove the the release file for the previous release under [official release directory](https://dist.apache.org/repos/dist/release/incubator/dubbo/), which will be archived and can be found [here](https://archive.apache.org/dist/incubator/dubbo/)
+1. Add the release files to [official release directory](https://dist.apache.org/repos/dist/release/dubbo)
+2. Remove the release files in [dev directory](https://dist.apache.org/repos/dist/dev/dubbo)
+3. Remove the the release file for the previous release under [official release directory](https://dist.apache.org/repos/dist/release/dubbo/), which will be archived and can be found [here](https://archive.apache.org/dist/dubbo/)
5. Publish [release notes](https://github.com/apache/dubbo/releases) on Github.
6. Update the recommend dependency on [Github](https://github.com/apache/dubbo#maven-dependency) to the latest version, also update the version in other place if necessary.
-7. Add the download link to official website http://dubbo.apache.org/en-us/blog/download.html, using the ASF mirror system. The latest release download link should be something like [this](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/$VERSION/apache-dubbo-$VERSION-source-release.zip). The download link for the previous release version should be changed like [this](https://archive.apache.org/dist/incubator/dubbo/$VERSION/apache-dubbo-$VERSION-bin-release.zip). Please refer t [...]
+7. Add the download link to official website http://dubbo.apache.org/en-us/blog/download.html, using the ASF mirror system. The latest release download link should be something like [this](https://www.apache.org/dyn/closer.cgi?path=dubbo/$VERSION/apache-dubbo-$VERSION-source-release.zip). The download link for the previous release version should be changed like [this](https://archive.apache.org/dist/dubbo/$VERSION/apache-dubbo-$VERSION-bin-release.zip). Please refer to the [download page [...]
8. Make sure all the commits in the release branch are merged into master branch, and then remove the remote release branch. For example: `git push origin --delete 2.7.0-release`
-9. Send mail to dev@dubbo.apache.org and general@incubator.apache.org, notify the community that the release is completed.
+9. Send mail to dev@dubbo.apache.org , notify the community that the release is completed.
The mail template to announce release:
```text
Hello Community,
@@ -509,12 +463,6 @@ an issue on GitHub[4].
-=====
-*Disclaimer*
-
-Apache Dubbo is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet [...]
-
-
[1] http://dubbo.apache.org/en-us/blog/download.html
[2] http://central.maven.org/maven2/com/alibaba/dubbo
[3] https://github.com/apache/dubbo/releases
diff --git a/docs/zh-cn/developers/committer-guide/release-guide_dev.md b/docs/zh-cn/developers/committer-guide/release-guide_dev.md
index 0518b10..e128a15 100644
--- a/docs/zh-cn/developers/committer-guide/release-guide_dev.md
+++ b/docs/zh-cn/developers/committer-guide/release-guide_dev.md
@@ -155,15 +155,15 @@ $ mvn deploy
上述命令将snapshot包推送到maven中央仓库
-### 用maven-release-plugin发布
+### ~~用maven-release-plugin发布~~ (`废弃`，参考后一步)
-先用dryRun验证是否ok
+~~先用dryRun验证是否ok~~
```shell
$ mvn release:prepare -Prelease -Darguments="-DskipTests" -DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID-DdryRun=true
```
-验证通过后，执行release:prepare
+~~验证通过后，执行release:prepare~~
```shell
$ mvn release:clean
@@ -181,7 +181,7 @@ $ mvn release:prepare -Prelease -Darguments="-DskipTests" -DautoVersionSubmodule
> 如果指定了`-DpushChanges=true`, 则本地提交会自动推送到远端的GitHub仓库。根据经验，建议不要指定为true，请设置为false，待本地检查通过之后再手动提交
-执行release:perform，做staging发布
+~~执行release:perform，做staging发布~~
```shell
$ mvn -Prelease release:perform -Darguments="-DskipTests" -DautoVersionSubmodules=true -Dusername=YOUR GITHUB ID
@@ -189,9 +189,22 @@ $ mvn -Prelease release:perform -Darguments="-DskipTests" -DautoVersionSubmodule
此时插件会自动下载远端的tag对应的源码，编译后，将所有Artifacts发布到配置的远程[maven仓库](http://repository.apache.org)，处于staging状态。
+### 使用mvn deploy进行deploy
+
+> 要求：maven 3.5+
+
+修改pom文件中的版本号，从2.7.x-SNAPSHOT改为2.7.x， 目前有3个地方需要修改。建议全文搜索。
+
+```shell
+$ mvn clean install -Prelease
+$ mvn deploy -Prelease -DskipTests
+```
+
+所有被deploy到远程[maven仓库](http://repository.apache.org)的Artifacts都会处于staging状态
+
#### 注意点
-- 在deploy执行过程中，有可能因为网络等原因被中断，如果是这样，可以重新开始执行。
+- 在deploy执行过程中，有可能因为网络等原因被中断，如果是这样，可以重新开始执行。
- deploy执行到maven仓库的时候，请确认下包的总量是否正确。多次出现了包丢失的情况，特别是dubbo-parent包。
@@ -202,18 +215,18 @@ $ mvn -Prelease release:perform -Darguments="-DskipTests" -DautoVersionSubmodule
2. 将dubbo checkout到本地目录
```shell
- $ svn checkout https://dist.apache.org/repos/dist/dev/incubator/dubbo
- # 假定本地目录为 ~/apache/incubator/dubbo
+ $ svn checkout https://dist.apache.org/repos/dist/dev/dubbo
+ # 假定本地目录为 ~/apache/dubbo
```
3. 当前发布版本为${release_version}，新建目录
```shell
- $ cd ~/apache/incubator/dubbo # dubbo svn根目录
+ $ cd ~/apache/dubbo # dubbo svn根目录
$ mkdir ${release_version}
```
-4. 添加public key到[KEYS](https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS)文件并提交到SVN仓库（第一次做发布的人需要做这个操作，具体操作参考KEYS文件里的说明）。KEYS主要是让参与投票的人在本地导入，用来校验sign的正确性
+4. 添加public key到[KEYS](https://dist.apache.org/repos/dist/dev/dubbo/KEYS)文件并提交到SVN仓库（第一次做发布的人需要做这个操作，具体操作参考KEYS文件里的说明）。KEYS主要是让参与投票的人在本地导入，用来校验sign的正确性
```sh
$ (gpg --list-sigs <your name> && gpg --armor --export <your name>) >> KEYS
@@ -260,7 +273,7 @@ $ mvn -Prelease release:perform -Darguments="-DskipTests" -DautoVersionSubmodule
首先，从一下地址下载要发布的Release Candidate到本地环境：
<pre>
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/${release_version}/
+https://dist.apache.org/repos/dist/dev/dubbo/${release_version}/
</pre>
然后，开始验证环节，验证包含但不限于以下内容和形式
@@ -279,7 +292,7 @@ $ shasum -c apache-dubbo-${release_version}-bin-release.zip.sha512
如果是第一次检查，需要首先导入公钥。
```sh
- $ curl https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS >> KEYS # download public keys to local directory
+ $ curl https://dist.apache.org/repos/dist/dev/dubbo/KEYS >> KEYS # download public keys to local directory
$ gpg --import KEYS # import keys
$ gpg —edit-key liujun
> trust # type trust command
@@ -295,9 +308,7 @@ gpg --verify apache-dubbo-2.6.3-bin-release.zip.asc apache-dubbo-2.6.3-bin-relea
### 检查源码包的文件内容
解压缩`apache-dubbo-${release_version}-source-release.zip`，进行如下检查:
-
-- Directory with 'incubating' in name
- `apache-dubbo-${release_version}-source-release`
+
- DISCLAIMER exists
- LICENSE and NOTICE exists and contents are good
- All files and no binary files exist
@@ -331,33 +342,31 @@ find . -name THIRD-PARTY.txt | xargs grep -E 'GPL|General Public License' | grep
解压缩`apache-dubbo-${release_version}-bin-release.zip`，进行如下检查:
* Check signatures are good
-* 'incubating' in name
* LICENSE and NOTICE exists and contents are good
注意，如果二进制包里面引入了第三方依赖，则需要更新LICENSE，加入第三方依赖的LICENSE，如果第三方依赖的LICENSE是Apache 2.0，并且对应的项目中包含了NOTICE，还需要更新NOTICE文件
## 进入投票
-投票分两个阶段：
+dubbo毕业之后，投票分只需要一次：
1. Dubbo社区投票，发起投票邮件到dev@dubbo.apache.org。在社区开发者Review，经过至少72小时并统计到3个同意发版的binding票后（只有PMC的票才是binding），即可进入下一阶段的投票。
-2. Apache社区投票，发起投票邮件到general@incubator.apache.org。经过至少72小时并统计到3个同意发版的binding票后（只有IPMC Member的票才是binding），即可进行正式发布。
Dubbo社区投票邮件模板：
```text
Hello Dubbo Community,
-This is a call for vote to release Apache Dubbo (Incubating) version 2.6.2.
+This is a call for vote to release Apache Dubbo version 2.7.2.
The release candidates:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/2.6.2/
+https://dist.apache.org/repos/dist/dev/dubbo/2.7.2/
The staging repo:
https://repository.apache.org/content/repositories/orgapachedubbo-1005
Git tag for the release:
-https://github.com/apache/dubbo/tree/dubbo-2.6.2
+https://github.com/apache/dubbo/tree/dubbo-2.7.2
Hash for the release tag:
afab04c53edab38d52275d2a198ea1aff7a4f41e
@@ -366,7 +375,7 @@ Release Notes:
https://github.com/apache/dubbo/releases/tag/untagged-4775c0a22c60fca55118
The artifacts have been signed with Key : 28681CB1, which can be found in the keys file:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS
+https://dist.apache.org/repos/dist/dev/dubbo/KEYS
The vote will be open for at least 72 hours or until necessary number of votes are reached.
@@ -377,65 +386,9 @@ Please vote accordingly:
[ ] -1 disapprove with the reason
Thanks,
-The Apache Dubbo (Incubating) Team
+The Apache Dubbo Team
```
-Apache社区投票邮件模板：
-
-```text
-Hello all,
-
-This is a call for vote to release Apache Dubbo (Incubating) version 2.6.4.
-
-The Apache Dubbo community has voted on and approved a proposal to release
-Apache Dubbo (Incubating) version 2.6.4.
-
-We now kindly request the Incubator PMC members review and vote on this
-incubator release.
-
-Apache Dubbo™ is a high-performance, java based, open source
-RPC framework. Dubbo offers three key functionalities, which include
-interface based remote call, fault tolerance & load balancing, and
-automatic service registration & discovery.
-
-Dubbo community vote and result thread:
-https://lists.apache.org/thread.html/8d5c39eece6288beed2e22ca976350728c571d2a9cef1c9a9e56a409@%3Cdev.dubbo.apache.org%3E
-A minor issue also can be found in the above thread.
-
-The release candidates (RC1):
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/2.6.4
-
-The staging repo:
-https://repository.apache.org/content/repositories/orgapachedubbo-1005
-
-Git tag for the release (RC1):
-https://github.com/apache/dubbo/tree/dubbo-2.6.4
-
-Hash for the release tag:
-88037747a3b69d3225c73f6fbcda36ebd8435887
-
-Release Notes:
-*https://github.com/apache/dubbo/blob/dubbo-2.6.4/CHANGES.md
-<https://github.com/apache/dubbo/blob/dubbo-2.6.4/CHANGES.md>*
-
-The artifacts have been signed with Key : 7955FB6D1DD21CF7, which can be
-found in the keys file:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS
-
-Look at here for how to verify this release candidate:
-https://github.com/apache/dubbo-website/blob/asf-site/blog/en-us/prepare-an-apache-release.md#prepare-apache-release
-
-The vote will be open for at least 72 hours or until necessary number of
-votes are reached.
-
-Please vote accordingly:
-[ ] +1 approve
-[ ] +0 no opinion
-[ ] -1 disapprove with the reason
-
-Thanks,
-The Apache Dubbo (Incubating) Team
-```
宣布投票结果模板：
```text
@@ -447,22 +400,22 @@ We’ve received 3 +1 binding votes and one +1 non-binding vote:
+1 non-binding, Jerrick
-I will create a new vote thread in Apache community now.
+I will start to release today.
Best regards,
-The Apache Dubbo (Incubating) Team
+The Apache Dubbo Team
```
## 正式发布
-1. 将[dev](https://dist.apache.org/repos/dist/dev/incubator/dubbo)目录下的发布包添加到[release](https://dist.apache.org/repos/dist/release/incubator/dubbo)目录下，KEYS有更新的，也需要同步更新。
-2. 删除[dev](https://dist.apache.org/repos/dist/dev/incubator/dubbo)目录下的发布包
-3. 删除[release](https://dist.apache.org/repos/dist/release/incubator/dubbo)目录下上一个版本的发布包，这些包会被自动保存在[这里](https://archive.apache.org/dist/incubator/dubbo)
+1. 将[dev](https://dist.apache.org/repos/dist/dev/dubbo)目录下的发布包添加到[release](https://dist.apache.org/repos/dist/release/dubbo)目录下，KEYS有更新的，也需要同步更新。
+2. 删除[dev](https://dist.apache.org/repos/dist/dev/dubbo)目录下的发布包
+3. 删除[release](https://dist.apache.org/repos/dist/release/dubbo)目录下上一个版本的发布包，这些包会被自动保存在[这里](https://archive.apache.org/dist/dubbo)
4. 发布GitHub上的[release notes](https://github.com/apache/dubbo/releases)
5. 修改GitHub的Readme文件，将版本号更新到最新发布的版本
-6. 在官网下载[页面](http://dubbo.apache.org/en-us/blog/download.html)上添加最新版本的下载链接。最新的下载链接应该类似[这样](https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/$VERSION/apache-dubbo-$VERSION-source-release.zip). 同时更新以前版本的下载链接，改为类似[这样](https://archive.apache.org/dist/incubator/dubbo/$VERSION/apache-dubbo-$VERSION-bin-release.zip). 具体可以参考过往的[下载链接](https://github.com/apache/dubbo-website/blob/asf-site/blog/en-us/download.md)
+6. 在官网下载[页面](http://dubbo.apache.org/en-us/blog/download.html)上添加最新版本的下载链接。最新的下载链接应该类似[这样](https://www.apache.org/dyn/closer.cgi?path=dubbo/$VERSION/apache-dubbo-$VERSION-source-release.zip). 同时更新以前版本的下载链接，改为类似[这样](https://archive.apache.org/dist/dubbo/$VERSION/apache-dubbo-$VERSION-bin-release.zip). 具体可以参考过往的[下载链接](https://github.com/apache/dubbo-website/blob/asf-site/blog/en-us/download.md)
7. 合并`${release-version}-release`分支到对应的主干分支， 然后删除相应的release分支，例如: `git push origin --delete 2.7.0-release`
-8. 发邮件到 `dev@dubbo.apache.org` 和 `general@incubator.apache.org`
+8. 发邮件到 `dev@dubbo.apache.org`
宣布release邮件模板：
```text
@@ -486,13 +439,6 @@ hesitate to let us know by sending feedback to this mailing list or filing
an issue on GitHub[4].
-
-=====
-*Disclaimer*
-
-Apache Dubbo is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet [...]
-
-
[1] http://dubbo.apache.org/en-us/blog/download.html
[2] http://central.maven.org/maven2/com/alibaba/dubbo
[3] https://github.com/apache/dubbo/releases
@@ -511,7 +457,7 @@ Apache Dubbo is an effort undergoing incubation at The Apache Software Foundatio
#### gpg: signing failed: Inappropriate ioctl for device
-If you've encoutered this error, try the following commands:
+If you've encountered this error, try the following commands:
```
export GPG_TTY=$(tty)
diff --git a/en-us/blog/download.html b/en-us/blog/download.html
index ab3e720..0d27efd 100644
--- a/en-us/blog/download.html
+++ b/en-us/blog/download.html
@@ -14,20 +14,26 @@
<body>
<div id="root"><div class="blog-detail-page" data-reactroot=""><header class="header-container header-container-normal"><div class="header-body"><a href="/en-us/index.html"><img class="logo" src="/img/dubbo_colorful.png"/></a><div class="search search-normal"><span class="icon-search"></span></div><span class="language-switch language-switch-normal">中</span><div class="header-menu"><img class="header-menu-toggle" src="/img/menu_gray.png"/><ul><li class="menu-item menu-item-normal"><a hr [...]
<h2>Verification</h2>
-<p>you can follow these <a href="https://www.apache.org/info/verification">procedures</a> and the <a href="https://www.apache.org/dist/incubator/dubbo/KEYS">KEYS</a> file to verify the download files</p>
+<p>you can follow these <a href="https://www.apache.org/info/verification">procedures</a> and the <a href="https://www.apache.org/dist/dubbo/KEYS">KEYS</a> file to verify the download files</p>
<h2>Apache Dubbo</h2>
<blockquote>
-<p>GitHub: <a href="https://github.com/apache/incubator-dubbo">https://github.com/apache/incubator-dubbo</a> <br>
-Release Notes: <a href="https://github.com/apache/incubator-dubbo/releases">https://github.com/apache/incubator-dubbo/releases</a></p>
+<p>GitHub: <a href="https://github.com/apache/dubbo">https://github.com/apache/dubbo</a> <br>
+Release Notes: <a href="https://github.com/apache/dubbo/releases">https://github.com/apache/dubbo/releases</a></p>
</blockquote>
+<h3>2.7.2 (2019-06-06)</h3>
+<ul>
+<li><a href="https://www.apache.org/dyn/closer.cgi?path=dubbo/2.7.2/apache-dubbo-2.7.2-src.zip">source</a> |
+<a href="https://www.apache.org/dist/dubbo/2.7.2/apache-dubbo-2.7.2-src.zip.asc">asc</a> |
+<a href="https://www.apache.org/dist/dubbo/2.7.2/apache-dubbo-2.7.2-src.zip.sha512">sha512</a></li>
+</ul>
<h3>2.7.1 (2019-03-26)</h3>
<ul>
-<li><a href="https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip">source</a> |
-<a href="https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.asc">asc</a> |
-<a href="https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.sha512">sha512</a></li>
-<li><a href="https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip">binary</a> |
-<a href="https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.asc">asc</a> |
-<a href="https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.sha512">sha512</a></li>
+<li><a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip">source</a> |
+<a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.asc">asc</a> |
+<a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.sha512">sha512</a></li>
+<li><a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip">binary</a> |
+<a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.asc">asc</a> |
+<a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.sha512">sha512</a></li>
</ul>
<h3>2.7.0 (2019-01-29)</h3>
<ul>
diff --git a/en-us/blog/download.json b/en-us/blog/download.json
index 62a485c..bebdbe2 100644
--- a/en-us/blog/download.json
+++ b/en-us/blog/download.json
@@ -1,6 +1,6 @@
{
"filename": "download.md",
- "__html": "<h1>Downloads</h1>\n<h2>Verification</h2>\n<p>you can follow these <a href=\"https://www.apache.org/info/verification\">procedures</a> and the <a href=\"https://www.apache.org/dist/incubator/dubbo/KEYS\">KEYS</a> file to verify the download files</p>\n<h2>Apache Dubbo</h2>\n<blockquote>\n<p>GitHub: <a href=\"https://github.com/apache/incubator-dubbo\">https://github.com/apache/incubator-dubbo</a> <br>\nRelease Notes: <a href=\"https://github.com/apache/incubator-dubbo/releas [...]
+ "__html": "<h1>Downloads</h1>\n<h2>Verification</h2>\n<p>you can follow these <a href=\"https://www.apache.org/info/verification\">procedures</a> and the <a href=\"https://www.apache.org/dist/dubbo/KEYS\">KEYS</a> file to verify the download files</p>\n<h2>Apache Dubbo</h2>\n<blockquote>\n<p>GitHub: <a href=\"https://github.com/apache/dubbo\">https://github.com/apache/dubbo</a> <br>\nRelease Notes: <a href=\"https://github.com/apache/dubbo/releases\">https://github.com/apache/dubbo/rel [...]
"link": "/en-us/blog/download.html",
"meta": {
"title": "Downloads",
diff --git a/en-us/docs/developers/committer-guide/release-guide_dev.html b/en-us/docs/developers/committer-guide/release-guide_dev.html
index dfd8607..d460b94 100644
--- a/en-us/docs/developers/committer-guide/release-guide_dev.html
+++ b/en-us/docs/developers/committer-guide/release-guide_dev.html
@@ -172,14 +172,14 @@ modifications and taggings related to ${release_version} Release Candidates are
<p>This push the snapshot package to the maven central repository.</p>
<ol start="3">
<li>
-<p>Release with maven-release-plugin</p>
+<p><s>Release with maven-release-plugin</s> (<code>Deprecated</code>，Skip this step and refer to next step)</p>
<ul>
-<li>verify with dryRun</li>
+<li><s>verify with dryRun</s></li>
</ul>
<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn release:prepare -Prelease -Darguments=<span class="hljs-string">"-Dmaven.test.skip=true"</span> -DautoVersionSubmodules=<span class="hljs-literal">true</span> -Dusername=YOUR GITHUB ID -DdryRun=<span class="hljs-literal">true</span></span>
</code></pre>
<ul>
-<li>After verification, run release:prepare</li>
+<li><s>After verification, run release:prepare</s></li>
</ul>
<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn release:clean</span>
<span class="hljs-meta">$</span><span class="bash"> mvn release:prepare -Prelease -Darguments=<span class="hljs-string">"-Dmaven.test.skip=true"</span> -DautoVersionSubmodules=<span class="hljs-literal">true</span> -Dusername=YOUR GITHUB ID -DpushChanges=<span class="hljs-literal">false</span></span>
@@ -196,13 +196,22 @@ you need to choose the release artifactId, next artifactId and the release tag,
</ol>
<p>If <code>-DpushChanges=false</code> is specified, you will have to manually push the commit to remote repository before go to next step.</p>
<ul>
-<li>Run release:perform</li>
+<li><s>Run release:perform</s></li>
</ul>
<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn release:perform -Prelease -Darguments=<span class="hljs-string">"-Dmaven.test.skip=true"</span> -DautoVersionSubmodules=<span class="hljs-literal">true</span> -Dusername=YOUR GITHUB ID</span>
</code></pre>
<p>Maven will download the source code from the tag you just pushed, compile it, and deploy to remote maven repsoitry in staging state.</p>
</li>
</ol>
+<h3>use <code>mvn deploy</code> to deploy</h3>
+<blockquote>
+<p>Requirement：maven 3.5+</p>
+</blockquote>
+<p>modify pom version from 2.7.x-SNAPSHOT to 2.7.x . You can search the full-text in the dubbo project.</p>
+<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn clean install -Prelease</span>
+<span class="hljs-meta">$</span><span class="bash"> mvn deploy -Prelease -DskipTests</span>
+</code></pre>
+<p>After this, maven will deploy jar to remote maven repsoitry in staging state.</p>
<h3>Note</h3>
<blockquote>
<p>When you deploy the package into repository, it will be interrupted for network. So you must restart to desploy.<br>
@@ -215,18 +224,18 @@ The problem is that missing package occurred many times at deploying. So you sho
</li>
<li>
<p>Checkout dubbo to local directory</p>
-<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> svn checkout https://dist.apache.org/repos/dist/dev/incubator/dubbo</span>
+<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> svn checkout https://dist.apache.org/repos/dist/dev/dubbo</span>
</code></pre>
-<p>Assume that the local directory is <code>~/apache/incubator/dubbo</code></p>
+<p>Assume that the local directory is <code>~/apache/dubbo</code></p>
</li>
<li>
<p>The current release version is ${release_version}, new directory</p>
-<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> <span class="hljs-built_in">cd</span> ~/apache/incubator/dubbo <span class="hljs-comment"># dubbo svn root directory</span></span>
+<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> <span class="hljs-built_in">cd</span> ~/apache/dubbo <span class="hljs-comment"># dubbo svn root directory</span></span>
<span class="hljs-meta">$</span><span class="bash"> mkdir <span class="hljs-variable">${release_version}</span></span>
</code></pre>
</li>
<li>
-<p>Add public key to <a href="https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS">KEYS</a> file if you are the first time to be a release manager. KEYS is mainly used to allow people who participate in the voting to be imported locally to verify the correctness of the sign.</p>
+<p>Add public key to <a href="https://dist.apache.org/repos/dist/dev/dubbo/KEYS">KEYS</a> file if you are the first time to be a release manager. KEYS is mainly used to allow people who participate in the voting to be imported locally to verify the correctness of the sign.</p>
<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> (gpg --list-sigs <your name> && gpg --armor --<span class="hljs-built_in">export</span> <your name>) >> KEYS</span>
</code></pre>
<p>For more information on how to get your key id, please refer to this <a href="https://help.github.com/articles/generating-a-new-gpg-key/">guide</a></p>
@@ -278,7 +287,7 @@ $ shasum -c apache-dubbo-<span class="hljs-variable">${release_version}</span>-b
</code></pre>
<h4>check the gpg signarure</h4>
<p>If it's your first time verify a release candidte, you should import public keys first.</p>
-<pre><code class="language-sh"> $ curl https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS >> KEYS <span class="hljs-comment"># download public keys to local directory</span>
+<pre><code class="language-sh"> $ curl https://dist.apache.org/repos/dist/dev/dubbo/KEYS >> KEYS <span class="hljs-comment"># download public keys to local directory</span>
$ gpg --import KEYS <span class="hljs-comment"># import keys</span>
$ gpg —edit-key liujun
> trust <span class="hljs-comment"># type trust command</span>
@@ -290,8 +299,6 @@ gpg --verify apache-dubbo-2.6.3-bin-release.zip.asc apache-dubbo-2.6.3-bin-relea
<h3>Check source release file content</h3>
<p>Unzip apache-dubbo-${release_version}-source-release.zip to the default directory and check the following:</p>
<ul>
-<li>Directory with 'incubating' in name
-<code>apache-dubbo-${release_version}-source-release</code></li>
<li>DISCLAIMER exists</li>
<li>LICENSE and NOTICE exists and contents are good</li>
<li>All files and no binary files exist</li>
@@ -321,23 +328,19 @@ find . -name THIRD-PARTY.txt | xargs grep -E <span class="hljs-string">'GPL|Gene
<p>Unzip apache-dubbo-${release_version}-bin-release.zip and check:</p>
<ul>
<li>Check signatures are good</li>
-<li>'incubating' in name</li>
<li>LICENSE and NOTICE exists and contents are good</li>
</ul>
<p>Note that if the binary distribution contains third party files, you may need to update LICENSE file by adding the 3rd party license files. If these dependency is Apache License 2.0, and it contains NOTICE file, you may also need to update NOTICE file as well.</p>
<h2>Release vote</h2>
-<p>The voting is divided into two phases:</p>
-<ol>
-<li>Dubbo community votes and sends the voting email to <a href="mailto:dev@dubbo.apache.org">dev@dubbo.apache.org</a>. After reviewing by community developers and winning 3 binding tickets that agree to release, you can go to the next stage of voting.</li>
-<li>Apache community votes and sends the voting email to <a href="mailto:general@incubator.apache.org">general@incubator.apache.org</a>. After reviewing by Apache IPMC(Incubator PMC) members and winning 3 binding votes that agree to release, you will be allowed to release officially.</li>
-</ol>
+<p>The voting just only one round:</p>
+<p>Dubbo community votes and sends the voting email to <a href="mailto:dev@dubbo.apache.org">dev@dubbo.apache.org</a>. After reviewing by community developers and winning 3 binding tickets that agree to release, you can go to the next stage of voting.</p>
<p>The mail template for Apache Dubbo vote：</p>
<pre><code class="language-tex">Hello Dubbo Community,
-This is a call for vote to release Apache Dubbo (Incubating) version 2.6.2.
+This is a call for vote to release Apache Dubbo version 2.7.2.
The release candidates:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/2.6.2/
+https://dist.apache.org/repos/dist/dev/dubbo/2.7.2/
The staging repo:
https://repository.apache.org/content/repositories/orgapachedubbo-1005
@@ -352,7 +355,7 @@ Release Notes:
https://github.com/apache/dubbo/releases/tag/untagged-4775c0a22c60fca55118
The artifacts have been signed with Key : 28681CB1, which can be found in the keys file:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS
+https://dist.apache.org/repos/dist/dev/dubbo/KEYS
The vote will be open for at least 72 hours or until necessary number of votes are reached.
@@ -363,61 +366,7 @@ Please vote accordingly:
[ ] -1 disapprove with the reason
Thanks,
-The Apache Dubbo (Incubating) Team
-</code></pre>
-<p>The mail template for Apache Incubator vote：</p>
-<pre><code class="language-text">Hello all,
-
-This is a call for vote to release Apache Dubbo (Incubating) version 2.6.4.
-
-The Apache Dubbo community has voted on and approved a proposal to release
-Apache Dubbo (Incubating) version 2.6.4.
-
-We now kindly request the Incubator PMC members review and vote on this
-incubator release.
-
-Apache Dubbo™ is a high-performance, java based, open source
-RPC framework. Dubbo offers three key functionalities, which include
-interface based remote call, fault tolerance & load balancing, and
-automatic service registration & discovery.
-
-Dubbo community vote and result thread:
-https://lists.apache.org/thread.html/8d5c39eece6288beed2e22ca976350728c571d2a9cef1c9a9e56a409@%3Cdev.dubbo.apache.org%3E
-A minor issue also can be found in the above thread.
-
-The release candidates (RC1):
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/2.6.4
-
-The staging repo:
-https://repository.apache.org/content/repositories/orgapachedubbo-1005
-
-Git tag for the release (RC1):
-https://github.com/apache/dubbo/tree/dubbo-2.6.4
-
-Hash for the release tag:
-88037747a3b69d3225c73f6fbcda36ebd8435887
-
-Release Notes:
-*https://github.com/apache/dubbo/blob/dubbo-2.6.4/CHANGES.md
-<https://github.com/apache/dubbo/blob/dubbo-2.6.4/CHANGES.md>*
-
-The artifacts have been signed with Key : 7955FB6D1DD21CF7, which can be
-found in the keys file:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS
-
-Look at here for how to verify this release candidate:
-https://github.com/apache/dubbo-website/blob/asf-site/blog/en-us/prepare-an-apache-release.md#prepare-apache-release
-
-The vote will be open for at least 72 hours or until necessary number of
-votes are reached.
-
-Please vote accordingly:
-[ ] +1 approve
-[ ] +0 no opinion
-[ ] -1 disapprove with the reason
-
-Thanks,
-The Apache Dubbo (Incubating) Team
+The Apache Dubbo Team
</code></pre>
<p>The mail template to announce the vote result:</p>
<pre><code class="language-text">We’ve received 3 +1 binding votes and one +1 non-binding vote:
@@ -428,22 +377,22 @@ The Apache Dubbo (Incubating) Team
+1 non-binding, Jerrick
-I will create a new vote thread in Apache community now.
+I will release this version today.
Best regards,
-The Apache Dubbo (Incubating) Team
+The Apache Dubbo Team
</code></pre>
<h2>Official Release</h2>
<p>When the release vote has passed,</p>
<ol>
-<li>Add the release files to <a href="https://dist.apache.org/repos/dist/release/incubator/dubbo">official release directory</a></li>
-<li>Remove the release files in <a href="https://dist.apache.org/repos/dist/dev/incubator/dubbo">dev directory</a></li>
-<li>Remove the the release file for the previous release under <a href="https://dist.apache.org/repos/dist/release/incubator/dubbo/">official release directory</a>, which will be archived and can be found <a href="https://archive.apache.org/dist/incubator/dubbo/">here</a></li>
+<li>Add the release files to <a href="https://dist.apache.org/repos/dist/release/dubbo">official release directory</a></li>
+<li>Remove the release files in <a href="https://dist.apache.org/repos/dist/dev/dubbo">dev directory</a></li>
+<li>Remove the the release file for the previous release under <a href="https://dist.apache.org/repos/dist/release/dubbo/">official release directory</a>, which will be archived and can be found <a href="https://archive.apache.org/dist/dubbo/">here</a></li>
<li>Publish <a href="https://github.com/apache/dubbo/releases">release notes</a> on Github.</li>
<li>Update the recommend dependency on <a href="https://github.com/apache/dubbo#maven-dependency">Github</a> to the latest version, also update the version in other place if necessary.</li>
-<li>Add the download link to official website <a href="http://dubbo.apache.org/en-us/blog/download.html">http://dubbo.apache.org/en-us/blog/download.html</a>, using the ASF mirror system. The latest release download link should be something like <a href="https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/$VERSION/apache-dubbo-$VERSION-source-release.zip">this</a>. The download link for the previous release version should be changed like <a href="https://archive.apache.org/dist/in [...]
+<li>Add the download link to official website <a href="http://dubbo.apache.org/en-us/blog/download.html">http://dubbo.apache.org/en-us/blog/download.html</a>, using the ASF mirror system. The latest release download link should be something like <a href="https://www.apache.org/dyn/closer.cgi?path=dubbo/$VERSION/apache-dubbo-$VERSION-source-release.zip">this</a>. The download link for the previous release version should be changed like <a href="https://archive.apache.org/dist/dubbo/$VERSI [...]
<li>Make sure all the commits in the release branch are merged into master branch, and then remove the remote release branch. For example: <code>git push origin --delete 2.7.0-release</code></li>
-<li>Send mail to <a href="mailto:dev@dubbo.apache.org">dev@dubbo.apache.org</a> and <a href="mailto:general@incubator.apache.org">general@incubator.apache.org</a>, notify the community that the release is completed.
+<li>Send mail to <a href="mailto:dev@dubbo.apache.org">dev@dubbo.apache.org</a> , notify the community that the release is completed.
The mail template to announce release:</li>
</ol>
<pre><code class="language-text">Hello Community,
@@ -467,12 +416,6 @@ an issue on GitHub[4].
-=====
-*Disclaimer*
-
-Apache Dubbo is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet [...]
-
-
[1] http://dubbo.apache.org/en-us/blog/download.html
[2] http://central.maven.org/maven2/com/alibaba/dubbo
[3] https://github.com/apache/dubbo/releases
diff --git a/en-us/docs/developers/committer-guide/release-guide_dev.json b/en-us/docs/developers/committer-guide/release-guide_dev.json
index 4b1274f..9ab218f 100644
--- a/en-us/docs/developers/committer-guide/release-guide_dev.json
+++ b/en-us/docs/developers/committer-guide/release-guide_dev.json
@@ -1,6 +1,6 @@
{
"filename": "release-guide_dev.md",
- "__html": "<h2>Understanding the Apache Release Cycle</h2>\n<p>In general, Source Release is the key and the required content of Apache. But Binary Release is optional, Dubbo can choose whether to release binary packages to the Apache repository or to the Maven central repository.</p>\n<p>Please refer to the following links for more information on ASF's release guide:</p>\n<ul>\n<li><a href=\"http://www.apache.org/dev/release-publishing\">Apache Release Guide</a></li>\n<li><a href=\"ht [...]
+ "__html": "<h2>Understanding the Apache Release Cycle</h2>\n<p>In general, Source Release is the key and the required content of Apache. But Binary Release is optional, Dubbo can choose whether to release binary packages to the Apache repository or to the Maven central repository.</p>\n<p>Please refer to the following links for more information on ASF's release guide:</p>\n<ul>\n<li><a href=\"http://www.apache.org/dev/release-publishing\">Apache Release Guide</a></li>\n<li><a href=\"ht [...]
"link": "/en-us/docs/developers/committer-guide/release-guide_dev.html",
"meta": {
"title": "Understanding the Apache Release Cycle",
diff --git a/zh-cn/blog/download.html b/zh-cn/blog/download.html
index b61329b..fe10f11 100644
--- a/zh-cn/blog/download.html
+++ b/zh-cn/blog/download.html
@@ -21,14 +21,20 @@
<p>GitHub: <a href="https://github.com/apache/incubator-dubbo">https://github.com/apache/incubator-dubbo</a> <br>
发布说明：<a href="https://github.com/apache/incubator-dubbo/releases">https://github.com/apache/incubator-dubbo/releases</a></p>
</blockquote>
+<h3>2.7.2 (2019-06-06)</h3>
+<ul>
+<li><a href="https://www.apache.org/dyn/closer.cgi?path=dubbo/2.7.2/apache-dubbo-2.7.2-src.zip">source</a> |
+<a href="https://www.apache.org/dist/dubbo/2.7.2/apache-dubbo-2.7.2-src.zip.asc">asc</a> |
+<a href="https://www.apache.org/dist/dubbo/2.7.2/apache-dubbo-2.7.2-src.zip.sha512">sha512</a></li>
+</ul>
<h3>2.7.1 (2019-03-26)</h3>
<ul>
-<li><a href="https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip">source</a> |
-<a href="https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.asc">asc</a> |
-<a href="https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.sha512">sha512</a></li>
-<li><a href="https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip">binary</a> |
-<a href="https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.asc">asc</a> |
-<a href="https://www.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.sha512">sha512</a></li>
+<li><a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip">source</a> |
+<a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.asc">asc</a> |
+<a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-src.zip.sha512">sha512</a></li>
+<li><a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip">binary</a> |
+<a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.asc">asc</a> |
+<a href="https://archive.apache.org/dist/incubator/dubbo/2.7.1/apache-dubbo-incubating-2.7.1-bin.zip.sha512">sha512</a></li>
</ul>
<h3>2.7.0 (2019-01-29)</h3>
<ul>
diff --git a/zh-cn/blog/download.json b/zh-cn/blog/download.json
index 1b2d0c7..2a76aa0 100644
--- a/zh-cn/blog/download.json
+++ b/zh-cn/blog/download.json
@@ -1,6 +1,6 @@
{
"filename": "download.md",
- "__html": "<h1>下载中心</h1>\n<h2>验证</h2>\n<p>可以按照这里的<a href=\"https://www.apache.org/info/verification\">步骤</a>, 利用<a href=\"https://www.apache.org/dist/incubator/dubbo/KEYS\">KEYS</a>文件来验证下载。</p>\n<h2>Apache Dubbo</h2>\n<p>请点击了解各<a href=\"http://dubbo.apache.org/zh-cn/docs/user/versions/index.html\">版本详情和升级注意事项</a></p>\n<blockquote>\n<p>GitHub: <a href=\"https://github.com/apache/incubator-dubbo\">https://github.com/apache/incubator-dubbo</a> <br>\n发布说明：<a href=\"https://github.com/apach [...]
+ "__html": "<h1>下载中心</h1>\n<h2>验证</h2>\n<p>可以按照这里的<a href=\"https://www.apache.org/info/verification\">步骤</a>, 利用<a href=\"https://www.apache.org/dist/incubator/dubbo/KEYS\">KEYS</a>文件来验证下载。</p>\n<h2>Apache Dubbo</h2>\n<p>请点击了解各<a href=\"http://dubbo.apache.org/zh-cn/docs/user/versions/index.html\">版本详情和升级注意事项</a></p>\n<blockquote>\n<p>GitHub: <a href=\"https://github.com/apache/incubator-dubbo\">https://github.com/apache/incubator-dubbo</a> <br>\n发布说明：<a href=\"https://github.com/apach [...]
"link": "/zh-cn/blog/download.html",
"meta": {
"title": "下载中心",
diff --git a/zh-cn/docs/dev/design.html b/zh-cn/docs/dev/design.html
index e60f122..e504723 100644
--- a/zh-cn/docs/dev/design.html
+++ b/zh-cn/docs/dev/design.html
@@ -37,7 +37,7 @@
<h2>关系说明</h2>
<ul>
<li>在 RPC 中，Protocol 是核心层，也就是只要有 Protocol + Invoker + Exporter 就可以完成非透明的 RPC 调用，然后在 Invoker 的主过程上 Filter 拦截点。</li>
-<li>图中的 Consumer 和 Provider 是抽象概念，只是想让看图者更直观的了解哪些类分属于客户端与服务器端，不用 Client 和 Server 的原因是 Dubbo 在很多场景下都使用 Provider, Consumer, Registry, Monitor 划分逻辑拓扑节点，保持统一概念。</li>
+<li>图中的 Consumer 和 Provider 是抽象概念，只是想让看图者更直观的了解哪些类分属于客户端与服务器端，不用 Client 和 Server 的原因是 Dubbo 在很多场景下都使用 Provider, Consumer, Registry, Monitor 划分逻辑拓普节点，保持统一概念。</li>
<li>而 Cluster 是外围概念，所以 Cluster 的目的是将多个 Invoker 伪装成一个 Invoker，这样其它人只要关注 Protocol 层 Invoker 即可，加上 Cluster 或者去掉 Cluster 对其它层都不会造成影响，因为只有一个提供者时，是不需要 Cluster 的。</li>
<li>Proxy 层封装了所有接口的透明化代理，而在其它层都以 Invoker 为中心，只有到了暴露给用户使用时，才用 Proxy 将 Invoker 转成接口，或将接口实现转成 Invoker，也就是去掉 Proxy 层 RPC 是可以 Run 的，只是不那么透明，不那么看起来像调本地服务一样调远程服务。</li>
<li>而 Remoting 实现是 Dubbo 协议的实现，如果你选择 RMI 协议，整个 Remoting 都不会用上，Remoting 内部再划为 Transport 传输层和 Exchange 信息交换层，Transport 层只负责单向消息传输，是对 Mina, Netty, Grizzly 的抽象，它也可以扩展 UDP 传输，而 Exchange 层是在传输层之上封装了 Request-Response 语义。</li>
@@ -111,4 +111,4 @@
gtag('config', 'UA-112489517-1');
</script>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/zh-cn/docs/developers/committer-guide/release-guide_dev.html b/zh-cn/docs/developers/committer-guide/release-guide_dev.html
index 0acdce0..1ae1ade 100644
--- a/zh-cn/docs/developers/committer-guide/release-guide_dev.html
+++ b/zh-cn/docs/developers/committer-guide/release-guide_dev.html
@@ -131,11 +131,11 @@ $ gpg --delete-keys 1808C6444C781C0AEA0AAD4C4D6A8007D20DB8A4
<span class="hljs-meta">$</span><span class="bash"> mvn deploy</span>
</code></pre>
<p>上述命令将snapshot包推送到maven中央仓库</p>
-<h3>用maven-release-plugin发布</h3>
-<p>先用dryRun验证是否ok</p>
+<h3><s>用maven-release-plugin发布</s> (<code>废弃</code>，参考后一步)</h3>
+<p><s>先用dryRun验证是否ok</s></p>
<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn release:prepare -Prelease -Darguments=<span class="hljs-string">"-DskipTests"</span> -DautoVersionSubmodules=<span class="hljs-literal">true</span> -Dusername=YOUR GITHUB ID-DdryRun=<span class="hljs-literal">true</span></span>
</code></pre>
-<p>验证通过后，执行release:prepare</p>
+<p><s>验证通过后，执行release:prepare</s></p>
<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn release:clean</span>
<span class="hljs-meta">$</span><span class="bash"> mvn release:prepare -Prelease -Darguments=<span class="hljs-string">"-DskipTests"</span> -DautoVersionSubmodules=<span class="hljs-literal">true</span> -Dusername=YOUR GITHUB ID -DpushChanges=<span class="hljs-literal">false</span></span>
</code></pre>
@@ -154,10 +154,19 @@ $ gpg --delete-keys 1808C6444C781C0AEA0AAD4C4D6A8007D20DB8A4
<blockquote>
<p>如果指定了<code>-DpushChanges=true</code>, 则本地提交会自动推送到远端的GitHub仓库。根据经验，建议不要指定为true，请设置为false，待本地检查通过之后再手动提交</p>
</blockquote>
-<p>执行release:perform，做staging发布</p>
+<p><s>执行release:perform，做staging发布</s></p>
<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn -Prelease release:perform -Darguments=<span class="hljs-string">"-DskipTests"</span> -DautoVersionSubmodules=<span class="hljs-literal">true</span> -Dusername=YOUR GITHUB ID</span>
</code></pre>
<p>此时插件会自动下载远端的tag对应的源码，编译后，将所有Artifacts发布到配置的远程<a href="http://repository.apache.org">maven仓库</a>，处于staging状态。</p>
+<h3>使用mvn deploy进行deploy</h3>
+<blockquote>
+<p>要求：maven 3.5+</p>
+</blockquote>
+<p>修改pom文件中的版本号，从2.7.x-SNAPSHOT改为2.7.x， 目前有3个地方需要修改。建议全文搜索。</p>
+<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> mvn clean install -Prelease</span>
+<span class="hljs-meta">$</span><span class="bash"> mvn deploy -Prelease -DskipTests</span>
+</code></pre>
+<p>所有被deploy到远程<a href="http://repository.apache.org">maven仓库</a>的Artifacts都会处于staging状态</p>
<h4>注意点</h4>
<ul>
<li>在deploy执行过程中，有可能因为网络等原因被中断，如果是这样，可以重新开始执行。</li>
@@ -170,18 +179,18 @@ $ gpg --delete-keys 1808C6444C781C0AEA0AAD4C4D6A8007D20DB8A4
</li>
<li>
<p>将dubbo checkout到本地目录</p>
-<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> svn checkout https://dist.apache.org/repos/dist/dev/incubator/dubbo</span>
-<span class="hljs-meta">#</span><span class="bash"> 假定本地目录为 ~/apache/incubator/dubbo</span>
+<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> svn checkout https://dist.apache.org/repos/dist/dev/dubbo</span>
+<span class="hljs-meta">#</span><span class="bash"> 假定本地目录为 ~/apache/dubbo</span>
</code></pre>
</li>
<li>
<p>当前发布版本为${release_version}，新建目录</p>
-<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> <span class="hljs-built_in">cd</span> ~/apache/incubator/dubbo <span class="hljs-comment"># dubbo svn根目录</span></span>
+<pre><code class="language-shell"><span class="hljs-meta">$</span><span class="bash"> <span class="hljs-built_in">cd</span> ~/apache/dubbo <span class="hljs-comment"># dubbo svn根目录</span></span>
<span class="hljs-meta">$</span><span class="bash"> mkdir <span class="hljs-variable">${release_version}</span></span>
</code></pre>
</li>
<li>
-<p>添加public key到<a href="https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS">KEYS</a>文件并提交到SVN仓库（第一次做发布的人需要做这个操作，具体操作参考KEYS文件里的说明）。KEYS主要是让参与投票的人在本地导入，用来校验sign的正确性</p>
+<p>添加public key到<a href="https://dist.apache.org/repos/dist/dev/dubbo/KEYS">KEYS</a>文件并提交到SVN仓库（第一次做发布的人需要做这个操作，具体操作参考KEYS文件里的说明）。KEYS主要是让参与投票的人在本地导入，用来校验sign的正确性</p>
<pre><code class="language-sh">$ (gpg --list-sigs <your name> && gpg --armor --<span class="hljs-built_in">export</span> <your name>) >> KEYS
</code></pre>
</li>
@@ -219,7 +228,7 @@ $ gpg --delete-keys 1808C6444C781C0AEA0AAD4C4D6A8007D20DB8A4
<p>详细的检查列表请参考官方的<a href="https://wiki.apache.org/incubator/IncubatorReleaseChecklist">check list</a></p>
<p>首先，从一下地址下载要发布的Release Candidate到本地环境：</p>
<pre>
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/${release_version}/
+https://dist.apache.org/repos/dist/dev/dubbo/${release_version}/
</pre>
<p>然后，开始验证环节，验证包含但不限于以下内容和形式</p>
<h3>检查签名和hash等信息</h3>
@@ -229,7 +238,7 @@ $ shasum -c apache-dubbo-<span class="hljs-variable">${release_version}</span>-b
</code></pre>
<h4>检查gpg签名</h4>
<p>如果是第一次检查，需要首先导入公钥。</p>
-<pre><code class="language-sh"> $ curl https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS >> KEYS <span class="hljs-comment"># download public keys to local directory</span>
+<pre><code class="language-sh"> $ curl https://dist.apache.org/repos/dist/dev/dubbo/KEYS >> KEYS <span class="hljs-comment"># download public keys to local directory</span>
$ gpg --import KEYS <span class="hljs-comment"># import keys</span>
$ gpg —edit-key liujun
> trust <span class="hljs-comment"># type trust command</span>
@@ -241,8 +250,6 @@ gpg --verify apache-dubbo-2.6.3-bin-release.zip.asc apache-dubbo-2.6.3-bin-relea
<h3>检查源码包的文件内容</h3>
<p>解压缩<code>apache-dubbo-${release_version}-source-release.zip</code>，进行如下检查:</p>
<ul>
-<li>Directory with 'incubating' in name
-<code>apache-dubbo-${release_version}-source-release</code></li>
<li>DISCLAIMER exists</li>
<li>LICENSE and NOTICE exists and contents are good</li>
<li>All files and no binary files exist</li>
@@ -272,29 +279,27 @@ find . -name THIRD-PARTY.txt | xargs grep -E <span class="hljs-string">'GPL|Gene
<p>解压缩<code>apache-dubbo-${release_version}-bin-release.zip</code>，进行如下检查:</p>
<ul>
<li>Check signatures are good</li>
-<li>'incubating' in name</li>
<li>LICENSE and NOTICE exists and contents are good</li>
</ul>
<p>注意，如果二进制包里面引入了第三方依赖，则需要更新LICENSE，加入第三方依赖的LICENSE，如果第三方依赖的LICENSE是Apache 2.0，并且对应的项目中包含了NOTICE，还需要更新NOTICE文件</p>
<h2>进入投票</h2>
-<p>投票分两个阶段：</p>
+<p>dubbo毕业之后，投票分只需要一次：</p>
<ol>
<li>Dubbo社区投票，发起投票邮件到dev@dubbo.apache.org。在社区开发者Review，经过至少72小时并统计到3个同意发版的binding票后（只有PMC的票才是binding），即可进入下一阶段的投票。</li>
-<li>Apache社区投票，发起投票邮件到general@incubator.apache.org。经过至少72小时并统计到3个同意发版的binding票后（只有IPMC Member的票才是binding），即可进行正式发布。</li>
</ol>
<p>Dubbo社区投票邮件模板：</p>
<pre><code class="language-text">Hello Dubbo Community,
-This is a call for vote to release Apache Dubbo (Incubating) version 2.6.2.
+This is a call for vote to release Apache Dubbo version 2.7.2.
The release candidates:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/2.6.2/
+https://dist.apache.org/repos/dist/dev/dubbo/2.7.2/
The staging repo:
https://repository.apache.org/content/repositories/orgapachedubbo-1005
Git tag for the release:
-https://github.com/apache/dubbo/tree/dubbo-2.6.2
+https://github.com/apache/dubbo/tree/dubbo-2.7.2
Hash for the release tag:
afab04c53edab38d52275d2a198ea1aff7a4f41e
@@ -303,7 +308,7 @@ Release Notes:
https://github.com/apache/dubbo/releases/tag/untagged-4775c0a22c60fca55118
The artifacts have been signed with Key : 28681CB1, which can be found in the keys file:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS
+https://dist.apache.org/repos/dist/dev/dubbo/KEYS
The vote will be open for at least 72 hours or until necessary number of votes are reached.
@@ -314,61 +319,7 @@ Please vote accordingly:
[ ] -1 disapprove with the reason
Thanks,
-The Apache Dubbo (Incubating) Team
-</code></pre>
-<p>Apache社区投票邮件模板：</p>
-<pre><code class="language-text">Hello all,
-
-This is a call for vote to release Apache Dubbo (Incubating) version 2.6.4.
-
-The Apache Dubbo community has voted on and approved a proposal to release
-Apache Dubbo (Incubating) version 2.6.4.
-
-We now kindly request the Incubator PMC members review and vote on this
-incubator release.
-
-Apache Dubbo™ is a high-performance, java based, open source
-RPC framework. Dubbo offers three key functionalities, which include
-interface based remote call, fault tolerance & load balancing, and
-automatic service registration & discovery.
-
-Dubbo community vote and result thread:
-https://lists.apache.org/thread.html/8d5c39eece6288beed2e22ca976350728c571d2a9cef1c9a9e56a409@%3Cdev.dubbo.apache.org%3E
-A minor issue also can be found in the above thread.
-
-The release candidates (RC1):
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/2.6.4
-
-The staging repo:
-https://repository.apache.org/content/repositories/orgapachedubbo-1005
-
-Git tag for the release (RC1):
-https://github.com/apache/dubbo/tree/dubbo-2.6.4
-
-Hash for the release tag:
-88037747a3b69d3225c73f6fbcda36ebd8435887
-
-Release Notes:
-*https://github.com/apache/dubbo/blob/dubbo-2.6.4/CHANGES.md
-<https://github.com/apache/dubbo/blob/dubbo-2.6.4/CHANGES.md>*
-
-The artifacts have been signed with Key : 7955FB6D1DD21CF7, which can be
-found in the keys file:
-https://dist.apache.org/repos/dist/dev/incubator/dubbo/KEYS
-
-Look at here for how to verify this release candidate:
-https://github.com/apache/dubbo-website/blob/asf-site/blog/en-us/prepare-an-apache-release.md#prepare-apache-release
-
-The vote will be open for at least 72 hours or until necessary number of
-votes are reached.
-
-Please vote accordingly:
-[ ] +1 approve
-[ ] +0 no opinion
-[ ] -1 disapprove with the reason
-
-Thanks,
-The Apache Dubbo (Incubating) Team
+The Apache Dubbo Team
</code></pre>
<p>宣布投票结果模板：</p>
<pre><code class="language-text">We’ve received 3 +1 binding votes and one +1 non-binding vote:
@@ -379,21 +330,21 @@ The Apache Dubbo (Incubating) Team
+1 non-binding, Jerrick
-I will create a new vote thread in Apache community now.
+I will start to release today.
Best regards,
-The Apache Dubbo (Incubating) Team
+The Apache Dubbo Team
</code></pre>
<h2>正式发布</h2>
<ol>
-<li>将<a href="https://dist.apache.org/repos/dist/dev/incubator/dubbo">dev</a>目录下的发布包添加到<a href="https://dist.apache.org/repos/dist/release/incubator/dubbo">release</a>目录下，KEYS有更新的，也需要同步更新。</li>
-<li>删除<a href="https://dist.apache.org/repos/dist/dev/incubator/dubbo">dev</a>目录下的发布包</li>
-<li>删除<a href="https://dist.apache.org/repos/dist/release/incubator/dubbo">release</a>目录下上一个版本的发布包，这些包会被自动保存在<a href="https://archive.apache.org/dist/incubator/dubbo">这里</a></li>
+<li>将<a href="https://dist.apache.org/repos/dist/dev/dubbo">dev</a>目录下的发布包添加到<a href="https://dist.apache.org/repos/dist/release/dubbo">release</a>目录下，KEYS有更新的，也需要同步更新。</li>
+<li>删除<a href="https://dist.apache.org/repos/dist/dev/dubbo">dev</a>目录下的发布包</li>
+<li>删除<a href="https://dist.apache.org/repos/dist/release/dubbo">release</a>目录下上一个版本的发布包，这些包会被自动保存在<a href="https://archive.apache.org/dist/dubbo">这里</a></li>
<li>发布GitHub上的<a href="https://github.com/apache/dubbo/releases">release notes</a></li>
<li>修改GitHub的Readme文件，将版本号更新到最新发布的版本</li>
-<li>在官网下载<a href="http://dubbo.apache.org/en-us/blog/download.html">页面</a>上添加最新版本的下载链接。最新的下载链接应该类似<a href="https://www.apache.org/dyn/closer.cgi?path=incubator/dubbo/$VERSION/apache-dubbo-$VERSION-source-release.zip">这样</a>. 同时更新以前版本的下载链接，改为类似<a href="https://archive.apache.org/dist/incubator/dubbo/$VERSION/apache-dubbo-$VERSION-bin-release.zip">这样</a>. 具体可以参考过往的<a href="https://github.com/apache/dubbo-website/blob/asf-site/blog/en-us/download.md">下载链接</a></li>
+<li>在官网下载<a href="http://dubbo.apache.org/en-us/blog/download.html">页面</a>上添加最新版本的下载链接。最新的下载链接应该类似<a href="https://www.apache.org/dyn/closer.cgi?path=dubbo/$VERSION/apache-dubbo-$VERSION-source-release.zip">这样</a>. 同时更新以前版本的下载链接，改为类似<a href="https://archive.apache.org/dist/dubbo/$VERSION/apache-dubbo-$VERSION-bin-release.zip">这样</a>. 具体可以参考过往的<a href="https://github.com/apache/dubbo-website/blob/asf-site/blog/en-us/download.md">下载链接</a></li>
<li>合并<code>${release-version}-release</code>分支到对应的主干分支， 然后删除相应的release分支，例如: <code>git push origin --delete 2.7.0-release</code></li>
-<li>发邮件到 <code>dev@dubbo.apache.org</code> 和 <code>general@incubator.apache.org</code>
+<li>发邮件到 <code>dev@dubbo.apache.org</code>
宣布release邮件模板：</li>
</ol>
<pre><code class="language-text">Hello Community,
@@ -416,13 +367,6 @@ hesitate to let us know by sending feedback to this mailing list or filing
an issue on GitHub[4].
-
-=====
-*Disclaimer*
-
-Apache Dubbo is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet [...]
-
-
[1] http://dubbo.apache.org/en-us/blog/download.html
[2] http://central.maven.org/maven2/com/alibaba/dubbo
[3] https://github.com/apache/dubbo/releases
@@ -434,7 +378,7 @@ Apache Dubbo is an effort undergoing incubation at The Apache Software Foundatio
<p>发布jar包到maven仓库，首先访问<a href="https://repository.apache.org">repository.apache.org</a>, 选择<code>staging repository</code>, 点击<code>release</code>按钮。等待一段时间之后，在<a href="https://repository.apache.org/content/repositories/releases/org/apache/dubbo/">这里</a>确认完整性和正确性. 发布到Maven中央仓库则还需要等待一段时间。可以在<a href="https://repo.maven.apache.org/maven2/org/apache/dubbo">这里</a>进行确认。</p>
<h2>FAQ</h2>
<h4>gpg: signing failed: Inappropriate ioctl for device</h4>
-<p>If you've encoutered this error, try the following commands:</p>
+<p>If you've encountered this error, try the following commands:</p>
<pre><code>export GPG_TTY=$(tty)
</code></pre>
</div></section><footer class="footer-container"><div class="footer-body"><img src="/img/dubbo_gray.png"/><img class="apache" src="/img/apache_logo.png"/><div class="cols-container"><div class="col col-12"><h3></h3><p></p></div><div class="col col-4"><dl><dt>ASF</dt><dd><a href="http://www.apache.org" target="_self">基金会</a></dd><dd><a href="http://www.apache.org/licenses/" target="_self">证书</a></dd><dd><a href="http://www.apache.org/events/current-event" target="_self">事件</a></dd><dd><a [...]
diff --git a/zh-cn/docs/developers/committer-guide/release-guide_dev.json b/zh-cn/docs/developers/committer-guide/release-guide_dev.json
index 318c851..87f3240 100644
--- a/zh-cn/docs/developers/committer-guide/release-guide_dev.json
+++ b/zh-cn/docs/developers/committer-guide/release-guide_dev.json
@@ -1,6 +1,6 @@
{
"filename": "release-guide_dev.md",
- "__html": "<h1>如何准备Apache Release</h1>\n<h2>理解Apache发布的内容和流程</h2>\n<p>总的来说，Source Release是Apache关注的重点，也是发布的必须内容；而Binary Release是可选项，Dubbo可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。</p>\n<p>请参考以下链接，找到更多关于ASF的发布指南:</p>\n<ul>\n<li><a href=\"http://www.apache.org/dev/release-publishing\">Apache Release Guide</a></li>\n<li><a href=\"http://www.apache.org/dev/release.html\">Apache Release Policy</a></li>\n<li><a href=\"http://www.apache.org/dev/publishing-maven-artifacts.html\">Maven Release Info</ [...]
+ "__html": "<h1>如何准备Apache Release</h1>\n<h2>理解Apache发布的内容和流程</h2>\n<p>总的来说，Source Release是Apache关注的重点，也是发布的必须内容；而Binary Release是可选项，Dubbo可以选择是否发布二进制包到Apache仓库或者发布到Maven中央仓库。</p>\n<p>请参考以下链接，找到更多关于ASF的发布指南:</p>\n<ul>\n<li><a href=\"http://www.apache.org/dev/release-publishing\">Apache Release Guide</a></li>\n<li><a href=\"http://www.apache.org/dev/release.html\">Apache Release Policy</a></li>\n<li><a href=\"http://www.apache.org/dev/publishing-maven-artifacts.html\">Maven Release Info</ [...]
"link": "/zh-cn/docs/developers/committer-guide/release-guide_dev.html",
"meta": {
"title": "如何准备Apache Release",
diff --git a/zh-cn/docs/source_code_guide/refer-service.html b/zh-cn/docs/source_code_guide/refer-service.html
index 4da5a1f..2849055 100644
--- a/zh-cn/docs/source_code_guide/refer-service.html
+++ b/zh-cn/docs/source_code_guide/refer-service.html
@@ -38,7 +38,7 @@
<p>以上两个方法的代码比较简短，并不难理解。这里需要特别说明一下，如果你对 2.6.4 及以下版本的 getObject 方法进行调试时，会碰到比较奇怪的的问题。这里假设你使用 IDEA，且保持了 IDEA 的默认配置。当你面调试到 get 方法的<code>if (ref == null)</code>时，你会发现 ref 不为空，导致你无法进入到 init 方法中继续调试。导致这个现象的原因是 Dubbo 框架本身有一些小问题。该问题已经在 pull request <a href="https://github.com/apache/dubbo/pull/2754">#2754</a> 修复了此问题，并跟随 2.6.5 版本发布了。如果你正在学习 2.6.4 及以下版本，可通过修改 IDEA 配置规避这个问题。首先 IDEA 配置弹窗中搜索 toString，然后取消<code>Enable 'toString' object view</code>勾选。具体如下：</p>
<p><img src="https://blog-pictures.oss-cn-shanghai.aliyuncs.com/15417503733794.jpg" alt=""></p>
<h3>3.1 处理配置</h3>
-<p>Dubbo 提供了丰富的配置，用于调整和优化框架行为，性能等。Dubbo 在引用或导出服务时，首先会对这些配置进行检查和处理，以保证配置到正确性。配置解析逻辑封装在 ReferenceConfig 的 init 方法中，下面进行分析。</p>
+<p>Dubbo 提供了丰富的配置，用于调整和优化框架行为，性能等。Dubbo 在引用或导出服务时，首先会对这些配置进行检查和处理，以保证配置的正确性。配置解析逻辑封装在 ReferenceConfig 的 init 方法中，下面进行分析。</p>
<pre><code class="language-java"><span class="hljs-function"><span class="hljs-keyword">private</span> <span class="hljs-keyword">void</span> <span class="hljs-title">init</span><span class="hljs-params">()</span> </span>{
<span class="hljs-comment">// 避免重复初始化</span>
<span class="hljs-keyword">if</span> (initialized) {
diff --git a/zh-cn/docs/source_code_guide/refer-service.json b/zh-cn/docs/source_code_guide/refer-service.json
index 67973d3..1f9271e 100644
--- a/zh-cn/docs/source_code_guide/refer-service.json
+++ b/zh-cn/docs/source_code_guide/refer-service.json
@@ -1,6 +1,6 @@
{
"filename": "refer-service.md",
- "__html": "<h2>1. 简介</h2>\n<p>上一篇文章详细分析了服务导出的过程，本篇文章我们趁热打铁，继续分析服务引用过程。在 Dubbo 中，我们可以通过两种方式引用远程服务。第一种是使用服务直连的方式引用服务，第二种方式是基于注册中心进行引用。服务直连的方式仅适合在调试或测试服务的场景下使用，不适合在线上环境使用。因此，本文我将重点分析通过注册中心引用服务的过程。从注册中心中获取服务配置只是服务引用过程中的一环，除此之外，服务消费者还需要经历 Invoker 创建、代理类创建等步骤。这些步骤，将在后续章节中一一进行分析。</p>\n<h2>2.服务引用原理</h2>\n<p>Dubbo 服务引用的时机有两个，第一个是在 Spring 容器调用 ReferenceBean 的 afterPropertiesSet 方法时引用服务，第二个是在 ReferenceBean 对应的服务被注入到其他类中时引用。这两�
��引用服务的时机区别在于，第一个是饿汉式的，第二个是懒汉式的。默认情况下，Dubbo 使用懒汉式引用服务。如果需要使用饿汉式，可通过配置 < [...]
+ "__html": "<h2>1. 简介</h2>\n<p>上一篇文章详细分析了服务导出的过程，本篇文章我们趁热打铁，继续分析服务引用过程。在 Dubbo 中，我们可以通过两种方式引用远程服务。第一种是使用服务直连的方式引用服务，第二种方式是基于注册中心进行引用。服务直连的方式仅适合在调试或测试服务的场景下使用，不适合在线上环境使用。因此，本文我将重点分析通过注册中心引用服务的过程。从注册中心中获取服务配置只是服务引用过程中的一环，除此之外，服务消费者还需要经历 Invoker 创建、代理类创建等步骤。这些步骤，将在后续章节中一一进行分析。</p>\n<h2>2.服务引用原理</h2>\n<p>Dubbo 服务引用的时机有两个，第一个是在 Spring 容器调用 ReferenceBean 的 afterPropertiesSet 方法时引用服务，第二个是在 ReferenceBean 对应的服务被注入到其他类中时引用。这两�
��引用服务的时机区别在于，第一个是饿汉式的，第二个是懒汉式的。默认情况下，Dubbo 使用懒汉式引用服务。如果需要使用饿汉式，可通过配置 < [...]
"link": "/zh-cn/docs/source_code_guide/refer-service.html",
"meta": {
"title": "服务引用",
diff --git a/zh-cn/docs/user/references/metadata/introduction.html b/zh-cn/docs/user/references/metadata/introduction.html
index 5f61d7b..057d8ad 100644
--- a/zh-cn/docs/user/references/metadata/introduction.html
+++ b/zh-cn/docs/user/references/metadata/introduction.html
@@ -20,7 +20,7 @@ dubbo consumer中的配置项也有<a href="http://dubbo.apache.org/en-us/docs/u
<h1>目标</h1>
<p>需要将注册中心原来的数据信息和元数据信息保存到独立的key-value的存储中，这个key-value可以是DB，redis或者其他持久化存储。核心代码中支持了zookeeper，redis(推荐)的默认支持。</p>
<p>provider存储内容的格式，参见：org.apache.dubbo.metadata.definition.model.FullServiceDefinition。是该类型gson化之后的存储。
-Consumer存储内容，为Map格式。从Consumer端注册到注册中心的URL中的获取参数信息。即通过URL.getParameterMap()获取到的Map，进行gson话之后进行存储。</p>
+Consumer存储内容，为Map格式。从Consumer端注册到注册中心的URL中的获取参数信息。即通过URL.getParameterMap()获取到的Map，进行gson化之后进行存储。</p>
<p>详细的内容，可以参考下面的sample输出。</p>
<h1>配置</h1>
<p>默认的元数据存储，额外支持以下几个特性：</p>
diff --git a/zh-cn/docs/user/references/metadata/introduction.json b/zh-cn/docs/user/references/metadata/introduction.json
index 5b33a21..be9025b 100644
--- a/zh-cn/docs/user/references/metadata/introduction.json
+++ b/zh-cn/docs/user/references/metadata/introduction.json
@@ -1,6 +1,6 @@
{
"filename": "introduction.md",
- "__html": "<h1>背景</h1>\n<p>dubbo provider中的服务配置项有接近<a href=\"http://dubbo.apache.org/en-us/docs/user/references/xml/dubbo-service.html\">30个配置项</a>。 排除注册中心服务治理需要之外，很大一部分配置项是provider自己使用，不需要透传给消费者。这部分数据不需要进入注册中心，而只需要以key-value形式持久化存储。\ndubbo consumer中的配置项也有<a href=\"http://dubbo.apache.org/en-us/docs/user/references/xml/dubbo-reference.html\">20+个配置项</a>。在注册中心之中，服务消费者列表中只需要关注application，version，group，ip，dubbo版本等少量配置，其他配置也可以以key-value形式持久化存储。\n这些数据是以服务为维度注册进入注册中心，导致了数据量的膨胀，进而引发注册中心(如zook [...]
+ "__html": "<h1>背景</h1>\n<p>dubbo provider中的服务配置项有接近<a href=\"http://dubbo.apache.org/en-us/docs/user/references/xml/dubbo-service.html\">30个配置项</a>。 排除注册中心服务治理需要之外，很大一部分配置项是provider自己使用，不需要透传给消费者。这部分数据不需要进入注册中心，而只需要以key-value形式持久化存储。\ndubbo consumer中的配置项也有<a href=\"http://dubbo.apache.org/en-us/docs/user/references/xml/dubbo-reference.html\">20+个配置项</a>。在注册中心之中，服务消费者列表中只需要关注application，version，group，ip，dubbo版本等少量配置，其他配置也可以以key-value形式持久化存储。\n这些数据是以服务为维度注册进入注册中心，导致了数据量的膨胀，进而引发注册中心(如zook [...]
"link": "/zh-cn/docs/user/references/metadata/introduction.html",
"meta": {}
}
\ No newline at end of file