From b4893914af3a6a3754c2d5685ae2ec9fb23119c2 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Fri, 28 May 2021 13:38:22 +0800 Subject: [PATCH] add apollo team introduction and community releated contents (#3713) * fix unit test * add apollo team introduction and community releated contents * remove developer section and update klboke with TapTap * Update docs/zh/community/team.md * Update docs/en/community/team.md * Update docs/zh/community/team.md * Update docs/en/community/team.md * Update team.md * Update team.md * Update team.md * move community menu to navbar * Revert "move community menu to navbar" This reverts commit 4dcf5a8cc0db8c720d0f8847618bd5b4ea11034e. Co-authored-by: vdisk Co-authored-by: Zhenxu Ke Co-authored-by: wxq Co-authored-by: Stephen Ni Co-authored-by: Jared Tan --- README.md | 11 ++++------ docs/en/README.md | 11 ++++------ docs/en/_sidebar.md | 11 +++++++--- docs/en/community/team.md | 38 ++++++++++++++++++++++++++++++++ docs/zh/README.md | 11 ++++------ docs/zh/_sidebar.md | 8 ++++++- docs/zh/community/team.md | 40 ++++++++++++++++++++++++++++++++++ pom.xml | 46 --------------------------------------- 8 files changed, 105 insertions(+), 71 deletions(-) create mode 100644 docs/en/community/team.md create mode 100644 docs/zh/community/team.md diff --git a/README.md b/README.md index 5b5af2f88..7b62d77c7 100644 --- a/README.md +++ b/README.md @@ -112,13 +112,10 @@ Demo Environment: * [Design and Implementation Details of Apollo](https://www.infoq.cn/article/open-source-configuration-center-apollo) * [Configuration Center Makes Microservices Smart](https://mp.weixin.qq.com/s/iDmYJre_ULEIxuliu1EbIQ) -# Contribution - -Please make sure to read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making a pull request. - -Thanks for all the people who contributed to Apollo! - - +# Community + * [Apollo Team](https://www.apolloconfig.com/#/en/community/team) + * [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md) + * [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) # License The project is licensed under the [Apache 2 license](https://github.com/ctripcorp/apollo/blob/master/LICENSE). diff --git a/docs/en/README.md b/docs/en/README.md index f6f60f216..b05dc164e 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -106,13 +106,10 @@ Demo Environment: * [Design and Implementation Details of Apollo](https://www.infoq.cn/article/open-source-configuration-center-apollo) * [Configuration Center Makes Microservices Smart](https://mp.weixin.qq.com/s/iDmYJre_ULEIxuliu1EbIQ) -# Contribution - -Please make sure to read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making a pull request. - -Thanks for all the people who contributed to Apollo! - - +# Community + * [Apollo Team](en/community/team) + * [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md) + * [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) # License The project is licensed under the [Apache 2 license](https://github.com/ctripcorp/apollo/blob/master/LICENSE). diff --git a/docs/en/_sidebar.md b/docs/en/_sidebar.md index 8f86c4376..25590c277 100644 --- a/docs/en/_sidebar.md +++ b/docs/en/_sidebar.md @@ -1,3 +1,8 @@ -- [**Home**](en/README.md) - -- [Releases](https://github.com/ctripcorp/apollo/releases) \ No newline at end of file +- [**Home**](en/README.md) + +- [Releases](https://github.com/ctripcorp/apollo/releases) + +- Community + - [Team](en/community/team.md) + - [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md) + - [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) diff --git a/docs/en/community/team.md b/docs/en/community/team.md new file mode 100644 index 000000000..f2e7363c6 --- /dev/null +++ b/docs/en/community/team.md @@ -0,0 +1,38 @@ +# Apollo Team + +The Apollo team is comprised of Members and Contributors. Members have direct access to the source of Apollo project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. All contributions to Apollo are greatly appreciated, whether for trivial cleanups, big new features or other material rewards. + +For more information about the community governance model, please refer [GOVERNANCE.md](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md). + +## Members + +Members include Project Management Committee members and committers. The list is in alphabet order. + +### Project Management Committee + +| Github ID | Name | Organization | +| ---------- | ---------- | ------------ | +| JaredTan95 | Jared Tan | DaoCloud | +| kezhenxu94 | Zhenxu Ke | Tetrate | +| nobodyiam | Jason Song | Ant Group | + +### Committer +| Github ID | Name | Organization | +| ----------- | ------------- | ------------ | +| Anilople | Xiaoquan Wang | Some Bank | +| klboke | Kailing Chen | TapTap | +| lepdou | Le Zhang | Ant Group | +| nisiyong | Stephen Ni | Qihoo 360 | +| vdisk-group | Lvqiu Ye | Hundsun | + +## Contributors + +### Apollo main repository + + +### apollo.net + + +## Becoming a Committer + +Please refer [How to become a Committer](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md#how-to-become-a-committer). diff --git a/docs/zh/README.md b/docs/zh/README.md index 0e98fd227..d558a33de 100644 --- a/docs/zh/README.md +++ b/docs/zh/README.md @@ -131,13 +131,10 @@ Java客户端不依赖任何框架，能够运行于所有Java运行时环境， -# Contribution - -Please make sure to read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making a pull request. - -Thanks for all the people who contributed to Apollo! - - +# 社区 + * [团队](zh/community/team) + * [社区治理](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md) + * [贡献指南](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) # License The project is licensed under the [Apache 2 license](https://github.com/ctripcorp/apollo/blob/master/LICENSE). diff --git a/docs/zh/_sidebar.md b/docs/zh/_sidebar.md index 7b0e9fd78..a9259c0f6 100644 --- a/docs/zh/_sidebar.md +++ b/docs/zh/_sidebar.md @@ -37,4 +37,10 @@ - 其它 - [版本历史](https://github.com/ctripcorp/apollo/releases) - - [Apollo性能测试报告](zh/misc/apollo-benchmark.md) \ No newline at end of file + - [Apollo性能测试报告](zh/misc/apollo-benchmark.md) + +- 社区 + - [团队](zh/community/team.md) + - [社区治理](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md) + - [贡献指南](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) + diff --git a/docs/zh/community/team.md b/docs/zh/community/team.md new file mode 100644 index 000000000..43f525d43 --- /dev/null +++ b/docs/zh/community/team.md @@ -0,0 +1,40 @@ +# Apollo 团队 + +Apollo 团队由 Member 和 Contributor 组成。Member 可以直接访问 Apollo 项目的源代码并基于代码库积极演进。Contributor 通过向 Member 提交补丁和建议来改善项目，项目的贡献者数量是没有限制的。无论是进行小规模的清理，提交新的功能或其它形式的贡献，都将受到极大的赞赏。 + +有关社区治理模型的更多信息，请参考[GOVERNANCE.md](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)。 + +## Member + +Member 包括 PMC 成员和 Committer，该列表按字母顺序排列。 + +### Project Management Committee(PMC) + +| Github ID | Name | Organization | +| ---------- | ---------- | ------------ | +| JaredTan95 | Jared Tan | DaoCloud | +| kezhenxu94 | Zhenxu Ke | Tetrate | +| nobodyiam | Jason Song | Ant Group | + +### Committer +| Github ID | Name | Organization | +| ----------- | ------------- | ------------ | +| Anilople | Xiaoquan Wang | Some Bank | +| klboke | Kailing Chen | TapTap | +| lepdou | Le Zhang | Ant Group | +| nisiyong | Stephen Ni | Qihoo 360 | +| vdisk-group | Lvqiu Ye | Hundsun | + +## Contributor + +### Apollo 主仓库 + + + +### apollo.net + + + +## **如何成为提交者** + +请参考 [How to become a Committer](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md#how-to-become-a-committer). diff --git a/pom.xml b/pom.xml index b09df6fff..5a2d7a6a3 100644 --- a/pom.xml +++ b/pom.xml @@ -55,52 +55,6 @@ https://github.com/ctripcorp/apollo/issues - - - nobodyiam - Jason(Shun) Song - nobodyiam at gmail.com - Ctrip, Inc. - http://www.ctrip.com - - Project Management Committee Member - Developer - - - - lepdou - Le Zhang - lepdou at gmail.com - Ctrip, Inc. - http://www.ctrip.com - - Developer - - - - yiming187 - Billy(Yiming) Liu - liuyiming.vip at gmail.com - Ctrip, Inc. - http://www.ctrip.com - - Developer(Inactive) - - - - kezhenxu94 - https://github.com/kezhenxu94 - Zhenxu Ke - kezhenxu94 at apache.org - Tetrate.io - http://tetrate.io - - Project Management Committee Member - Developer - - - - 1.9.0-SNAPSHOT 1.8 -- GitLab