Merge pull request #668 from apache/revert-667-master

Revert "merge 1.3.0-release branch to master after rebase "
apache · Dec 28, 2021 · 22991ca · 22991ca
2 parents 38446b3 + 9c2a2fc
commit 22991ca
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 96 deletions.
diff --git a/README.md b/README.md
@@ -5,19 +5,27 @@
 [![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)
-[![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-yx3n2ak7-HcVG98CDqb~7PwgoDzgfMA)
 
 [点我查看中文版](README.zh-CN.md)
 
 ![logo](docs/images/logo2.png)
 ## What is EventMesh?
-EventMesh(incubating) is a dynamic event-driven application runtime 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.
+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.
 
 ![architecture1](docs/images/eventmesh-multi-runtime.png)
 
+**EventMesh Ecosystem:**
+
+![architecture1](docs/images/eventmesh-define.png)
+
 **EventMesh Architecture:**
 
-![architecture1](docs/images/eventmesh-runtime2.png)
+![architecture1](docs/images/eventmesh-runtime.png)
+
+**EventMesh Cloud Native:**
+
+![architecture2](docs/images/eventmesh-panels.png)
+
 
 **Components:**
 
@@ -29,11 +37,9 @@ EventMesh(incubating) is a dynamic event-driven application runtime used to deco
 * **eventmesh-connector-rocketmq** : an implementation of eventmesh-connector-api, pub event to or sub event from RocketMQ as EventStore.
 * **eventmesh-connector-kafka(WIP)** : an implementation of eventmesh-connector-api, pub event to or sub event from Kafka as EventStore.
 * **eventmesh-connector-redis(WIP)** : an implementation of eventmesh-connector-api, pub event to or sub event from Redis as EventStore.
-* **eventmesh-connector-defibus(WIP)** : an implementation of eventmesh-connector-api, pub event to or sub event from [DeFiBus](https://github.com/webankfintech/defibus) as EventStore
 * **eventmesh-admin** : clients,topics,subscriptions and other management.
-* **eventmesh-registry-plugin** : plugins for registry adapter.
-* **eventmesh-security-plugin** : plugins for security adpater.
-* **eventmesh-protocol-plugin** : plugins for protocol adapter.
+* **eventmesh-registry-plugin** : plugins for registry.
+* **eventmesh-security-plugin** : plugins for security.
 
 **Protocol:**
 
@@ -48,10 +54,9 @@ Event & Service
 - [ ] Event transaction
 - [ ] At-least-once/at-most-once delivery guarantees
 
-Store Connector
+Store
 - [x] RocketMQ
 - [x] InMemory
-- [ ] Federated
 - [ ] Kafka
 - [ ] Redis
 - [ ] Pulsar
@@ -65,8 +70,6 @@ Protocol
 - [ ] gRPC
 - [ ] CloudEvents
 - [ ] MQTT
-- [ ] WebSocket
-- [ ] AMQP
 - [ ] AsyncAPI
 
 SDK
@@ -104,13 +107,11 @@ Security
 - [ ] Auth
 - [ ] ACL
 
-Runtime
-- [ ] WebAssembly runtime
 
 ## Quick Start
-1. [Store quickstart](docs/en/instructions/eventmesh-store-quickstart.md)
+1. [Event-store](https://rocketmq.apache.org/docs/quick-start/) (RocketMQ, ignore this step if use standalone).
 2. [Runtime quickstart](docs/en/instructions/eventmesh-runtime-quickstart.md) or [Runtime quickstart with docker](docs/en/instructions/eventmesh-runtime-quickstart-with-docker.md).
-3. [Java SDK examples](docs/en/instructions/eventmesh-sdk-java-quickstart.md).
+3. [Java examples ](docs/en/instructions/eventmesh-sdk-java-quickstart.md).
 
 ## Contributing
 Contributions are always welcomed! Please see [CONTRIBUTING](CONTRIBUTING.md) for detailed guidelines.
@@ -130,9 +131,13 @@ EventMesh enriches the <a href="https://landscape.cncf.io/serverless?license=apa
 [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) Copyright (C) Apache Software Foundation.
 
 ## Community
-|              WeChat Assistant                           |                WeChat public account                   | Slack                                                  |
-| :----------------------------------------------------:  | :----------------------------------------------------: | :----------------------------------------------------: |
-| ![wechat_qr](docs/images/mesh-helper.jpg) | ![wechat_official_qr](docs/images/wechat-official.png) |[Join slack chat](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-yx3n2ak7-HcVG98CDqb~7PwgoDzgfMA) |
+|                       WeChat group：                       |                   WeChat official account:                   |
+| :--------------------------------------------------------: | :----------------------------------------------------------: |
+| <img src="docs/images/mesh-helper.png" alt="wechat_qr"  /> | <img src="docs/images/wechat-official.jpg" alt="wechat_official_qr" style="zoom: 67%;" /> |
+
+WeChat official account
+
+![wechat_official_qr](docs/images/wechat-official.jpg)
 
 Mailing Lists:
 

diff --git a/eventmesh-common/gradle.properties b/eventmesh-common/gradle.properties
@@ -14,3 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+group=org.apache.eventmesh
+version=1.2.0-release
+jdk=1.8
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/SubscriptionType.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/SubscriptionType.java
diff --git a/eventmesh-connector-plugin/eventmesh-connector-api/gradle.properties b/eventmesh-connector-plugin/eventmesh-connector-api/gradle.properties
@@ -13,4 +13,9 @@
 # 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.
-#
+#
+group=org.apache.eventmesh
+version=1.2.0-release
+jdk=1.8
+mavenUserName=
+mavenPassword=
diff --git a/eventmesh-connector-plugin/eventmesh-connector-rocketmq/gradle.properties b/eventmesh-connector-plugin/eventmesh-connector-rocketmq/gradle.properties
@@ -12,9 +12,9 @@
 # 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.
-#
 
+group=org.apache.eventmesh
+version=1.2.0-release
 rocketmq_version=4.7.1
-
-pluginType=connector
-pluginName=rocketmq
+mavenUserName=
+mavenPassword=
diff --git a/eventmesh-examples/gradle.properties b/eventmesh-examples/gradle.properties
@@ -14,3 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+group=org.apache.eventmesh
+version=1.2.0-release
+mavenUserName=
+mavenPassword=
diff --git a/eventmesh-runtime/gradle.properties b/eventmesh-runtime/gradle.properties
@@ -14,3 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+group=org.apache.eventmesh
+version=1.2.0-release
+mavenUserName=
+mavenPassword=
diff --git a/eventmesh-sdk-java/gradle.properties b/eventmesh-sdk-java/gradle.properties
@@ -14,3 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+group=org.apache.eventmesh
+version=1.2.0-release
+jdk=1.8
+snapshot=false
diff --git a/eventmesh-starter/gradle.properties b/eventmesh-starter/gradle.properties
@@ -14,3 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+group=org.apache.eventmesh
+version=1.2.0-release
+mavenUserName=
+mavenPassword=
diff --git a/gradle.properties b/gradle.properties
@@ -18,7 +18,7 @@
 jdk=1.8
 snapshot=false
 group=org.apache.eventmesh
-version=1.3.0-release
+version=1.2.0-release
 #last eight bits of public key
 signing.keyId=
 #passphrase for key pairs

diff --git a/gradlew b/gradlew
@@ -1,21 +1,19 @@
 #!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
 #
-# 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
+# Licensed 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
+#      https://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.
+# 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.
 #
 
 ##############################################################################

diff --git a/gradlew.bat b/gradlew.bat
@@ -1,20 +1,17 @@
 @rem
-@rem Licensed to the Apache Software Foundation (ASF) under one
-@rem or more contributor license agreements.  See the NOTICE file
-@rem distributed with this work for additional information
-@rem regarding copyright ownership.  The ASF licenses this file
-@rem to you under the Apache License, Version 2.0 (the
-@rem "License"); you may not use this file except in compliance
-@rem with the License.  You may obtain a copy of the License at
+@rem Copyright 2015 the original author or authors.
 @rem
-@rem   http://www.apache.org/licenses/LICENSE-2.0
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
 @rem
-@rem Unless required by applicable law or agreed to in writing,
-@rem software distributed under the License is distributed on an
-@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@rem KIND, either express or implied.  See the License for the
-@rem specific language governing permissions and limitations
-@rem under the License.
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
 @rem
 
 @if "%DEBUG%" == "" @echo off

diff --git a/settings.gradle b/settings.gradle
@@ -29,7 +29,9 @@ include 'eventmesh-connector-plugin:eventmesh-connector-standalone'
 include 'eventmesh-security-plugin:eventmesh-security-api'
 include 'eventmesh-security-plugin:eventmesh-security-acl'
 include 'eventmesh-registry-plugin:eventmesh-registry-api'
-include 'eventmesh-admin'
+include 'eventmesh-registry-plugin:eventmesh-registry-namesrv'
+include 'eventmesh-schema-registry'
+include 'eventmesh-schema-registry:eventmesh-schema-registry-server'
 include 'eventmesh-protocol-plugin'
 include 'eventmesh-protocol-plugin:eventmesh-protocol-api'
 include 'eventmesh-protocol-plugin:eventmesh-protocol-openmessage'