Merge branch 'master' into dependabot/gradle/org.redisson-redisson-3.30.0

# Conflicts:
#	.github/workflows/ci.yml

Author: Pil0tXia

.github/workflows/ci.yml

@@ -57,7 +57,7 @@ jobs:
           java-version: 11
 
       - name: GenerateGrammarSource
-        run: ./gradlew clean generateGrammarSource --parallel --daemon
+        run: ./gradlew clean generateGrammarSource --parallel --daemon --scan
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
@@ -70,13 +70,13 @@ jobs:
       # https://docs.gradle.org/current/userguide/performance.html
       - name: Build
         run: >
-          ./gradlew clean build dist jacocoTestReport --parallel --daemon
+          ./gradlew clean build dist jacocoTestReport --parallel --daemon --scan
           -x spotlessJava -x generateGrammarSource -x generateDistLicense -x checkDeniedLicense
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Install plugin
-        run: ./gradlew installPlugin
+        run: ./gradlew installPlugin --scan
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 

.github/workflows/code-scanning.yml

@@ -66,7 +66,7 @@ jobs:
 
       - name: Build
         if: matrix.language == 'java'
-        run: ./gradlew clean assemble compileTestJava --parallel --daemon
+        run: ./gradlew clean assemble compileTestJava --parallel --daemon --scan
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 

.github/workflows/docker.yml

@@ -47,4 +47,4 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           file: ./docker/Dockerfile_jdk8
-          context: ./
+          context: ./

.github/workflows/license.yml

@@ -42,5 +42,3 @@ jobs:
 
       - name: Check license compatibility
         run: ./gradlew clean checkDeniedLicense
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

.idea/icon.png

@@ -27,11 +27,11 @@
 
 ### EventMesh Architecture
 
-![EventMesh Architecture](resources/eventmesh-architecture-4.png)
+![EventMesh Architecture](resources/eventmesh-architecture-5.png)
 
-### EventMesh Dashboard
+### EventMesh K8S deployment
 
-![EventMesh Dashboard](resources/dashboard.png)
+![EventMesh Operator](resources/eventmesh-operator.png)
 
 ## Features
 

README.md

@@ -27,11 +27,11 @@
 
 ### EventMesh 架构
 
-![EventMesh Architecture](resources/eventmesh-architecture-4.png)
+![EventMesh Architecture](resources/eventmesh-architecture-5.png)
 
-### EventMesh Dashboard
+### EventMesh K8S 部署
 
-![EventMesh Dashboard](resources/dashboard.png)
+![EventMesh Operator](resources/eventmesh-operator.png)
 
 ## 特性
 

README.zh-CN.md

@@ -41,11 +41,11 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.14"
+        classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:5.2.5"
         classpath "io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:6.13.0"
 
-        classpath "org.apache.httpcomponents:httpclient:4.5.13"
+        classpath "org.apache.httpcomponents:httpclient:4.5.14"
         classpath "commons-io:commons-io:2.11.0"
     }
 }
@@ -95,7 +95,8 @@ allprojects {
 
     checkstyleMain.exclude('**/org/apache/eventmesh/client/grpc/protos**')
             .exclude('**/org/apache/eventmesh/common/protocol/grpc/cloudevents**')
-            .exclude('**/org/apache/eventmesh/common/protocol/grpc/protos/**')
+            .exclude('**/org/apache/eventmesh/common/protocol/grpc/proto**')
+            .exclude('**/org/apache/eventmesh/common/protocol/grpc/adminserver/**')
             .exclude('**/org/apache/eventmesh/connector/openfunction/client/EventMeshGrpcService**')
             .exclude('**/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc**')
             .exclude('**/org/apache/eventmesh/connector/jdbc/antlr**')
@@ -405,7 +406,7 @@ tasks.register('checkDeniedLicense') {
                 "BSD-4-Clause", "BSD-4-Clause-UC", "NPL-1.0", "NPL-1.1", "JSON"
         ]
         // Update exemptions according to https://github.com/apache/eventmesh/issues/4842
-        def allowedArtifacts = ["amqp-client", "stax-api", "javassist", "ST4", "xsdlib"]
+        def allowedArtifacts = ["amqp-client", "stax-api", "javassist", "ST4", "xsdlib", "jsqlparser"]
 
         def licenseFile = file('tools/dist-license/LICENSE')
         def lines = licenseFile.readLines()
@@ -648,12 +649,12 @@ subprojects {
         sign publishing.publications.mavenJava
     }
 
-    def grpcVersion = '1.50.2'
+    def grpcVersion = '1.64.0'
     def log4jVersion = '2.23.1'
     def jacksonVersion = '2.17.1'
     def dropwizardMetricsVersion = '4.2.25'
     def opentelemetryVersion = '1.36.0'
-    def cloudeventsVersion = '2.4.2'
+    def cloudeventsVersion = '2.5.0'
     def curatorVersion = '5.6.0'
     def mockitoVersion = '3.12.4'
 
@@ -667,7 +668,7 @@ subprojects {
 
             dependency "commons-validator:commons-validator:1.7"
 
-            dependency "com.google.guava:guava:31.0.1-jre"
+            dependency "com.google.guava:guava:31.1-jre"
 
             dependency "org.slf4j:slf4j-api:2.0.13"
             dependency "org.apache.logging.log4j:log4j-api:${log4jVersion}"
@@ -685,7 +686,7 @@ subprojects {
             dependency "com.squareup.okhttp3:okhttp:3.14.9"
 
             dependency "org.asynchttpclient:async-http-client:2.12.0"
-            dependency "org.apache.httpcomponents:httpclient:4.5.13"
+            dependency "org.apache.httpcomponents:httpclient:4.5.14"
 
             dependency "io.netty:netty-all:4.1.79.Final"
 
@@ -736,21 +737,28 @@ subprojects {
 
             dependency "org.javassist:javassist:3.30.2-GA"
 
-            dependency "com.alibaba.nacos:nacos-client:2.2.3"
+            dependency "com.alibaba.nacos:nacos-client:2.3.2"
 
             dependency 'org.apache.zookeeper:zookeeper:3.9.2'
             dependency "org.apache.curator:curator-client:${curatorVersion}"
             dependency "org.apache.curator:curator-framework:${curatorVersion}"
             dependency "org.apache.curator:curator-recipes:${curatorVersion}"
             dependency "org.apache.curator:curator-test:${curatorVersion}"
 
-            dependency "org.projectlombok:lombok:1.18.22"
+            dependency "org.projectlombok:lombok:1.18.32"
             dependency "com.github.seancfoley:ipaddress:5.3.3"
             dependency "javax.annotation:javax.annotation-api:1.3.2"
             dependency "com.alibaba.fastjson2:fastjson2:2.0.48"
 
             dependency "software.amazon.awssdk:s3:2.25.55"
             dependency "com.github.rholder:guava-retrying:2.0.0"
+
+            dependency "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.1"
+            dependency "com.alibaba:druid-spring-boot-starter:1.2.22"
+            dependency "org.springframework.boot:spring-boot-starter-jetty:2.7.10"
+
+            dependency "com.baomidou:mybatis-plus:3.5.6"
+            dependency "com.mysql:mysql-connector-j:8.0.33"
         }
     }
-}
+}

build.gradle

@@ -0,0 +1,42 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

eventmesh-admin-server/.gitignore

@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+dependencies {
+	implementation project(":eventmesh-spi")
+	implementation project(":eventmesh-common")
+	implementation project(":eventmesh-registry:eventmesh-registry-api")
+	implementation project(":eventmesh-registry:eventmesh-registry-nacos")
+	implementation project(':eventmesh-openconnect:eventmesh-openconnect-offsetmgmt-plugin:eventmesh-openconnect-offsetmgmt-api')
+	implementation "com.alibaba.nacos:nacos-client"
+	implementation ("org.springframework.boot:spring-boot-starter-web") {
+		exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
+	}
+	implementation 'org.springframework.boot:spring-boot-starter-jetty'
+	implementation "io.grpc:grpc-core"
+	implementation "io.grpc:grpc-protobuf"
+	implementation "io.grpc:grpc-stub"
+	implementation "io.grpc:grpc-netty-shaded"
+
+	// https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter
+	implementation group: 'com.baomidou', name: 'mybatis-plus-boot-starter', version: '3.5.5'
+	implementation "org.reflections:reflections:0.10.2"
+
+	// https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter
+	implementation "com.alibaba:druid-spring-boot-starter"
+	compileOnly 'com.mysql:mysql-connector-j'
+	compileOnly 'org.projectlombok:lombok'
+	annotationProcessor 'org.projectlombok:lombok'
+}
+
+configurations.implementation  {
+	exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+}
+