update 1.2.0-release branch code (#399)

* update build.gradle and gradle.properties for publish to maven repository (#330) * [ISSUE #325]Update gradle configuration for publishing package to maven repository * update build.gradle * update build.gradle and gradle.properties * update build.gradle and gradle.properties for publish to maven repository * Update README.md * Update README.zh-CN.md * update quickstart md files for gradle version (#332) * [ISSUE #325]Update gradle configuration for publishing package to maven repository * update build.gradle * update build.gradle and gradle.properties * update build.gradle and gradle.properties for publish to maven repository * * update gradle version for instructions * fix: dist task exception * remove dead docs Signed-off-by: qqeasonchen <qqeasonchen@gmail.com> * [ISSUE #329]Missing Log4j dependency (#336) * [ISSUE #325]Update gradle configuration for publishing package to maven repository * update build.gradle * update build.gradle and gradle.properties * update build.gradle and gradle.properties for publish to maven repository * * update gradle version for instructions * fix: dist task exception * [ISSUE #329]Missing Log4j dependency * [ISSUE #331] Fix dead links in docs (#334) fixed #331 * Doc modification #328 (#335) change vm params * Update README.md * [Issue #337] Fix Http Test Subscriber startup issue by moving the Thread.sleep into the child thread (#338) * [Issue #337] Fix HttpSubscriber startup issue * [Issue #337] test commit * [Issue #337] revert test commit Co-authored-by: j00441484 <jin.rong.luo@huawei.com> * [Issue #337] Enhance Http Demo Subscriber by using ExecutorService, CountDownLatch and PreDestroy hook (#343) * [Issue #337] Fix HttpSubscriber startup issue * [Issue #337] test commit * [Issue #337] revert test commit * [Issue #337] Enhance Http Demo Subscriber by using ExecutorService, CountDownLatch and PreDestroy hook * [Issue #337] Enhance Http Demo Subscriber by using ExecutorService, CountDownLatch and PreDestroy hook * [Issue #337] Address code review comment for Subscriber Demo App Co-authored-by: j00441484 <jin.rong.luo@huawei.com> * [ISSUE #348] Setup automated workflows for greetings (#347) * Setup automated workflows for greetings * Remove '@apache/eventmesh-committers' * Add LGTM Badges ISSUE#353 (#354) LGTM is a variant analysis platform that automatically checks code for real CVEs and vulnerabilities. Learn more at https://lgtm.com/help/lgtm/about-lgtm . Here are some alerts in our project reported by LGTM: https://lgtm.com/projects/g/apache/incubator-eventmesh/alerts/?mode=list I'd like to add LGTM badges in the README.md, it makes easier for people who want to get alerts and then contribute to EventMesh. * [ISSUE #355] Setup Github workflows for CodeQL scans (#356) * Setup CodeQL scans * disable autorun * add a step for setting up JDK * add codeql * fix step Build * fix strategy * add events: schedule & workflow_dispatch * [Issue #344] Fixing racing condition issue in SubscribeProcessor and UnSubscribeProcessor (#345) * [Issue #337] Fix HttpSubscriber startup issue * [Issue #337] test commit * [Issue #337] revert test commit * [Issue #337] Enhance Http Demo Subscriber by using ExecutorService, CountDownLatch and PreDestroy hook * [Issue #337] Enhance Http Demo Subscriber by using ExecutorService, CountDownLatch and PreDestroy hook * [Issue #344] Fixing racing condition issue in SubscribeProcessor and UnSubscribeProcessor * [Issue #344] Fix import statements * [Issue #337] Address code review comment for Subscriber Demo App * [Issue #344] Enhance client registration logic in SubscribeProcessor and UnsubscriberProcessor * [Issue #344] Minor code clean up in SubscribeProcessor and UnsubscriberProcessor * [Issue #344] Fix NullPointerException in ConsumerManager occurs during subscribe/unsunscribe iteration testing * [Issue #344] Fix bugs in subscribe/unsunscribe code path * [Issue #344] use client.pid instead of client.ip for client comparasion in UnSubscribeProcessor Co-authored-by: j00441484 <jin.rong.luo@huawei.com> * update eventmesh-runtime.png (#358) * update eventmesh-runtime.png * [Issue #333] Support multiple load balance strategy in sdk (#342) * Support multiple load balance strategy in sdk #333 * Fix ut * add log * update eventmesh-panels.png (#362) * [ISSUE #325]Update gradle configuration for publishing package to maven repository * update build.gradle * update build.gradle and gradle.properties * update build.gradle and gradle.properties for publish to maven repository * * update gradle version for instructions * fix: dist task exception * [ISSUE #329]Missing Log4j dependency * update eventmesh-runtime.png * update eventmesh-panels.png * update eventmesh-panels.png (#363) * [ISSUE #325]Update gradle configuration for publishing package to maven repository * update build.gradle * update build.gradle and gradle.properties * update build.gradle and gradle.properties for publish to maven repository * * update gradle version for instructions * fix: dist task exception * [ISSUE #329]Missing Log4j dependency * update eventmesh-runtime.png * update eventmesh-panels.png * Migrate CI to Github Actions and enable coverage report (#365) * add: requirements for lightweight EventMesh SDK with CloudEvents (#370) This commit only includes a brief introduction and requirements. Design details can be followed up in a later commit. Signed-off-by: Yuzhou Mao <myz@umich.edu> * Add files via upload * Update README.md * [Issue #368] Fix Racing condition and memory leak issue in EventMesh SDK LiteConsumer and LiteProducer (#369) * [Issue #337] Fix HttpSubscriber startup issue * [Issue #337] test commit * [Issue #337] revert test commit * [Issue #337] Enhance Http Demo Subscriber by using ExecutorService, CountDownLatch and PreDestroy hook * [Issue #337] Enhance Http Demo Subscriber by using ExecutorService, CountDownLatch and PreDestroy hook * [Issue #337] Address code review comment for Subscriber Demo App * [Issue #368] Fix Racing condition and memory leak issue in EventMesh SDK LiteConsumer and LiteProducer * [Issue #368] fix build issue * [Issue #368] use try with resource statement for HttpClient * [Issue #368] fix TLS1.1 and use TLS1.2 in HttpClient Co-authored-by: j00441484 <jin.rong.luo@huawei.com> * [ISSUE #350]optimize flow control in downstreaming msg (#352) * modify:optimize flow control in downstreaming msg * modify:optimize stategy of selecting session in downstream msg * modify:optimize msg downstream,msg store in session * modify:fix bug:not a @sharable handler * [ISSUE #380] Remove gitee-mirror.yml from Github workflows (#381) * Update README.md * [ISSUE #310] add github action for check license (#313) * add github action for check license * fix syntax and name ci for Check license * fix github action branch typo * [ISSUE #310] Enable Github Actions for license check and fix license headers (#377) * add github action for check license * fix syntax and name ci for Check license * fix github action branch typo * enable github actions for license check * add necessary headers * update badges Co-authored-by: Lan Liang <gcslyp@gmail.com> * [Issue #382] Fix java.lang.NumberFormatException when parsing Long (#383) * [Issue #337] Fix HttpSubscriber startup issue * [Issue #337] test commit * [Issue #337] revert test commit * [Issue #337] Enhance Http Demo Subscriber by using ExecutorService, CountDownLatch and PreDestroy hook * [Issue #337] Enhance Http Demo Subscriber by using ExecutorService, CountDownLatch and PreDestroy hook * [Issue #337] Address code review comment for Subscriber Demo App * [Issue #368] Fix Racing condition and memory leak issue in EventMesh SDK LiteConsumer and LiteProducer * [Issue #368] fix build issue * [Issue #368] use try with resource statement for HttpClient * [Issue #368] fix TLS1.1 and use TLS1.2 in HttpClient * [Issue #382] Fix java.lang.NumberFormatException when parsing Long * [Issue #382] Fix java.lang.NumberFormatException when parsing Integer Co-authored-by: j00441484 <jin.rong.luo@huawei.com> * [ISSUE #378] downstream broadcast msg asynchronously (#379) * modify:optimize flow control in downstreaming msg * modify:optimize stategy of selecting session in downstream msg * modify:optimize msg downstream,msg store in session * modify:fix bug:not a @sharable handler * modify:downstream broadcast msg asynchronously closed #378 * [ISSUE #359] Split handler from controller (#359) (#360) * [ISSUE #359] Split handler from controller (#359) * add license header * add ut * [ISSUE #384] RedirectClientByIpPortHandlerTest.java doesn't have the Apache license header (#385) close #384 * Update README.md * Update README.zh-CN.md * Update README.zh-CN.md * Update README.zh-CN.md * [Issue #386] fixing ConsumerGroup Queue Consumer Offset not synced up issue (#387) * [Issue #337] Fix HttpSubscriber startup issue * [Issue #337] test commit * [Issue #337] revert test commit * [Issue #337] Enhance Http Demo Subscriber by using ExecutorService, CountDownLatch and PreDestroy hook * [Issue #337] Enhance Http Demo Subscriber by using ExecutorService, CountDownLatch and PreDestroy hook * [Issue #337] Address code review comment for Subscriber Demo App * [Issue #386] fixing ConsumerGroup Queuen Consumer Offset not synced up issue * [Issue #386] adding license header to new file * [Issue #386] Fix license header missing issue Co-authored-by: j00441484 <jin.rong.luo@huawei.com> * [ISSUE #366 ] remove custom-format topic concept (#388) * remove custom-format topic concept * remove custom-format topic concept * remove custom-format topic concept * remove custom-format topic concept * remove custom-format topic concept * remove custom-format topic concept * remove custom-format topic concept * [ISSUE #366] remove custom concept [dcn&&region] (#390) * remove custom concept{dcn} * remove custom concept{dcn} * remove custom concept{dcn} * remove custom concept{dcn} * remove custom concept{dcn} * remove custom concept{dcn} * remove custom concept{dcn} close #366 * [ISSUE #391] Optimize interface design in eventmesh-connector-api (#392) * modify:optimize flow control in downstreaming msg * modify:optimize stategy of selecting session in downstream msg * modify:optimize msg downstream,msg store in session * modify:fix bug:not a @sharable handler * modify:downstream broadcast msg asynchronously * modify:remove unneccessary interface in eventmesh-connector-api * modify:fix conflict * modify:add license in EventMeshAction close #391 * miss group name set for userAgent (#395) * remove custom concept{dcn} * remove custom concept{dcn} * remove custom concept{dcn} * remove custom concept{dcn} * remove custom concept{dcn} * remove custom concept{dcn} * remove custom concept{dcn} * bugfix : miss group set * bugfix : miss group set * [ISSUE #393]:perf topic name in test file (#394) close #393 * support unsubscribe topics while delconsumer in http mode (#396) * [ISSUE #325]Update gradle configuration for publishing package to maven repository * update build.gradle * update build.gradle and gradle.properties * update build.gradle and gradle.properties for publish to maven repository * * update gradle version for instructions * fix: dist task exception * [ISSUE #329]Missing Log4j dependency * update eventmesh-runtime.png * support unsubscribe topics while delconsumer in http mode * [ISSUE #397]Remove subscription session failed error (#398) * [ISSUE #325]Update gradle configuration for publishing package to maven repository * update build.gradle * update build.gradle and gradle.properties * update build.gradle and gradle.properties for publish to maven repository * * update gradle version for instructions * fix: dist task exception * [ISSUE #329]Missing Log4j dependency * update eventmesh-runtime.png * support unsubscribe topics while delconsumer in http mode * [ISSUE #397]Remove subscription session failed error * [ISSUE #397]Remove subscription session failed error close #397 * update 1.2.0-release branch code Co-authored-by: Eason Chen <qqeasonchen@gmail.com> Co-authored-by: Steve Yurong Su <steveyurongsu@outlook.com> Co-authored-by: ruanwenjun <861923274@qq.com> Co-authored-by: jinrongluo <kapoking@gmail.com> Co-authored-by: j00441484 <jin.rong.luo@huawei.com> Co-authored-by: Yuzhou Mao <yuzhou.myz@gmail.com> Co-authored-by: lrhkobe <34571087+lrhkobe@users.noreply.github.com> Co-authored-by: Steve Yurong Su <rong@apache.org> Co-authored-by: Lan <liangyuanpengem@163.com> Co-authored-by: Lan Liang <gcslyp@gmail.com> Co-authored-by: nanoxiong <xiong_mengfei@163.com> Co-authored-by: keranbingaa <397294722@qq.com>
apache · Jun 26, 2021 · ad3f7ff · ad3f7ff
1 parent 4de90ce
commit ad3f7ff
Show file tree

Hide file tree

Showing 213 changed files with 3,539 additions and 3,412 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1 @@
+#TBD
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,84 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+name: "Continuous Integration"
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+    branches:
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language:
+          - 'java'
+        java:
+          - 8
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+          languages: ${{ matrix.language }}
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+
+      - name: Build
+        run: ./gradlew clean build jacocoTestReport
+
+      - name: Perform CodeQL analysis
+        uses: github/codeql-action/analyze@v1
+
+      - name: Upload coverage report to codecov.io
+        run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload coverage report!'
+
+  license-check:
+    name: License Check
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Check license header
+        uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/gitee-mirror.yml b/.github/workflows/gitee-mirror.yml
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
@@ -0,0 +1,72 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+name: Greetings
+
+on: [pull_request, issues]
+
+jobs:
+  greeting:
+    name: Greeting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/first-interaction@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          issue-message: |
+            Welcome to the Apache EventMesh (incubating) community!!
+            We are glad that you are contributing by opening this issue. :D
+
+            Please make sure to include all the relevant context.
+            We will be here shortly.
+
+            If you are interested in contributing to our project, please let us know!
+            You can check out our contributing guide on [contributing to EventMesh](https://github.com/apache/incubator-eventmesh/blob/develop/CONTRIBUTING.md).
+
+            Want to get closer to the community?
+
+            WeChat Group：
+            ![wechat_qr](https://github.com/apache/incubator-eventmesh/blob/develop/docs/images/mesh-helper.png?raw=true)
+
+            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)|
+
+          pr-message: |
+            Welcome to the Apache EventMesh (incubating) community!!
+            This is your first PR in our project. We're very excited to have you onboard contributing. Your contributions are greatly appreciated!
+
+            Please make sure that the changes are covered by tests.
+            We will be here shortly.
+            Let us know if you need any help!
+
+            Want to get closer to the community?
+
+            WeChat Group：
+            ![wechat_qr](https://github.com/apache/incubator-eventmesh/blob/develop/docs/images/mesh-helper.png?raw=true)
+
+            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)|
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -0,0 +1,41 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+header:
+  license:
+    spdx-id: Apache-2.0
+    copyright-owner: Apache Software Foundation
+
+  paths-ignore:
+    - '.github/PULL_REQUEST_TEMPLATE'
+    - '.gitmodules'
+    - '**/.gitkeep'
+    - '**/.gitignore'
+    - '**/*.md'
+    - '**/*.json'
+    - '**/*.ftl'
+    - '**/*.iml'
+    - '**/*.ini'
+    - '**/*.crt'
+    - '**/*.pem'
+    - 'LICENSE'
+    - 'NOTICE'
+    - 'DISCLAIMER-WIP'
+
+  comment: on-failure
diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ Here are the workflow for contributors:
 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)
+corresponding issue. [GitHub Issues](https://github.com/apache/incubator-eventmesh/issues)
 
 After creating a PR, one or more reviewers will be assigned to the pull request. The reviewers will review the code.
 
@@ -41,11 +41,11 @@ 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/apache/incubator-eventmesh/issues)
+and [Pull Requests](https://github.com/apache/incubator-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
+can [open an issue on GitHub](https://github.com/apache/incubator-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

diff --git a/CONTRIBUTING.zh-CN.md b/CONTRIBUTING.zh-CN.md
@@ -29,7 +29,7 @@
 7. 创建PR合并请求
 
 请遵循[Pull Requests模板](./.github/PULL_REQUEST_TEMPLATE.md).
-请确保PR对应有相应的问题. [GitHub Issues](https://github.com/WeBankFinTech/EventMesh/issues)
+请确保PR对应有相应的问题. [GitHub Issues](https://github.com/apache/incubator-eventmesh/issues)
 
 创建PR后，将为拉取请求分配一个或多个审阅者。 审阅者将审阅代码。
 
@@ -38,10 +38,10 @@
 ### 打开问题/ PR
 
 我们将使用Issues和Pull Requests作为跟踪器
-[GitHub Issues](https://github.com/WeBankFinTech/EventMesh/issues)
-[Pull Requests](https://github.com/WeBankFinTech/EventMesh/pulls)
+[GitHub Issues](https://github.com/apache/incubator-eventmesh/issues)
+[Pull Requests](https://github.com/apache/incubator-eventmesh/pulls)
 
-如果您在文档中发现拼写错误，在代码中发现错误，想要新功能或提出建议， 您可以提出问题[在GitHub上打开问题](https://github.com/WeBankFinTech/EventMesh/issues/new)
+如果您在文档中发现拼写错误，在代码中发现错误，想要新功能或提出建议， 您可以提出问题[在GitHub上打开问题](https://github.com/apache/incubator-eventmesh/issues/new)
 请按照问题模板中的准则消息进行操作。
 
 如果您想贡献，请遵循[贡献工作流程](#github-workflow)并创建一个新的拉取请求。 如果您的PR包含较大的更改，例如组件重构或新组件，请写详细文档 有关其设计和使用的信息。

diff --git a/README.md b/README.md
@@ -1,10 +1,14 @@
-[![Build Status](https://www.travis-ci.org/apache/incubator-eventmesh.svg?branch=develop)](https://www.travis-ci.org/github/apache/incubator-eventmesh)
-[![Coverage Status](https://coveralls.io/repos/github/WeBankFinTech/DeFiBus/badge.svg?branch=master)](https://coveralls.io/github/WeBankFinTech/EventMesh?branch=master)
-[![GitHub release](https://img.shields.io/badge/release-download-orange.svg)](https://github.com/WeBankFinTech/EventMesh/releases)
+# Apache EventMesh (incubating) 
+[![CI status](https://github.com/apache/incubator-eventmesh/actions/workflows/ci.yml/badge.svg)](https://github.com/apache/incubator-eventmesh/actions/workflows/ci.yml)
+[![CodeCov](https://codecov.io/gh/apache/incubator-eventmesh/branch/develop/graph/badge.svg)](https://codecov.io/gh/apache/incubator-eventmesh)
+[![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/apache/incubator-eventmesh.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/incubator-eventmesh/context:java)
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/apache/incubator-eventmesh.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/incubator-eventmesh/alerts/)
+[![GitHub release](https://img.shields.io/badge/release-download-orange.svg)](https://github.com/apache/incubator-eventmesh/releases)
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 
 [点我查看中文版](README.zh-CN.md)
 
+![logo](docs/images/logo2.png)
 ## What is EventMesh?
 EventMesh(incubating) is a dynamic cloud-native eventing infrastruture used to decouple the application and backend middleware layer, which supports a wide range of use cases that encompass complex multi-cloud, widely distributed topologies using diverse technology stacks.
 
@@ -22,17 +26,6 @@ EventMesh(incubating) is a dynamic cloud-native eventing infrastruture used to d
 
 ![architecture2](docs/images/eventmesh-panels.png)
 
-The EventMesh(incubating) allows events from one application to be dynamically routed to any other application.
-General functions of the eventmesh:
-
-* Event driven;
-* Event governance;
-* Event routing;
-* Flow control;
-* Load balance;
-* Pluggable;
-* Cloud native；
-* Gateway
 
 **Support connecting event store:**
 
@@ -41,20 +34,21 @@ General functions of the eventmesh:
 **Components:**
 
 * **eventmesh-runtime** : an middleware to transmit events between event producers and consumers, support cloud native apps and microservices.
-* **eventmesh-sdk-java** : currently supports HTTP and TCP protocols, and will support gRPC in the future.
-* **eventmesh-connector-rocketmq** : an implementation based on OpenMessaging Connector Interface, pub event to or sub event from RocketMQ Event Store.
+* **eventmesh-sdk-java** : currently supports HTTP and TCP protocols.
+* **eventmesh-connector-api** : an api layer based on OpenMessaging api and SPI pluggin, which can be implemented by popular EventStores such as IMDG, Messaging Engine and OSS etc.
+* **eventmesh-connector-rocketmq** : an implementation of eventmesh-connector-api, pub event to or sub event from RocketMQ as EventStore.
 
 **Protocol:**
 
-The protocol of eventmesh is easier and convenient, you can read more [here](docs/en/instructions/eventmesh-runtime-protocol.md)
+The protocol of eventmesh is easier and more convenient, you can read more [here](docs/en/instructions/eventmesh-runtime-protocol.md)
 
 ## RoadMap
 | version | feature |
 | ----    | ----    |
 | v1.0.0  |Support java-sdk , tcp pub/sub, http pub|
 | v1.1.0  |Support RocketMQ as eventstore|
 | v1.1.1  |Support https|
-| v1.2.0  |Support OpenMessaging API，support Plug-in architecture, support http sub, support cloud native deploy|
+| v1.2.0  |Support EventMesh store layer pluggable by OpenMessaging Pub/Sub API, http sub, docker|
 | V1.3.0  |Support CloudEvents, Event Streaming|
 |         |Support Event function,triggers and bindings|
 |         |Support Event orchestration, Servelss workflow|