Skip to content

Commit befe38a

Browse files
Pil0tXiaPil0tXia
committed
Merge branch 'master' into dependabot/gradle/org.redisson-redisson-3.30.0
# Conflicts: # .github/workflows/ci.yml
2 parents 7ab8997 + 498c350 commit befe38a

File tree

462 files changed

+16810
-870
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

462 files changed

+16810
-870
lines changed

‎.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
java-version: 11
5858

5959
- name: GenerateGrammarSource
60-
run: ./gradlew clean generateGrammarSource --parallel --daemon
60+
run: ./gradlew clean generateGrammarSource --parallel --daemon --scan
6161
env:
6262
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
6363

@@ -70,13 +70,13 @@ jobs:
7070
# https://docs.gradle.org/current/userguide/performance.html
7171
- name: Build
7272
run: >
73-
./gradlew clean build dist jacocoTestReport --parallel --daemon
73+
./gradlew clean build dist jacocoTestReport --parallel --daemon --scan
7474
-x spotlessJava -x generateGrammarSource -x generateDistLicense -x checkDeniedLicense
7575
env:
7676
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
7777

7878
- name: Install plugin
79-
run: ./gradlew installPlugin
79+
run: ./gradlew installPlugin --scan
8080
env:
8181
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
8282

‎.github/workflows/code-scanning.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666

6767
- name: Build
6868
if: matrix.language == 'java'
69-
run: ./gradlew clean assemble compileTestJava --parallel --daemon
69+
run: ./gradlew clean assemble compileTestJava --parallel --daemon --scan
7070
env:
7171
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
7272

‎.github/workflows/docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ jobs:
4747
tags: ${{ steps.meta.outputs.tags }}
4848
labels: ${{ steps.meta.outputs.labels }}
4949
file: ./docker/Dockerfile_jdk8
50-
context: ./
50+
context: ./

‎.github/workflows/license.yml

-2
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,3 @@ jobs:
4242

4343
- name: Check license compatibility
4444
run: ./gradlew clean checkDeniedLicense
45-
env:
46-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

‎.idea/icon.png

-14.5 KB
Binary file not shown.

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
### EventMesh Architecture
2929

30-
![EventMesh Architecture](resources/eventmesh-architecture-4.png)
30+
![EventMesh Architecture](resources/eventmesh-architecture-5.png)
3131

32-
### EventMesh Dashboard
32+
### EventMesh K8S deployment
3333

34-
![EventMesh Dashboard](resources/dashboard.png)
34+
![EventMesh Operator](resources/eventmesh-operator.png)
3535

3636
## Features
3737

‎README.zh-CN.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
### EventMesh 架构
2929

30-
![EventMesh Architecture](resources/eventmesh-architecture-4.png)
30+
![EventMesh Architecture](resources/eventmesh-architecture-5.png)
3131

32-
### EventMesh Dashboard
32+
### EventMesh K8S 部署
3333

34-
![EventMesh Dashboard](resources/dashboard.png)
34+
![EventMesh Operator](resources/eventmesh-operator.png)
3535

3636
## 特性
3737

‎build.gradle

+19-11
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ buildscript {
4141
}
4242

4343
dependencies {
44-
classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.14"
44+
classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:5.2.5"
4545
classpath "io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE"
4646
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.13.0"
4747

48-
classpath "org.apache.httpcomponents:httpclient:4.5.13"
48+
classpath "org.apache.httpcomponents:httpclient:4.5.14"
4949
classpath "commons-io:commons-io:2.11.0"
5050
}
5151
}
@@ -95,7 +95,8 @@ allprojects {
9595

9696
checkstyleMain.exclude('**/org/apache/eventmesh/client/grpc/protos**')
9797
.exclude('**/org/apache/eventmesh/common/protocol/grpc/cloudevents**')
98-
.exclude('**/org/apache/eventmesh/common/protocol/grpc/protos/**')
98+
.exclude('**/org/apache/eventmesh/common/protocol/grpc/proto**')
99+
.exclude('**/org/apache/eventmesh/common/protocol/grpc/adminserver/**')
99100
.exclude('**/org/apache/eventmesh/connector/openfunction/client/EventMeshGrpcService**')
100101
.exclude('**/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc**')
101102
.exclude('**/org/apache/eventmesh/connector/jdbc/antlr**')
@@ -405,7 +406,7 @@ tasks.register('checkDeniedLicense') {
405406
"BSD-4-Clause", "BSD-4-Clause-UC", "NPL-1.0", "NPL-1.1", "JSON"
406407
]
407408
// Update exemptions according to https://github.com/apache/eventmesh/issues/4842
408-
def allowedArtifacts = ["amqp-client", "stax-api", "javassist", "ST4", "xsdlib"]
409+
def allowedArtifacts = ["amqp-client", "stax-api", "javassist", "ST4", "xsdlib", "jsqlparser"]
409410

410411
def licenseFile = file('tools/dist-license/LICENSE')
411412
def lines = licenseFile.readLines()
@@ -648,12 +649,12 @@ subprojects {
648649
sign publishing.publications.mavenJava
649650
}
650651

651-
def grpcVersion = '1.50.2'
652+
def grpcVersion = '1.64.0'
652653
def log4jVersion = '2.23.1'
653654
def jacksonVersion = '2.17.1'
654655
def dropwizardMetricsVersion = '4.2.25'
655656
def opentelemetryVersion = '1.36.0'
656-
def cloudeventsVersion = '2.4.2'
657+
def cloudeventsVersion = '2.5.0'
657658
def curatorVersion = '5.6.0'
658659
def mockitoVersion = '3.12.4'
659660

@@ -667,7 +668,7 @@ subprojects {
667668

668669
dependency "commons-validator:commons-validator:1.7"
669670

670-
dependency "com.google.guava:guava:31.0.1-jre"
671+
dependency "com.google.guava:guava:31.1-jre"
671672

672673
dependency "org.slf4j:slf4j-api:2.0.13"
673674
dependency "org.apache.logging.log4j:log4j-api:${log4jVersion}"
@@ -685,7 +686,7 @@ subprojects {
685686
dependency "com.squareup.okhttp3:okhttp:3.14.9"
686687

687688
dependency "org.asynchttpclient:async-http-client:2.12.0"
688-
dependency "org.apache.httpcomponents:httpclient:4.5.13"
689+
dependency "org.apache.httpcomponents:httpclient:4.5.14"
689690

690691
dependency "io.netty:netty-all:4.1.79.Final"
691692

@@ -736,21 +737,28 @@ subprojects {
736737

737738
dependency "org.javassist:javassist:3.30.2-GA"
738739

739-
dependency "com.alibaba.nacos:nacos-client:2.2.3"
740+
dependency "com.alibaba.nacos:nacos-client:2.3.2"
740741

741742
dependency 'org.apache.zookeeper:zookeeper:3.9.2'
742743
dependency "org.apache.curator:curator-client:${curatorVersion}"
743744
dependency "org.apache.curator:curator-framework:${curatorVersion}"
744745
dependency "org.apache.curator:curator-recipes:${curatorVersion}"
745746
dependency "org.apache.curator:curator-test:${curatorVersion}"
746747

747-
dependency "org.projectlombok:lombok:1.18.22"
748+
dependency "org.projectlombok:lombok:1.18.32"
748749
dependency "com.github.seancfoley:ipaddress:5.3.3"
749750
dependency "javax.annotation:javax.annotation-api:1.3.2"
750751
dependency "com.alibaba.fastjson2:fastjson2:2.0.48"
751752

752753
dependency "software.amazon.awssdk:s3:2.25.55"
753754
dependency "com.github.rholder:guava-retrying:2.0.0"
755+
756+
dependency "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.1"
757+
dependency "com.alibaba:druid-spring-boot-starter:1.2.22"
758+
dependency "org.springframework.boot:spring-boot-starter-jetty:2.7.10"
759+
760+
dependency "com.baomidou:mybatis-plus:3.5.6"
761+
dependency "com.mysql:mysql-connector-j:8.0.33"
754762
}
755763
}
756-
}
764+
}

‎eventmesh-admin-server/.gitignore

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
.gradle
2+
build/
3+
!gradle/wrapper/gradle-wrapper.jar
4+
!**/src/main/**/build/
5+
!**/src/test/**/build/
6+
7+
### IntelliJ IDEA ###
8+
.idea/modules.xml
9+
.idea/jarRepositories.xml
10+
.idea/compiler.xml
11+
.idea/libraries/
12+
*.iws
13+
*.iml
14+
*.ipr
15+
out/
16+
!**/src/main/**/out/
17+
!**/src/test/**/out/
18+
19+
### Eclipse ###
20+
.apt_generated
21+
.classpath
22+
.factorypath
23+
.project
24+
.settings
25+
.springBeans
26+
.sts4-cache
27+
bin/
28+
!**/src/main/**/bin/
29+
!**/src/test/**/bin/
30+
31+
### NetBeans ###
32+
/nbproject/private/
33+
/nbbuild/
34+
/dist/
35+
/nbdist/
36+
/.nb-gradle/
37+
38+
### VS Code ###
39+
.vscode/
40+
41+
### Mac OS ###
42+
.DS_Store

‎eventmesh-admin-server/build.gradle

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
dependencies {
19+
implementation project(":eventmesh-spi")
20+
implementation project(":eventmesh-common")
21+
implementation project(":eventmesh-registry:eventmesh-registry-api")
22+
implementation project(":eventmesh-registry:eventmesh-registry-nacos")
23+
implementation project(':eventmesh-openconnect:eventmesh-openconnect-offsetmgmt-plugin:eventmesh-openconnect-offsetmgmt-api')
24+
implementation "com.alibaba.nacos:nacos-client"
25+
implementation ("org.springframework.boot:spring-boot-starter-web") {
26+
exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
27+
}
28+
implementation 'org.springframework.boot:spring-boot-starter-jetty'
29+
implementation "io.grpc:grpc-core"
30+
implementation "io.grpc:grpc-protobuf"
31+
implementation "io.grpc:grpc-stub"
32+
implementation "io.grpc:grpc-netty-shaded"
33+
34+
// https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter
35+
implementation group: 'com.baomidou', name: 'mybatis-plus-boot-starter', version: '3.5.5'
36+
implementation "org.reflections:reflections:0.10.2"
37+
38+
// https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter
39+
implementation "com.alibaba:druid-spring-boot-starter"
40+
compileOnly 'com.mysql:mysql-connector-j'
41+
compileOnly 'org.projectlombok:lombok'
42+
annotationProcessor 'org.projectlombok:lombok'
43+
}
44+
45+
configurations.implementation {
46+
exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
47+
}
48+

‎eventmesh-admin-server/gradle.properties

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#

‎eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/Admin.java

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.eventmesh.admin.server;
19+
20+
import org.apache.eventmesh.common.remote.Task;
21+
import org.apache.eventmesh.common.remote.request.ReportHeartBeatRequest;
22+
import org.apache.eventmesh.common.utils.PagedList;
23+
24+
/**
25+
* Admin
26+
*/
27+
public interface Admin extends ComponentLifeCycle {
28+
29+
/**
30+
* support for web or ops
31+
**/
32+
boolean createOrUpdateTask(Task task);
33+
34+
boolean deleteTask(Long id);
35+
36+
Task getTask(Long id);
37+
38+
// paged list
39+
PagedList<Task> getTaskPaged(Task task);
40+
41+
/**
42+
* support for task
43+
*/
44+
void reportHeartbeat(ReportHeartBeatRequest heartBeat);
45+
}

0 commit comments

Comments
 (0)