From 37b4ae2ff60651f00195aaf1467c3ccd0d22ecc7 Mon Sep 17 00:00:00 2001 From: risk <399284508@qq.com> Date: Sun, 9 Jun 2024 22:51:19 +0800 Subject: [PATCH 01/11] improve grpc version manage --- eventmesh-common/build.gradle | 6 +++--- eventmesh-examples/build.gradle | 9 ++++----- eventmesh-meta/eventmesh-meta-raft/build.gradle | 7 +++---- .../eventmesh-protocol-grpc/build.gradle | 8 ++++---- eventmesh-sdks/eventmesh-sdk-java/build.gradle | 13 ++++++------- 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/eventmesh-common/build.gradle b/eventmesh-common/build.gradle index 07068fe4c1..fed358cc15 100644 --- a/eventmesh-common/build.gradle +++ b/eventmesh-common/build.gradle @@ -15,7 +15,7 @@ * limitations under the License. */ -def grpcVersion = '1.64.0' + dependencies { api "com.google.guava:guava" @@ -49,8 +49,8 @@ dependencies { implementation "io.netty:netty-all" - implementation "io.grpc:grpc-protobuf:${grpcVersion}" - implementation "io.grpc:grpc-stub:${grpcVersion}" + implementation "io.grpc:grpc-protobuf" + implementation "io.grpc:grpc-stub" implementation "javax.annotation:javax.annotation-api:1.3.2" testImplementation "org.junit-pioneer:junit-pioneer" diff --git a/eventmesh-examples/build.gradle b/eventmesh-examples/build.gradle index f732a78439..1045fb06e8 100644 --- a/eventmesh-examples/build.gradle +++ b/eventmesh-examples/build.gradle @@ -15,7 +15,6 @@ * limitations under the License. */ -def grpcVersion = '1.64.0' dependencies { implementation project(":eventmesh-sdks:eventmesh-sdk-java") @@ -31,10 +30,10 @@ dependencies { implementation "io.openmessaging:openmessaging-api" implementation 'com.alibaba.nacos:nacos-client' - implementation "io.grpc:grpc-protobuf:${grpcVersion}" - implementation "io.grpc:grpc-stub:${grpcVersion}" - implementation "io.grpc:grpc-netty:${grpcVersion}" - implementation "io.grpc:grpc-netty-shaded:${grpcVersion}" + implementation "io.grpc:grpc-protobuf" + implementation "io.grpc:grpc-stub" + implementation "io.grpc:grpc-netty" + implementation "io.grpc:grpc-netty-shaded" compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/eventmesh-meta/eventmesh-meta-raft/build.gradle b/eventmesh-meta/eventmesh-meta-raft/build.gradle index e3fb2f6bf9..d995470643 100644 --- a/eventmesh-meta/eventmesh-meta-raft/build.gradle +++ b/eventmesh-meta/eventmesh-meta-raft/build.gradle @@ -19,18 +19,17 @@ plugins { id 'com.google.protobuf' version '0.9.4' } -def grpcVersion = '1.64.0' def protobufVersion = '3.25.3' def protocVersion = protobufVersion def jraftVersion = '1.3.14' dependencies { - implementation ("io.grpc:grpc-protobuf:${grpcVersion}") { + implementation ("io.grpc:grpc-protobuf") { exclude group: "com.google.protobuf", module: "protobuf-java" } implementation("com.google.protobuf:protobuf-java:${protobufVersion}") - implementation "io.grpc:grpc-stub:${grpcVersion}" + implementation "io.grpc:grpc-stub" implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}" implementation "javax.annotation:javax.annotation-api:1.3.2" compileOnly 'org.projectlombok:lombok' @@ -46,7 +45,7 @@ dependencies { protobuf { protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" } plugins { - grpc { artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" } + grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.64.0" } } generateProtoTasks { all()*.plugins { diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle index 191e62cdac..5bdef1bc22 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle +++ b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle @@ -24,16 +24,16 @@ repositories { mavenCentral() } -def grpcVersion = '1.64.0' + def protobufVersion = '3.25.3' def protocVersion = protobufVersion dependencies { - implementation ("io.grpc:grpc-protobuf:${grpcVersion}") { + implementation ("io.grpc:grpc-protobuf") { exclude group: "com.google.protobuf", module: "protobuf-java" } implementation("com.google.protobuf:protobuf-java:${protobufVersion}") - implementation "io.grpc:grpc-stub:${grpcVersion}" + implementation "io.grpc:grpc-stub" implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}" implementation "javax.annotation:javax.annotation-api:1.3.2" testImplementation 'org.junit.jupiter:junit-jupiter' @@ -42,7 +42,7 @@ dependencies { protobuf { protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" } plugins { - grpc { artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" } + grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.64.0" } } generateProtoTasks { all()*.plugins { diff --git a/eventmesh-sdks/eventmesh-sdk-java/build.gradle b/eventmesh-sdks/eventmesh-sdk-java/build.gradle index 46e6d8d658..011f5110ac 100644 --- a/eventmesh-sdks/eventmesh-sdk-java/build.gradle +++ b/eventmesh-sdks/eventmesh-sdk-java/build.gradle @@ -15,7 +15,6 @@ * limitations under the License. */ -def grpcVersion = '1.64.0' dependencies { api(project(":eventmesh-common")) { @@ -32,10 +31,10 @@ dependencies { implementation "io.netty:netty-all" implementation "org.apache.httpcomponents:httpclient" - implementation "io.grpc:grpc-protobuf:${grpcVersion}" - implementation "io.grpc:grpc-stub:${grpcVersion}" - implementation "io.grpc:grpc-netty:${grpcVersion}" - implementation "io.grpc:grpc-netty-shaded:${grpcVersion}" + implementation "io.grpc:grpc-protobuf" + implementation "io.grpc:grpc-stub" + implementation "io.grpc:grpc-netty" + implementation "io.grpc:grpc-netty-shaded" implementation "io.cloudevents:cloudevents-protobuf" // protocol @@ -52,8 +51,8 @@ dependencies { testImplementation "io.netty:netty-all" testImplementation "org.apache.httpcomponents:httpclient" - implementation "io.grpc:grpc-protobuf:${grpcVersion}" - implementation "io.grpc:grpc-stub:${grpcVersion}" + implementation "io.grpc:grpc-protobuf" + implementation "io.grpc:grpc-stub" implementation "com.google.protobuf:protobuf-java-util:3.25.3" compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' From 9b713885a33bcbdb405cc5e7acaf9c444761fd35 Mon Sep 17 00:00:00 2001 From: pmupkin <399284508@qq.com> Date: Mon, 10 Jun 2024 21:52:53 +0800 Subject: [PATCH 02/11] delete submodule grpc version --- .../eventmesh/common/protocol/catalog/protos/CatalogGrpc.java | 2 +- .../common/protocol/grpc/adminserver/AdminServiceGrpc.java | 2 +- .../common/protocol/grpc/cloudevents/ConsumerServiceGrpc.java | 2 +- .../common/protocol/grpc/cloudevents/HeartbeatServiceGrpc.java | 2 +- .../common/protocol/grpc/cloudevents/PublisherServiceGrpc.java | 2 +- .../eventmesh/common/protocol/workflow/protos/WorkflowGrpc.java | 2 +- .../connector/openfunction/client/CallbackServiceGrpc.java | 2 +- .../eventmesh-protocol-cloudevents/build.gradle | 2 +- eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle | 2 +- eventmesh-protocol-plugin/eventmesh-protocol-http/build.gradle | 2 +- .../eventmesh-protocol-meshmessage/build.gradle | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/catalog/protos/CatalogGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/catalog/protos/CatalogGrpc.java index a176da4685..bfbcb90722 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/catalog/protos/CatalogGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/catalog/protos/CatalogGrpc.java @@ -23,7 +23,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.49.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.64.0)", comments = "Source: catalog.proto") @io.grpc.stub.annotations.GrpcGenerated @SuppressWarnings({"all"}) diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/adminserver/AdminServiceGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/adminserver/AdminServiceGrpc.java index df5f3ef338..191152de75 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/adminserver/AdminServiceGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/adminserver/AdminServiceGrpc.java @@ -23,7 +23,7 @@ * AdminServiceGrpc */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.40.0)", + value = "by gRPC proto compiler (version 1.64.0)", comments = "Source: event_mesh_admin_service.proto") @io.grpc.stub.annotations.GrpcGenerated public final class AdminServiceGrpc { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/ConsumerServiceGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/ConsumerServiceGrpc.java index d3f25f558e..677acaa6c3 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/ConsumerServiceGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/ConsumerServiceGrpc.java @@ -22,7 +22,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.43.2)", + value = "by gRPC proto compiler (version 1.64.0)", comments = "Source: eventmesh-service.proto") @io.grpc.stub.annotations.GrpcGenerated public final class ConsumerServiceGrpc { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/HeartbeatServiceGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/HeartbeatServiceGrpc.java index 0b347e58c6..8f6d122a14 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/HeartbeatServiceGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/HeartbeatServiceGrpc.java @@ -22,7 +22,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.43.2)", + value = "by gRPC proto compiler (version 1.64.0)", comments = "Source: eventmesh-service.proto") @io.grpc.stub.annotations.GrpcGenerated public final class HeartbeatServiceGrpc { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/PublisherServiceGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/PublisherServiceGrpc.java index 2796402037..3bc55eab41 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/PublisherServiceGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/PublisherServiceGrpc.java @@ -22,7 +22,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.43.2)", + value = "by gRPC proto compiler (version 1.64.0)", comments = "Source: eventmesh-service.proto") @io.grpc.stub.annotations.GrpcGenerated public final class PublisherServiceGrpc { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/workflow/protos/WorkflowGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/workflow/protos/WorkflowGrpc.java index c7bbffb074..bd11614b11 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/workflow/protos/WorkflowGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/workflow/protos/WorkflowGrpc.java @@ -22,7 +22,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.49.1-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.64.0)", comments = "Source: workflow.proto") @io.grpc.stub.annotations.GrpcGenerated @SuppressWarnings({"all"}) diff --git a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc.java b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc.java index ddb2e650c2..2b295dd353 100644 --- a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc.java +++ b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc.java @@ -30,7 +30,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.4.0)", + value = "by gRPC proto compiler (version 1.64.0)", comments = "Source: callback-service.proto") @io.grpc.stub.annotations.GrpcGenerated public final class CallbackServiceGrpc { diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/build.gradle b/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/build.gradle index e7d631f47e..e063b53432 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/build.gradle +++ b/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation "io.cloudevents:cloudevents-core" implementation "com.google.guava:guava" implementation "io.cloudevents:cloudevents-json-jackson" - implementation ("io.grpc:grpc-protobuf:1.64.0") { + implementation ("io.grpc:grpc-protobuf") { exclude group: "com.google.protobuf", module: "protobuf-java" } implementation("com.google.protobuf:protobuf-java:3.25.3") diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle index 5bdef1bc22..35617168be 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle +++ b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle @@ -42,7 +42,7 @@ dependencies { protobuf { protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" } plugins { - grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.64.0" } + grpc { artifact = "io.grpc:protoc-gen-grpc-java" } } generateProtoTasks { all()*.plugins { diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-http/build.gradle b/eventmesh-protocol-plugin/eventmesh-protocol-http/build.gradle index 1d877a904d..48583dff30 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-http/build.gradle +++ b/eventmesh-protocol-plugin/eventmesh-protocol-http/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation "io.cloudevents:cloudevents-core" implementation "com.google.guava:guava" implementation "io.cloudevents:cloudevents-json-jackson" - implementation ("io.grpc:grpc-protobuf:1.64.0") { + implementation ("io.grpc:grpc-protobuf") { exclude group: "com.google.protobuf", module: "protobuf-java" } implementation("com.google.protobuf:protobuf-java:3.25.3") diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/build.gradle b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/build.gradle index 3f6d6ebdb0..7b51ba9989 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/build.gradle +++ b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation project(":eventmesh-protocol-plugin:eventmesh-protocol-api") implementation "io.cloudevents:cloudevents-core" - implementation ("io.grpc:grpc-protobuf:1.64.0") { + implementation ("io.grpc:grpc-protobuf") { exclude group: "com.google.protobuf", module: "protobuf-java" } implementation("com.google.protobuf:protobuf-java:3.25.3") From b2c3de9d687ecfaa52b3edbfe1edd8ae1f45e90d Mon Sep 17 00:00:00 2001 From: pmupkin <399284508@qq.com> Date: Mon, 10 Jun 2024 22:05:00 +0800 Subject: [PATCH 03/11] resolve ci/cd --- eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle index 35617168be..5bdef1bc22 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle +++ b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle @@ -42,7 +42,7 @@ dependencies { protobuf { protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" } plugins { - grpc { artifact = "io.grpc:protoc-gen-grpc-java" } + grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.64.0" } } generateProtoTasks { all()*.plugins { From f2bf72cc052e5ff07d7736d3da3bb3d518b199a9 Mon Sep 17 00:00:00 2001 From: pmupkin <399284508@qq.com> Date: Tue, 11 Jun 2024 22:23:04 +0800 Subject: [PATCH 04/11] adjust submodule version --- build.gradle | 1 + eventmesh-meta/eventmesh-meta-raft/build.gradle | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 00618febf1..90edbd3a0a 100644 --- a/build.gradle +++ b/build.gradle @@ -727,6 +727,7 @@ subprojects { dependency "io.grpc:grpc-stub:${grpcVersion}" dependency "io.grpc:grpc-netty:${grpcVersion}" dependency "io.grpc:grpc-netty-shaded:${grpcVersion}" + dependency "io.grpc:protoc-gen-grpc-java:${grpcVersion}" dependency "javax.annotation:javax.annotation-api:1.3.2" diff --git a/eventmesh-meta/eventmesh-meta-raft/build.gradle b/eventmesh-meta/eventmesh-meta-raft/build.gradle index d995470643..dccac1a5e6 100644 --- a/eventmesh-meta/eventmesh-meta-raft/build.gradle +++ b/eventmesh-meta/eventmesh-meta-raft/build.gradle @@ -45,7 +45,7 @@ dependencies { protobuf { protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" } plugins { - grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.64.0" } + grpc { artifact = "io.grpc:protoc-gen-grpc-java" } } generateProtoTasks { all()*.plugins { From eab4d7e1a164f60404da97e31b47162c8f9e577c Mon Sep 17 00:00:00 2001 From: pmupkin <399284508@qq.com> Date: Tue, 11 Jun 2024 22:48:03 +0800 Subject: [PATCH 05/11] adjust submodule version --- eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle index 5bdef1bc22..35617168be 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle +++ b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle @@ -42,7 +42,7 @@ dependencies { protobuf { protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" } plugins { - grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.64.0" } + grpc { artifact = "io.grpc:protoc-gen-grpc-java" } } generateProtoTasks { all()*.plugins { From cd14fbc9ec6bb84116d3d8e9e6c0fe08f79d49a4 Mon Sep 17 00:00:00 2001 From: pmupkin <399284508@qq.com> Date: Tue, 11 Jun 2024 23:01:52 +0800 Subject: [PATCH 06/11] adjust submodule version --- .../eventmesh/common/protocol/catalog/protos/CatalogGrpc.java | 2 +- .../common/protocol/grpc/adminserver/AdminServiceGrpc.java | 2 +- .../common/protocol/grpc/cloudevents/ConsumerServiceGrpc.java | 2 +- .../common/protocol/grpc/cloudevents/HeartbeatServiceGrpc.java | 2 +- .../common/protocol/grpc/cloudevents/PublisherServiceGrpc.java | 2 +- .../eventmesh/common/protocol/workflow/protos/WorkflowGrpc.java | 2 +- .../connector/openfunction/client/CallbackServiceGrpc.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/catalog/protos/CatalogGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/catalog/protos/CatalogGrpc.java index bfbcb90722..a176da4685 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/catalog/protos/CatalogGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/catalog/protos/CatalogGrpc.java @@ -23,7 +23,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.64.0)", + value = "by gRPC proto compiler (version 1.49.1-SNAPSHOT)", comments = "Source: catalog.proto") @io.grpc.stub.annotations.GrpcGenerated @SuppressWarnings({"all"}) diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/adminserver/AdminServiceGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/adminserver/AdminServiceGrpc.java index 191152de75..df5f3ef338 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/adminserver/AdminServiceGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/adminserver/AdminServiceGrpc.java @@ -23,7 +23,7 @@ * AdminServiceGrpc */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.64.0)", + value = "by gRPC proto compiler (version 1.40.0)", comments = "Source: event_mesh_admin_service.proto") @io.grpc.stub.annotations.GrpcGenerated public final class AdminServiceGrpc { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/ConsumerServiceGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/ConsumerServiceGrpc.java index 677acaa6c3..d3f25f558e 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/ConsumerServiceGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/ConsumerServiceGrpc.java @@ -22,7 +22,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.64.0)", + value = "by gRPC proto compiler (version 1.43.2)", comments = "Source: eventmesh-service.proto") @io.grpc.stub.annotations.GrpcGenerated public final class ConsumerServiceGrpc { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/HeartbeatServiceGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/HeartbeatServiceGrpc.java index 8f6d122a14..0b347e58c6 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/HeartbeatServiceGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/HeartbeatServiceGrpc.java @@ -22,7 +22,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.64.0)", + value = "by gRPC proto compiler (version 1.43.2)", comments = "Source: eventmesh-service.proto") @io.grpc.stub.annotations.GrpcGenerated public final class HeartbeatServiceGrpc { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/PublisherServiceGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/PublisherServiceGrpc.java index 3bc55eab41..2796402037 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/PublisherServiceGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/cloudevents/PublisherServiceGrpc.java @@ -22,7 +22,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.64.0)", + value = "by gRPC proto compiler (version 1.43.2)", comments = "Source: eventmesh-service.proto") @io.grpc.stub.annotations.GrpcGenerated public final class PublisherServiceGrpc { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/workflow/protos/WorkflowGrpc.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/workflow/protos/WorkflowGrpc.java index bd11614b11..c7bbffb074 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/workflow/protos/WorkflowGrpc.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/workflow/protos/WorkflowGrpc.java @@ -22,7 +22,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.64.0)", + value = "by gRPC proto compiler (version 1.49.1-SNAPSHOT)", comments = "Source: workflow.proto") @io.grpc.stub.annotations.GrpcGenerated @SuppressWarnings({"all"}) diff --git a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc.java b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc.java index 2b295dd353..ddb2e650c2 100644 --- a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc.java +++ b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc.java @@ -30,7 +30,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.64.0)", + value = "by gRPC proto compiler (version 1.4.0)", comments = "Source: callback-service.proto") @io.grpc.stub.annotations.GrpcGenerated public final class CallbackServiceGrpc { From 242cd1e83401c6152efb28892b907e6ac02198c1 Mon Sep 17 00:00:00 2001 From: pmupkin <399284508@qq.com> Date: Thu, 13 Jun 2024 13:05:19 +0800 Subject: [PATCH 07/11] remove extra blank lines --- eventmesh-common/build.gradle | 2 -- eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle | 1 - 2 files changed, 3 deletions(-) diff --git a/eventmesh-common/build.gradle b/eventmesh-common/build.gradle index fed358cc15..d9ed4dbadb 100644 --- a/eventmesh-common/build.gradle +++ b/eventmesh-common/build.gradle @@ -15,8 +15,6 @@ * limitations under the License. */ - - dependencies { api "com.google.guava:guava" api "org.slf4j:slf4j-api" diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle index 35617168be..8d7f743023 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle +++ b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle @@ -24,7 +24,6 @@ repositories { mavenCentral() } - def protobufVersion = '3.25.3' def protocVersion = protobufVersion From b702a29725854fc703911952c67b54ccb77007ff Mon Sep 17 00:00:00 2001 From: pmupkin <399284508@qq.com> Date: Thu, 13 Jun 2024 21:56:59 +0800 Subject: [PATCH 08/11] remove all extra blank lines --- eventmesh-examples/build.gradle | 1 - eventmesh-sdks/eventmesh-sdk-java/build.gradle | 1 - 2 files changed, 2 deletions(-) diff --git a/eventmesh-examples/build.gradle b/eventmesh-examples/build.gradle index 1045fb06e8..dfe4164f10 100644 --- a/eventmesh-examples/build.gradle +++ b/eventmesh-examples/build.gradle @@ -15,7 +15,6 @@ * limitations under the License. */ - dependencies { implementation project(":eventmesh-sdks:eventmesh-sdk-java") implementation project(":eventmesh-common") diff --git a/eventmesh-sdks/eventmesh-sdk-java/build.gradle b/eventmesh-sdks/eventmesh-sdk-java/build.gradle index 011f5110ac..0504218e5d 100644 --- a/eventmesh-sdks/eventmesh-sdk-java/build.gradle +++ b/eventmesh-sdks/eventmesh-sdk-java/build.gradle @@ -15,7 +15,6 @@ * limitations under the License. */ - dependencies { api(project(":eventmesh-common")) { // Remove logging backend implementations to allow users to choose their own From a2be74bad9896b8eea774172445f276acba7cd2f Mon Sep 17 00:00:00 2001 From: pmupkin <399284508@qq.com> Date: Tue, 18 Jun 2024 21:26:08 +0800 Subject: [PATCH 09/11] add protobufVersion dependency management --- build.gradle | 6 ++++++ eventmesh-meta/eventmesh-meta-raft/build.gradle | 6 +++--- .../eventmesh-protocol-grpc/build.gradle | 6 +++--- eventmesh-sdks/eventmesh-sdk-java/build.gradle | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 90edbd3a0a..fa7b6fc749 100644 --- a/build.gradle +++ b/build.gradle @@ -658,6 +658,8 @@ subprojects { def cloudeventsVersion = '2.5.0' def curatorVersion = '5.6.0' def mockitoVersion = '3.12.4' + def protobufVersion = '3.25.3' + def protocVersion = protobufVersion dependencyManagement { dependencies { @@ -757,6 +759,10 @@ subprojects { dependency "com.baomidou:mybatis-plus:3.5.6" dependency "com.mysql:mysql-connector-j:8.0.33" + + dependency "com.google.protobuf:protobuf-java-util:${protobufVersion}" + dependency "com.google.protobuf:protobuf-java:${protobufVersion}" + dependency "com.google.protobuf:protoc:${protocVersion}" } } } diff --git a/eventmesh-meta/eventmesh-meta-raft/build.gradle b/eventmesh-meta/eventmesh-meta-raft/build.gradle index dccac1a5e6..24d89b47f9 100644 --- a/eventmesh-meta/eventmesh-meta-raft/build.gradle +++ b/eventmesh-meta/eventmesh-meta-raft/build.gradle @@ -28,9 +28,9 @@ dependencies { implementation ("io.grpc:grpc-protobuf") { exclude group: "com.google.protobuf", module: "protobuf-java" } - implementation("com.google.protobuf:protobuf-java:${protobufVersion}") + implementation("com.google.protobuf:protobuf-java") implementation "io.grpc:grpc-stub" - implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}" + implementation "com.google.protobuf:protobuf-java-util" implementation "javax.annotation:javax.annotation-api:1.3.2" compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' @@ -43,7 +43,7 @@ dependencies { } protobuf { - protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" } + protoc { artifact = "com.google.protobuf:protoc" } plugins { grpc { artifact = "io.grpc:protoc-gen-grpc-java" } } diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle index 8d7f743023..404099f083 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle +++ b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle @@ -31,15 +31,15 @@ dependencies { implementation ("io.grpc:grpc-protobuf") { exclude group: "com.google.protobuf", module: "protobuf-java" } - implementation("com.google.protobuf:protobuf-java:${protobufVersion}") + implementation("com.google.protobuf:protobuf-java") implementation "io.grpc:grpc-stub" - implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}" + implementation "com.google.protobuf:protobuf-java-util" implementation "javax.annotation:javax.annotation-api:1.3.2" testImplementation 'org.junit.jupiter:junit-jupiter' } protobuf { - protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" } + protoc { artifact = "com.google.protobuf:protoc" } plugins { grpc { artifact = "io.grpc:protoc-gen-grpc-java" } } diff --git a/eventmesh-sdks/eventmesh-sdk-java/build.gradle b/eventmesh-sdks/eventmesh-sdk-java/build.gradle index 0504218e5d..fb176c6cff 100644 --- a/eventmesh-sdks/eventmesh-sdk-java/build.gradle +++ b/eventmesh-sdks/eventmesh-sdk-java/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation "io.grpc:grpc-protobuf" implementation "io.grpc:grpc-stub" - implementation "com.google.protobuf:protobuf-java-util:3.25.3" + implementation "com.google.protobuf:protobuf-java-util" compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' From 3d4446bbdcaf9328cbfaa9355789cbe9d8ebf941 Mon Sep 17 00:00:00 2001 From: risk <399284508@qq.com> Date: Wed, 19 Jun 2024 16:43:59 +0800 Subject: [PATCH 10/11] remove extra parentheses --- eventmesh-meta/eventmesh-meta-raft/build.gradle | 2 +- eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eventmesh-meta/eventmesh-meta-raft/build.gradle b/eventmesh-meta/eventmesh-meta-raft/build.gradle index 24d89b47f9..a050132701 100644 --- a/eventmesh-meta/eventmesh-meta-raft/build.gradle +++ b/eventmesh-meta/eventmesh-meta-raft/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation ("io.grpc:grpc-protobuf") { exclude group: "com.google.protobuf", module: "protobuf-java" } - implementation("com.google.protobuf:protobuf-java") + implementation "com.google.protobuf:protobuf-java" implementation "io.grpc:grpc-stub" implementation "com.google.protobuf:protobuf-java-util" implementation "javax.annotation:javax.annotation-api:1.3.2" diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle index 404099f083..cbc90977af 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle +++ b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation ("io.grpc:grpc-protobuf") { exclude group: "com.google.protobuf", module: "protobuf-java" } - implementation("com.google.protobuf:protobuf-java") + implementation "com.google.protobuf:protobuf-java" implementation "io.grpc:grpc-stub" implementation "com.google.protobuf:protobuf-java-util" implementation "javax.annotation:javax.annotation-api:1.3.2" From 0400a4ec12e01b3c586ca50754bab05c13ab5051 Mon Sep 17 00:00:00 2001 From: risk <399284508@qq.com> Date: Wed, 19 Jun 2024 17:02:09 +0800 Subject: [PATCH 11/11] reorder def --- build.gradle | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index d103a2b190..3c0306306f 100644 --- a/build.gradle +++ b/build.gradle @@ -650,16 +650,15 @@ subprojects { sign publishing.publications.mavenJava } - def grpcVersion = '1.64.0' def log4jVersion = '2.23.1' def jacksonVersion = '2.17.1' def dropwizardMetricsVersion = '4.2.26' def opentelemetryVersion = '1.36.0' - def cloudeventsVersion = '2.5.0' - def curatorVersion = '5.7.0' def mockitoVersion = '4.11.0' + def cloudeventsVersion = '3.0.0' + def grpcVersion = '1.64.0' def protobufVersion = '3.25.3' - def protocVersion = protobufVersion + def curatorVersion = '5.7.0' dependencyManagement { dependencies { @@ -731,6 +730,10 @@ subprojects { dependency "io.grpc:grpc-netty-shaded:${grpcVersion}" dependency "io.grpc:protoc-gen-grpc-java:${grpcVersion}" + dependency "com.google.protobuf:protobuf-java-util:${protobufVersion}" + dependency "com.google.protobuf:protobuf-java:${protobufVersion}" + dependency "com.google.protobuf:protoc:${protobufVersion}" + dependency "javax.annotation:javax.annotation-api:1.3.2" dependency "com.github.seancfoley:ipaddress:5.5.0" @@ -756,10 +759,6 @@ subprojects { dependency "com.alibaba:druid-spring-boot-starter:1.2.23" dependency "org.springframework.boot:spring-boot-starter-jetty:2.7.18" - dependency "com.google.protobuf:protobuf-java-util:${protobufVersion}" - dependency "com.google.protobuf:protobuf-java:${protobufVersion}" - dependency "com.google.protobuf:protoc:${protocVersion}" - dependency "com.mysql:mysql-connector-j:8.4.0" }