diff --git a/README.md b/README.md index 1e77b07747..0e002cb527 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Apache RocketMQ (incubating) website -This is the website for [Apache RocketMQ]( http://rocketmq.incubator.apache.org/) (incubating). +This is the website for [Apache RocketMQ]( http://rocketmq.apache.org/) (incubating). ## About This website is based on Jekyll and a Jekyll theme named Minimal Mistakes. diff --git a/_about/01-team.md b/_about/01-team.md index 7a6b9ada78..a1b7b5f320 100644 --- a/_about/01-team.md +++ b/_about/01-team.md @@ -14,17 +14,16 @@ The following is a list of developers with commit privileges that have directly |Image| Id| Github Id | Email |[Roles](https://www.apache.org/foundation/how-it-works.html#roles)| Time Zone| |:---|:---|:---|:---|:---|:---| -|![bsnyde](/assets/images/about/bsnyder.jpeg)|bsnyder| [@bsnyder](https://github.com/bsnyder)|bsnyder@apache.org |Mentor| -7 | -|![justinmclean](/assets/images/about/justinmclean.jpeg)|jmclean| [@justinmclean](https://github.com/justinmclean)|jmclean@apache.org |Mentor| +11 | -|![jim](/assets/images/about/jim.jpg)|jim| [@jim](https://github.com/jimjag)|jim@apache.org |Mentor| -7 | -|![WillemJiang](/assets/images/about/WillemJiang.jpeg)|ningjiang| [@WillemJiang](https://github.com/WillemJiang)|ningjiang@apache.org |Mentor| +8 | -|![lukehan](/assets/images/about/lukehan.jpeg)|lukehan| [@lukehan](https://github.com/lukehan)|lukehan@apache.org |Mentor| +8 | -|![vongosling](/assets/images/about/vongosling.jpeg)|vongosling|[@vongosling](https://github.com/vongosling)|vongosling@apache.org |Committer/PMC Member| +8 | -|![vintagewang](/assets/images/about/vintagewang.jpeg)|vintagewang|[@vintagewang](https://github.com/vintagewang)|vintagewang@apache.org |Committer/PMC Member| +8| -|![zhouxinyu](/assets/images/about/zhouxinyu.png)|yukon|[@zhouxinyu](https://github.com/zhouxinyu)|yukon@apache.org |Committer/PMC Member| +8 | -|![lizhanhui](/assets/images/about/lizhanhui.jpg)|lizhanhui|[@lizhanhui](https://github.com/lizhanhui)|lizhanhui@apache.org |Committer/PMC Member| +8 | -|![dongeforever](/assets/images/about/dongeforever.jpeg)|dongeforever|[@dongeforever](https://github.com/dongeforever)|dongeforever@apache.org |Committer/PMC Member| +8 | -|![lollipop](/assets/images/about/lollipop.jpeg)|lollipop|[@lollipopjin](https://github.com/lollipopjin)|lollipop@apache.org |Committer/PMC Member| +8 | +|![bsnyde](/assets/images/about/bsnyder.jpeg)|bsnyder| [@bsnyder](https://github.com/bsnyder)|bsnyder@apache.org |PMC Member| -7 | +|![justinmclean](/assets/images/about/justinmclean.jpeg)|jmclean| [@justinmclean](https://github.com/justinmclean)|jmclean@apache.org |PMC Member| +11 | +|![jim](/assets/images/about/jim.jpg)|jim| [@jim](https://github.com/jimjag)|jim@apache.org |PMC Member| -7 | +|![WillemJiang](/assets/images/about/WillemJiang.jpeg)|ningjiang| [@WillemJiang](https://github.com/WillemJiang)|ningjiang@apache.org |PMC Member| +8 | +|![vongosling](/assets/images/about/vongosling.jpeg)|vongosling|[@vongosling](https://github.com/vongosling)|vongosling@apache.org |PMC Member| +8 | +|![vintagewang](/assets/images/about/vintagewang.jpeg)|vintagewang|[@vintagewang](https://github.com/vintagewang)|vintagewang@apache.org |PMC Member| +8| +|![zhouxinyu](/assets/images/about/zhouxinyu.png)|yukon|[@zhouxinyu](https://github.com/zhouxinyu)|yukon@apache.org |PMC Member| +8 | +|![lizhanhui](/assets/images/about/lizhanhui.jpg)|lizhanhui|[@lizhanhui](https://github.com/lizhanhui)|lizhanhui@apache.org |PMC Member| +8 | +|![dongeforever](/assets/images/about/dongeforever.jpeg)|dongeforever|[@dongeforever](https://github.com/dongeforever)|dongeforever@apache.org |PMC Member| +8 | +|![lollipop](/assets/images/about/lollipop.jpeg)|lollipop|[@lollipopjin](https://github.com/lollipopjin)|lollipop@apache.org |PMC Member| +8 | |![stevensche](/assets/images/about/stevenschew.png)|stevenschew|[@stevenschew](https://github.com/stevenschew)|stevenschew@apache.org |Committer| +8 | |![longdafeng](/assets/images/about/longdafeng.jpeg)|longda|[@longdafeng](https://github.com/longdafeng)|longda@apache.org |Committer| +8 | |![shroman](/assets/images/about/rshtykh.png)|shroman|[@shroman](https://github.com/shroman)|shroman@apache.org |Committer| +9 | diff --git a/_docs/06-best-practice-pull-request.md b/_docs/06-best-practice-pull-request.md index 084cbf8850..0448732251 100644 --- a/_docs/06-best-practice-pull-request.md +++ b/_docs/06-best-practice-pull-request.md @@ -97,7 +97,7 @@ Each pull request should follow this checklist to help us incorporate your contr ``` -Remember use `- [x]` mark a item finished in the check list and there is a [demo pull request](https://github.com/apache/incubator-rocketmq/pull/152) can be your reference. +Remember use `- [x]` mark an item finished in the check list and there is a [demo pull request](https://github.com/apache/incubator-rocketmq/pull/152) can be your reference. # Merging a PR (yours or contributors) Start with reading [GitHub PR merging locally](https://help.github.com/articles/checking-out-pull-requests-locally/). Remember that pull requests are equivalent to a remote github branch with potentially a multitude of commits. In this case it is recommended to squash remote commit history to have one commit per issue, rather than merging in a multitude of contributor's commits. In order to do that, as well as to close the PR at the same time, it is recommended to use squash commits. diff --git a/_docs/08-release-manual.md b/_docs/08-release-manual.md index 428ef80889..629753d703 100644 --- a/_docs/08-release-manual.md +++ b/_docs/08-release-manual.md @@ -73,7 +73,7 @@ Make sure your Maven settings.xml file contains the following: Cleanup JIRA issues related to this release version, and check all the issues has been marked with right version in the `FixVersion` field. ### Publish the Release Notes -Generate the release notes via [RocketMQ JIRA](https://issues.apache.org/jira/browse/ROCKETMQ/) and publish it to the [rocketmq-site](https://github.com/apache/incubator-rocketmq-site), there is a [release notes](http://rocketmq.incubator.apache.org/release_notes/release-notes-4.0.0-incubating/) of `4.0.0-incubating` available for reference, include the link to the release notes in the voting emails. +Generate the release notes via [RocketMQ JIRA](https://issues.apache.org/jira/browse/ROCKETMQ/) and publish it to the [rocketmq-site](https://github.com/apache/incubator-rocketmq-site), there is a [release notes](http://rocketmq.apache.org/release_notes/release-notes-4.0.0-incubating/) of `4.0.0-incubating` available for reference, include the link to the release notes in the voting emails. ## Build the Release Candidate Firstly, checkout a new branch from `master` with its name equal to the release version, like `release-4.0.0-incubating`. @@ -288,7 +288,7 @@ Send an email to **announce@apache.org**, **general@incubator.apache.org**, and > The Apache RocketMQ team would like to announce the release of Apache RocketMQ \ (incubating). > > More details regarding Apache RocketMQ can be found at: -> http://rocketmq.incubator.apache.org/ +> http://rocketmq.apache.org/ > > The release artifacts can be downloaded here: > https://dist.apache.org/repos/dist/release/incubator/rocketmq/${release version} diff --git a/assets/images/about/Jaskey.jpeg b/assets/images/about/Jaskey.jpeg index 8fdfec1e4e..bcda98b9c0 100644 Binary files a/assets/images/about/Jaskey.jpeg and b/assets/images/about/Jaskey.jpeg differ diff --git a/assets/images/about/brianm.jpeg b/assets/images/about/brianm.jpeg deleted file mode 100644 index 4f3c3cf5c9..0000000000 Binary files a/assets/images/about/brianm.jpeg and /dev/null differ diff --git a/assets/images/about/dongeforever.jpeg b/assets/images/about/dongeforever.jpeg index 71250c013e..78124fb02b 100644 Binary files a/assets/images/about/dongeforever.jpeg and b/assets/images/about/dongeforever.jpeg differ diff --git a/assets/images/about/jim.jpg b/assets/images/about/jim.jpg index 159869a826..f28198b860 100644 Binary files a/assets/images/about/jim.jpg and b/assets/images/about/jim.jpg differ diff --git a/assets/images/about/lukehan.jpeg b/assets/images/about/lukehan.jpeg deleted file mode 100644 index 758ae609ed..0000000000 Binary files a/assets/images/about/lukehan.jpeg and /dev/null differ diff --git a/assets/images/about/vsair.png b/assets/images/about/vsair.png index 5ca3fcaa29..5107b15e79 100644 Binary files a/assets/images/about/vsair.png and b/assets/images/about/vsair.png differ diff --git a/home.md b/home.md index e12e016bb4..36f8081035 100644 --- a/home.md +++ b/home.md @@ -40,6 +40,3 @@ feature_row1: {% include feature_row %} {% include feature_row id="feature_row1" %} - -## Disclaimer -Apache RocketMQ is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by 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 to be fully endorsed by the ASF.