fix conflict and define grpcVersion

pmupkin · May 20, 2024 · e6627d2 · e6627d2
1 parent f1e5531
commit e6627d2
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 35 deletions.
diff --git a/build.gradle b/build.gradle
@@ -654,7 +654,7 @@ subprojects {
         sign publishing.publications.mavenJava
     }
 
-    def grpcVersion = '1.63.0'
+    project.setProperty('grpcVersion', '1.63.0')
     def log4jVersion = '2.22.1'
 
     dependencyManagement {
@@ -723,11 +723,11 @@ subprojects {
             dependency "io.cloudevents:cloudevents-json-jackson:2.4.2"
             dependency "io.cloudevents:cloudevents-protobuf:2.4.2"
 
-            dependency "io.grpc:grpc-core:${grpcVersion}"
-            dependency "io.grpc:grpc-protobuf:${grpcVersion}"
-            dependency "io.grpc:grpc-stub:${grpcVersion}"
-            dependency "io.grpc:grpc-netty:${grpcVersion}"
-            dependency "io.grpc:grpc-netty-shaded:${grpcVersion}"
+            dependency "io.grpc:grpc-core:${project.properties.grpcVersion}"
+            dependency "io.grpc:grpc-protobuf:${project.properties.grpcVersion}"
+            dependency "io.grpc:grpc-stub:${project.properties.grpcVersion}"
+            dependency "io.grpc:grpc-netty:${project.properties.grpcVersion}"
+            dependency "io.grpc:grpc-netty-shaded:${project.properties.grpcVersion}"
 
             dependency "javax.annotation:javax.annotation-api:1.3.2"
 

diff --git a/eventmesh-common/build.gradle b/eventmesh-common/build.gradle
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-def grpcVersion = '1.63.0'
-
 dependencies {
     api "com.google.guava:guava"
     api "org.slf4j:slf4j-api"
@@ -48,8 +46,8 @@ dependencies {
 
     implementation "io.netty:netty-all"
 
-    implementation "io.grpc:grpc-protobuf:${grpcVersion}"
-    implementation "io.grpc:grpc-stub:${grpcVersion}"
+    implementation "io.grpc:grpc-protobuf:${project.properties.grpcVersion}"
+    implementation "io.grpc:grpc-stub:${project.properties.grpcVersion}"
     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
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-def grpcVersion = '1.63.0'
-
 dependencies {
     implementation project(":eventmesh-sdks:eventmesh-sdk-java")
     implementation project(":eventmesh-common")
@@ -31,10 +29,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:${project.properties.grpcVersion}"
+    implementation "io.grpc:grpc-stub:${project.properties.grpcVersion}"
+    implementation "io.grpc:grpc-netty:${project.properties.grpcVersion}"
+    implementation "io.grpc:grpc-netty-shaded:${project.properties.grpcVersion}"
 
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'

diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle b/eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle
@@ -24,16 +24,15 @@ repositories {
     mavenCentral()
 }
 
-def grpcVersion = '1.63.0' // CURRENT_GRPC_VERSION
 def protobufVersion = '3.25.1'
 def protocVersion = protobufVersion
 
 dependencies {
-    implementation ("io.grpc:grpc-protobuf:${grpcVersion}") {
+    implementation ("io.grpc:grpc-protobuf:${project.properties.grpcVersion}") {
         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:${project.properties.grpcVersion}"
     implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}"
     implementation "javax.annotation:javax.annotation-api:1.3.2"
     testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'
@@ -43,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:${project.properties.grpcVersion}" }
     }
     generateProtoTasks {
         all()*.plugins {

diff --git a/eventmesh-runtime/conf/eventmesh.properties b/eventmesh-runtime/conf/eventmesh.properties
@@ -21,7 +21,7 @@ eventMesh.server.provide.protocols=HTTP,TCP,GRPC
 eventMesh.server.cluster=COMMON
 eventMesh.server.name=EVENTMESH-runtime
 eventMesh.sysid=0000
-eventMesh.server.tcp.port=10002
+eventMesh.server.tcp.port=10000
 eventMesh.server.http.port=10105
 eventMesh.server.grpc.port=10205
 # HTTP Admin Server
@@ -70,10 +70,7 @@ eventMesh.server.blacklist.ipv6=::/128,::1/128,ff00::/8
 
 ########################## EventMesh Plugin Configuration ##########################
 # storage plugin
-eventMesh.storage.plugin.type=rocketmq
-
-##connector plugin
-#eventMesh.connector.plugin.type=rocketmq
+eventMesh.storage.plugin.type=standalone
 
 # security plugin
 eventMesh.server.security.enabled=false

diff --git a/eventmesh-sdks/eventmesh-sdk-java/build.gradle b/eventmesh-sdks/eventmesh-sdk-java/build.gradle
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-def grpcVersion = '1.63.0'
-
 dependencies {
     api(project(":eventmesh-common")) {
         // Remove logging backend implementations to allow users to choose their own
@@ -32,10 +30,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:${project.properties.grpcVersion}"
+    implementation "io.grpc:grpc-stub:${project.properties.grpcVersion}"
+    implementation "io.grpc:grpc-netty:${project.properties.grpcVersion}"
+    implementation "io.grpc:grpc-netty-shaded:${project.properties.grpcVersion}"
     implementation "io.cloudevents:cloudevents-protobuf"
 
     // protocol
@@ -52,8 +50,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:${project.properties.grpcVersion}"
+    implementation "io.grpc:grpc-stub:${project.properties.grpcVersion}"
     implementation "com.google.protobuf:protobuf-java-util:3.25.1"
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'

diff --git a/install.sh b/install.sh
@@ -27,6 +27,6 @@
 
 # package tar.gz/zip
 gradle clean -Pdev=true -Pjdk=1.8 dist tar zip
-gradlew installPlugin
+
 # package jar
-#gradle clean -Pdev=true -Pjdk=1.8 jar
+gradle clean -Pdev=true -Pjdk=1.8 jar