Merge pull request #307 from jonyangx/develop

solve the issue: Modify the package name to org.apache #306 close #306
apache · Apr 22, 2021 · 857d069 · 857d069
2 parents 749072a + 01fe061
commit 857d069
Show file tree

Hide file tree

Showing 292 changed files with 2,737 additions and 2,288 deletions.
diff --git a/.github/workflows/gitee-mirror.yml b/.github/workflows/gitee-mirror.yml
@@ -21,25 +21,25 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    - name: Mirror the Github organization repos to Gitee.
-      uses: Yikun/hub-mirror-action@master
-      with:
-        src: github/WeBankFinTech
-        dst: gitee/webank
-        # 这里请填写与gitee上公钥匹配的的 ssh private key，参见：https://gitee.com/profile/sshkeys
-        # 填写地址：https://github.com/WeBankFinTech/fes.js/settings/secrets
-        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
-        # 这里请填写 gitee的令牌，参见：https://gitee.com/profile/personal_access_tokens
-        # 填写地址：https://github.com/WeBankFinTech/fes.js/settings/secrets
-        dst_token: ${{ secrets.GITEE_TOKEN }}
-        # 项目同步白名单，可以选择填写多个，以英文逗号分割
-        static_list: "EventMesh"
-        # 是否强制同步
-        force_update: true
-        # 账号类型：对 luban-h5 而言是 user，因为是个人项目；如果是企业项目，请填写 org，因为是组织下的项目
-        account_type: org
-        clone_style: ssh
-        
+      - name: Mirror the Github organization repos to Gitee.
+        uses: Yikun/hub-mirror-action@master
+        with:
+          src: github/WeBankFinTech
+          dst: gitee/webank
+          # 这里请填写与gitee上公钥匹配的的 ssh private key，参见：https://gitee.com/profile/sshkeys
+          # 填写地址：https://github.com/WeBankFinTech/fes.js/settings/secrets
+          dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+          # 这里请填写 gitee的令牌，参见：https://gitee.com/profile/personal_access_tokens
+          # 填写地址：https://github.com/WeBankFinTech/fes.js/settings/secrets
+          dst_token: ${{ secrets.GITEE_TOKEN }}
+          # 项目同步白名单，可以选择填写多个，以英文逗号分割
+          static_list: "EventMesh"
+          # 是否强制同步
+          force_update: true
+          # 账号类型：对 luban-h5 而言是 user，因为是个人项目；如果是企业项目，请填写 org，因为是组织下的项目
+          account_type: org
+          clone_style: ssh
+
   build-and-deploy:
     runs-on: ubuntu-latest
     steps:
@@ -56,5 +56,5 @@ jobs:
         uses: JamesIves/github-pages-deploy-action@3.7.1
         with:
           GITHUB_TOKEN: ${{ secrets.EVENTMESH }}
-          BRANCH: gh-pages 
+          BRANCH: gh-pages
           FOLDER: docs/.vuepress/dist # The folder the action should deploy.
diff --git a/.travis.yml b/.travis.yml
@@ -2,14 +2,14 @@ dist: trusty
 
 language: java
 jdk:
-- oraclejdk8
+  - oraclejdk8
 
 script:
-- travis_retry gradle check
+  - travis_retry gradle check
 
 after_success:
-- gradle clean test jacocoAllTestReport coveralls
+  - gradle clean test jacocoAllTestReport coveralls
 
 env:
   global:
-  - secure: "T1QAuaAzcB7K8YjAAVVb4P9+W0JAdOFbyBwRxliyyoSZUShlIqa0eE7ioXHXWBP/d5f3XtROse6lq2qILqcU9sFSncKE2vRJlwJ5p7R23WIsCXdV70A9AVE2gLJcIJiOTMwd/YYYzNDrGLp3CSJNcKo8t7t70V2j/11I9xPTOHnaZ8FHGC3d/7bjfR/+g/3d4EOCvV8Vm6ndEmmailmF8OJ/kcbuRbArKIehjUwNDyQZfwAc9+vvPZlHgnQvR1pJ/KiK6muEIi7RQohDq7lMTmcc2LZSYgy/+aqFrmBcQwXScABFmSwysQ4KMXfrCqqMsBdmvno/NoKVGofHHKdym/oauv/G3lxLx5sgM9A7ZSFBK08x08r7u/6TDsTFmQ9LzVFDNo/OLZhxs3dr9x2C9Pa2A7IP1i1oVbbYkwBJv4z6o3khWpQAAY/IWijlCZ9vkjFfqdIXbvlPqamEaFRAmK5I3MVqL2+eBF+2Or/zwv4rXjo+v5LUKTfmDl77QUshPv6J+hblbBR0cJ/ZTSh9rHgdqhEzPGSt3e0YrEefkKWfinBr8TjIsHgQgmfU8Kz7gf7tvioOuAgKj4WlgEQJs3dPp7J5zxFVNMM6teAMFy8c2MtAdzKrs13Ri1qZWtL6B7JWlH6yhHqhKghyJhRjUFNVZnBkA/z9gzDKZ+tz2m8="
+    - secure: "T1QAuaAzcB7K8YjAAVVb4P9+W0JAdOFbyBwRxliyyoSZUShlIqa0eE7ioXHXWBP/d5f3XtROse6lq2qILqcU9sFSncKE2vRJlwJ5p7R23WIsCXdV70A9AVE2gLJcIJiOTMwd/YYYzNDrGLp3CSJNcKo8t7t70V2j/11I9xPTOHnaZ8FHGC3d/7bjfR/+g/3d4EOCvV8Vm6ndEmmailmF8OJ/kcbuRbArKIehjUwNDyQZfwAc9+vvPZlHgnQvR1pJ/KiK6muEIi7RQohDq7lMTmcc2LZSYgy/+aqFrmBcQwXScABFmSwysQ4KMXfrCqqMsBdmvno/NoKVGofHHKdym/oauv/G3lxLx5sgM9A7ZSFBK08x08r7u/6TDsTFmQ9LzVFDNo/OLZhxs3dr9x2C9Pa2A7IP1i1oVbbYkwBJv4z6o3khWpQAAY/IWijlCZ9vkjFfqdIXbvlPqamEaFRAmK5I3MVqL2+eBF+2Or/zwv4rXjo+v5LUKTfmDl77QUshPv6J+hblbBR0cJ/ZTSh9rHgdqhEzPGSt3e0YrEefkKWfinBr8TjIsHgQgmfU8Kz7gf7tvioOuAgKj4WlgEQJs3dPp7J5zxFVNMM6teAMFy8c2MtAdzKrs13Ri1qZWtL6B7JWlH6yhHqhKghyJhRjUFNVZnBkA/z9gzDKZ+tz2m8="
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 # Contributing to EventMesh
 
-Welcome to EventMesh! This document is a guideline about how to contribute to EventMesh.
-If you find something incorrect or missing, please leave comments / suggestions.
+Welcome to EventMesh! This document is a guideline about how to contribute to EventMesh. If you find something incorrect
+or missing, please leave comments / suggestions.
 
 ## Before you get started
 
@@ -11,11 +11,11 @@ You should have JDK installed in your operating system.
 
 ## Contributing
 
-We are always very happy to have contributions, whether for typo fix, bug fix or big new features.
-Please do not ever hesitate to ask a question or send a pull request.
+We are always very happy to have contributions, whether for typo fix, bug fix or big new features. Please do not ever
+hesitate to ask a question or send a pull request.
 
-We strongly value documentation and integration with other projects.
-We are very glad to accept improvements for these aspects.
+We strongly value documentation and integration with other projects. We are very glad to accept improvements for these
+aspects.
 
 ### GitHub workflow
 
@@ -31,29 +31,29 @@ Here are the workflow for contributors:
 6. Push your commits to your forked repository
 7. Create a pull request
 
-Please follow [the pull request template](./.github/PULL_REQUEST_TEMPLATE.md).
-Please make sure the PR has a corresponding issue. [GitHub Issues](https://github.com/WeBankFinTech/EventMesh/issues)
+Please follow [the pull request template](./.github/PULL_REQUEST_TEMPLATE.md). Please make sure the PR has a
+corresponding issue. [GitHub Issues](https://github.com/WeBankFinTech/EventMesh/issues)
 
-After creating a PR, one or more reviewers will be assigned to the pull request.
-The reviewers will review the code.
+After creating a PR, one or more reviewers will be assigned to the pull request. The reviewers will review the code.
 
-Before merging a PR, squash any fix review feedback, typo, merged, and rebased sorts of commits.
-The final commit message should be clear and concise.
+Before merging a PR, squash any fix review feedback, typo, merged, and rebased sorts of commits. The final commit
+message should be clear and concise.
 
 ### Open an issue / PR
 
-We use [GitHub Issues](https://github.com/WeBankFinTech/EventMesh/issues) and [Pull Requests](https://github.com/WeBankFinTech/EventMesh/pulls) for trackers.
+We use [GitHub Issues](https://github.com/WeBankFinTech/EventMesh/issues)
+and [Pull Requests](https://github.com/WeBankFinTech/EventMesh/pulls) for trackers.
 
-If you find a typo in a document, find a bug in code, or want new features, or want to give suggestions,
-you can [open an issue on GitHub](https://github.com/WeBankFinTech/EventMesh/issues/new) to report it.
-Please follow the guideline message in the issue template.
+If you find a typo in a document, find a bug in code, or want new features, or want to give suggestions, you
+can [open an issue on GitHub](https://github.com/WeBankFinTech/EventMesh/issues/new) to report it. Please follow the
+guideline message in the issue template.
 
-If you want to contribute, please follow the [contribution workflow](#github-workflow) and create a new pull request.
-If your PR contains large changes, e.g. component refactor or new components, please write detailed documents
-about its design and usage.
+If you want to contribute, please follow the [contribution workflow](#github-workflow) and create a new pull request. If
+your PR contains large changes, e.g. component refactor or new components, please write detailed documents about its
+design and usage.
 
-Note that a single pull request should not be too large. If heavy changes are required, it's better to separate the changes
-to a few individual PRs.
+Note that a single pull request should not be too large. If heavy changes are required, it's better to separate the
+changes to a few individual PRs.
 
 ### Code review
 

diff --git a/CONTRIBUTING.zh-CN.md b/CONTRIBUTING.zh-CN.md
@@ -1,7 +1,6 @@
 # 贡献给EventMesh
 
-欢迎使用EventMesh! 本文档是有关如何为EventMesh做出贡献的指南。
-如果发现不正确或缺失的内容，请留下评论/建议。
+欢迎使用EventMesh! 本文档是有关如何为EventMesh做出贡献的指南。 如果发现不正确或缺失的内容，请留下评论/建议。
 
 ## 开始之前
 
@@ -11,51 +10,43 @@
 
 ## 贡献
 
-无论是对于拼写错误，BUG修复还是重要的新功能，我们总是很乐意为您做出贡献。
-请不要犹豫，提出问题或发送请求请求。
+无论是对于拼写错误，BUG修复还是重要的新功能，我们总是很乐意为您做出贡献。 请不要犹豫，提出问题或发送请求请求。
 
-我们非常重视文档以及与其他项目的集成。
-我们很高兴接受这些方面的改进。
+我们非常重视文档以及与其他项目的集成。 我们很高兴接受这些方面的改进。
 
 ### GitHub工作流程
 
 我们将`develop`分支用作开发分支，这表明这是一个不稳定的分支。
 
 这是贡献者的工作流程 :
 
-1. Fork到您个人仓库 
-2. 克隆到本地存储库 
-3. 创建一个新分支并对其进行处理 
-4. 保持分支同步 
+1. Fork到您个人仓库
+2. 克隆到本地存储库
+3. 创建一个新分支并对其进行处理
+4. 保持分支同步
 5. 提交您的更改(确保您的提交消息简明扼要)
 6. 将您的提交推送到分叉的存储库
 7. 创建PR合并请求
 
 请遵循[Pull Requests模板](./.github/PULL_REQUEST_TEMPLATE.md).
 请确保PR对应有相应的问题. [GitHub Issues](https://github.com/WeBankFinTech/EventMesh/issues)
 
-创建PR后，将为拉取请求分配一个或多个审阅者。
-审阅者将审阅代码。
+创建PR后，将为拉取请求分配一个或多个审阅者。 审阅者将审阅代码。
 
-在合并PR之前，请压缩所有修订审阅反馈，拼写错误，合并的内容和基于基础的提交内容。
-最终的提交消息应该清晰简洁。
+在合并PR之前，请压缩所有修订审阅反馈，拼写错误，合并的内容和基于基础的提交内容。 最终的提交消息应该清晰简洁。
 
 ### 打开问题/ PR
 
-我们将使用Issues和Pull Requests作为跟踪器 
+我们将使用Issues和Pull Requests作为跟踪器
 [GitHub Issues](https://github.com/WeBankFinTech/EventMesh/issues)
 [Pull Requests](https://github.com/WeBankFinTech/EventMesh/pulls)
 
-如果您在文档中发现拼写错误，在代码中发现错误，想要新功能或提出建议，
-您可以提出问题[在GitHub上打开问题](https://github.com/WeBankFinTech/EventMesh/issues/new)
+如果您在文档中发现拼写错误，在代码中发现错误，想要新功能或提出建议， 您可以提出问题[在GitHub上打开问题](https://github.com/WeBankFinTech/EventMesh/issues/new)
 请按照问题模板中的准则消息进行操作。
 
-如果您想贡献，请遵循[贡献工作流程](#github-workflow)并创建一个新的拉取请求。
-如果您的PR包含较大的更改，例如组件重构或新组件，请写详细文档
-有关其设计和使用的信息。
+如果您想贡献，请遵循[贡献工作流程](#github-workflow)并创建一个新的拉取请求。 如果您的PR包含较大的更改，例如组件重构或新组件，请写详细文档 有关其设计和使用的信息。
 
-请注意，单个拉取请求不应太大。如果需要进行重大更改，最好将更改分开
-到一些个人PR。
+请注意，单个拉取请求不应太大。如果需要进行重大更改，最好将更改分开 到一些个人PR。
 
 ### 代码审查
 

diff --git a/README.md b/README.md
@@ -68,13 +68,13 @@ The protocol of eventmesh is easier and convenient, you can read more [here](doc
 ## Quick Start
 1. Build and deploy event-store(RocketMQ), see [instruction](https://rocketmq.apache.org/docs/quick-start/).
 2. Build and deploy eventmesh-runtime, see instruction ['eventmesh-runtime quickstart'](docs/en/instructions/eventmesh-runtime-quickstart.md).
-3. Run eventmesh-sdk-java demo, see instruction ['eventmesh-sdk-java quickstart'](docs/en/instructions/eventmesh-sdk-java-quickstart.md). 
+3. Run eventmesh-sdk-java demo, see instruction ['eventmesh-sdk-java quickstart'](docs/en/instructions/eventmesh-sdk-java-quickstart.md).
 
 ## Contributing
 Contributions are always welcomed! Please see [CONTRIBUTING](CONTRIBUTING.md) for detailed guidelines.
 
-You can start with the issues labeled with good first issue. 
-[GitHub Issues](https://github.com/WeBankFinTech/EventMesh/issues)
+You can start with the issues labeled with good first issue.
+[GitHub Issues](https://github.com/apache/incubator-eventmesh/issues)
 
 ## License
 [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) Copyright (C) Apache Software Foundation.
@@ -85,8 +85,9 @@ WeChat group：
 ![wechat_qr](docs/images/mesh-helper.png)
 
 Mailing Lists:
+
 | Name | Description |Subscribe	|Unsubscribe|Archive
 | ----    | ----    |----    | ----    | ----    |
 |Users	|User support and questions mailing list|	[Subscribe](mailto:users-subscribe@eventmesh.incubator.apache.org)	|[Unsubscribe](mailto:users-unsubscribe@eventmesh.incubator.apache.org)	|[Mail Archives](https://lists.apache.org/list.html?users@eventmesh.apache.org)|
 |Development	|Development related discussions|	[Subscribe](mailto:dev-subscribe@eventmesh.incubator.apache.org)	|[Unsubscribe](mailto:dev-unsubscribe@eventmesh.incubator.apache.org)	|[Mail Archives](https://lists.apache.org/list.html?dev@eventmesh.apache.org)|
-|Commits	|All commits to repositories|	[Subscribe](mailto:commits-subscribe@eventmesh.incubator.apache.org)	|[Unsubscribe](mailto:commits-unsubscribe@eventmesh.incubator.apache.org)	|[Mail Archives](https://lists.apache.org/list.html?commits@eventmesh.apache.org)|
+|Commits	|All commits to repositories|	[Subscribe](mailto:commits-subscribe@eventmesh.incubator.apache.org)	|[Unsubscribe](mailto:commits-unsubscribe@eventmesh.incubator.apache.org)	|[Mail Archives](https://lists.apache.org/list.html?commits@eventmesh.apache.org)|
diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -67,8 +67,8 @@ eventmesh的通信协议更加简洁方便，详细内容，阅读更多[这里]
 ## 贡献
 永远欢迎参与共建, 请参阅[贡献](CONTRIBUTING.zh-CN.md)了解详细指南
 
-您可以从问题开始. 
-[GitHub Issues](https://github.com/WeBankFinTech/EventMesh/issues)
+您可以从问题开始.
+[GitHub Issues](https://github.com/apache/incubator-eventmesh/issues)
 
 ## License
 [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) Copyright (C) Apache Software Foundation

diff --git a/build.gradle b/build.gradle
@@ -74,7 +74,6 @@ task zip(type: Zip) {
 
 subprojects {
 
-
     apply plugin: "maven"
     apply plugin: "eclipse"
     apply plugin: "idea"
@@ -165,7 +164,6 @@ subprojects {
     }
 
 
-
     List junit = [
             "junit:junit:4.12"
     ]