Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #4845] Update grpc version from 1.43.2 to 1.63.0 #4876

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,8 @@ subprojects {
sign publishing.publications.mavenJava
}

def grpcVersion = '1.43.2'
def grpcVersion = '1.63.0'

def log4jVersion = '2.22.1'

dependencyManagement {
Expand Down
6 changes: 2 additions & 4 deletions eventmesh-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
* limitations under the License.
*/

def grpcVersion = '1.43.2'

dependencies {
api "com.google.guava:guava"
api "org.slf4j:slf4j-api"
Expand Down Expand Up @@ -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"
implementation "io.grpc:grpc-stub"
implementation "javax.annotation:javax.annotation-api:1.3.2"

testImplementation "org.junit-pioneer:junit-pioneer"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.43.2)",
value = "by gRPC proto compiler (version 1.63.0)",
comments = "Source: eventmesh-service.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class ConsumerServiceGrpc {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.43.2)",
value = "by gRPC proto compiler (version 1.63.0)",
comments = "Source: eventmesh-service.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class HeartbeatServiceGrpc {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.43.2)",
value = "by gRPC proto compiler (version 1.63.0)",
comments = "Source: eventmesh-service.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class PublisherServiceGrpc {
Expand Down
10 changes: 4 additions & 6 deletions eventmesh-examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
* limitations under the License.
*/

def grpcVersion = '1.43.2'

dependencies {
implementation project(":eventmesh-sdks:eventmesh-sdk-java")
implementation project(":eventmesh-common")
Expand All @@ -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"
implementation "io.grpc:grpc-stub"
implementation "io.grpc:grpc-netty"
implementation "io.grpc:grpc-netty-shaded"

compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
implementation ("io.grpc:grpc-protobuf:1.42.2") {
exclude group: "com.google.protobuf", module: "protobuf-java"
}
implementation("com.google.protobuf:protobuf-java:3.21.5")
implementation("com.google.protobuf:protobuf-java:3.25.1")
implementation "io.cloudevents:cloudevents-protobuf"

compileOnly 'org.projectlombok:lombok'
Expand Down
10 changes: 5 additions & 5 deletions eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@ repositories {
mavenCentral()
}

def grpcVersion = '1.43.2' // CURRENT_GRPC_VERSION
def protobufVersion = '3.21.5'
def protobufVersion = '3.25.1'
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:5.6.0'

}

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" }
}
generateProtoTasks {
all()*.plugins {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ dependencies {
implementation ("io.grpc:grpc-protobuf:1.42.2") {
exclude group: "com.google.protobuf", module: "protobuf-java"
}
implementation("com.google.protobuf:protobuf-java:3.21.5")
implementation("com.google.protobuf:protobuf-java:3.25.1")
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
implementation ("io.grpc:grpc-protobuf:1.42.2") {
exclude group: "com.google.protobuf", module: "protobuf-java"
}
implementation("com.google.protobuf:protobuf-java:3.21.5")
implementation("com.google.protobuf:protobuf-java:3.25.1")
implementation "io.cloudevents:cloudevents-protobuf"

testImplementation project(":eventmesh-protocol-plugin:eventmesh-protocol-api")
Expand Down
16 changes: 7 additions & 9 deletions eventmesh-sdks/eventmesh-sdk-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
* limitations under the License.
*/

def grpcVersion = '1.43.2'

dependencies {
api(project(":eventmesh-common")) {
// Remove logging backend implementations to allow users to choose their own
Expand All @@ -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"
implementation "io.grpc:grpc-stub"
implementation "io.grpc:grpc-netty"
implementation "io.grpc:grpc-netty-shaded"
implementation "io.cloudevents:cloudevents-protobuf"

// protocol
Expand All @@ -52,9 +50,9 @@ dependencies {
testImplementation "io.netty:netty-all"
testImplementation "org.apache.httpcomponents:httpclient"

implementation "io.grpc:grpc-protobuf:${grpcVersion}"
implementation "io.grpc:grpc-stub:${grpcVersion}"
implementation "com.google.protobuf:protobuf-java-util:3.21.5"
implementation "io.grpc:grpc-protobuf"
implementation "io.grpc:grpc-stub"
implementation "com.google.protobuf:protobuf-java-util:3.25.1"
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'

Expand Down
41 changes: 17 additions & 24 deletions tools/dependency-check/known-dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ accessors-smart-2.4.7.jar
adapter-rxjava2-2.9.0.jar
alibabacloud-gateway-spi-0.0.1.jar
amqp-client-5.16.0.jar
animal-sniffer-annotations-1.19.jar
animal-sniffer-annotations-1.23.jar
annotations-2.20.29.jar
annotations-4.1.1.4.jar
antlr-runtime-3.5.3.jar
Expand Down Expand Up @@ -78,26 +78,27 @@ dom4j-2.0.3.jar
druid-1.2.20.jar
endpoint-util-0.0.7.jar
endpoints-spi-2.20.29.jar
error_prone_annotations-2.9.0.jar
error_prone_annotations-2.23.0.jar
eventstream-1.0.1.jar
failsafe-3.3.2.jar
failureaccess-1.0.1.jar
fastjson-1.2.69_noneautotype.jar
fastjson2-2.0.48.jar
gateway-dingtalk-1.0.2.jar
google-auth-library-credentials-0.22.2.jar
grpc-api-1.43.2.jar
grpc-api-1.63.0.jar
grpc-auth-1.39.0.jar
grpc-context-1.43.2.jar
grpc-core-1.43.2.jar
grpc-context-1.63.0.jar
grpc-core-1.63.0.jar
grpc-grpclb-1.17.1.jar
grpc-netty-1.43.2.jar
grpc-netty-shaded-1.43.2.jar
grpc-netty-1.63.0.jar
grpc-netty-shaded-1.63.0.jar
grpc-protobuf-1.63.0.jar
grpc-protobuf-1.42.2.jar
grpc-protobuf-1.43.2.jar
grpc-protobuf-lite-1.63.0.jar
grpc-protobuf-lite-1.42.2.jar
grpc-protobuf-lite-1.43.2.jar
grpc-stub-1.43.2.jar
grpc-util-1.63.0.jar
grpc-stub-1.63.0.jar
gson-2.8.2.jar
guava-31.0.1-jre.jar
guava-retrying-2.0.0.jar
Expand All @@ -114,6 +115,7 @@ ini4j-0.5.4.jar
ipaddress-5.3.3.jar
j2objc-annotations-1.3.jar
jackson-annotations-2.13.0.jar
j2objc-annotations-2.8.jar
jackson-core-2.13.0.jar
jackson-databind-2.13.0.jar
jackson-dataformat-yaml-2.13.0.jar
Expand Down Expand Up @@ -173,19 +175,15 @@ netty-3.10.6.Final.jar
netty-all-4.1.79.Final.jar
netty-buffer-4.1.100.Final.jar
netty-buffer-4.1.79.Final.jar
netty-buffer-4.1.86.Final.jar
netty-codec-4.1.100.Final.jar
netty-codec-4.1.79.Final.jar
netty-codec-4.1.86.Final.jar
netty-codec-dns-4.1.100.Final.jar
netty-codec-dns-4.1.79.Final.jar
netty-codec-haproxy-4.1.79.Final.jar
netty-codec-http-4.1.100.Final.jar
netty-codec-http-4.1.79.Final.jar
netty-codec-http-4.1.86.Final.jar
netty-codec-http2-4.1.100.Final.jar
netty-codec-http2-4.1.79.Final.jar
netty-codec-http2-4.1.86.Final.jar
netty-codec-memcache-4.1.79.Final.jar
netty-codec-mqtt-4.1.79.Final.jar
netty-codec-redis-4.1.79.Final.jar
Expand All @@ -196,17 +194,14 @@ netty-codec-stomp-4.1.79.Final.jar
netty-codec-xml-4.1.79.Final.jar
netty-common-4.1.100.Final.jar
netty-common-4.1.79.Final.jar
netty-common-4.1.86.Final.jar
netty-handler-4.1.100.Final.jar
netty-handler-4.1.79.Final.jar
netty-handler-4.1.86.Final.jar
netty-handler-proxy-4.1.100.Final.jar
netty-handler-proxy-4.1.79.Final.jar
netty-nio-client-2.20.29.jar
netty-reactive-streams-2.0.4.jar
netty-resolver-4.1.100.Final.jar
netty-resolver-4.1.79.Final.jar
netty-resolver-4.1.86.Final.jar
netty-resolver-dns-4.1.100.Final.jar
netty-resolver-dns-4.1.79.Final.jar
netty-resolver-dns-classes-macos-4.1.79.Final.jar
Expand All @@ -218,7 +213,6 @@ netty-tcnative-classes-2.0.48.Final.jar
netty-tcnative-classes-2.0.51.Final.jar
netty-transport-4.1.100.Final.jar
netty-transport-4.1.79.Final.jar
netty-transport-4.1.86.Final.jar
netty-transport-classes-epoll-4.1.79.Final.jar
netty-transport-classes-epoll-4.1.86.Final.jar
netty-transport-classes-kqueue-4.1.79.Final.jar
Expand All @@ -229,7 +223,6 @@ netty-transport-native-kqueue-4.1.79.Final-osx-aarch_64.jar
netty-transport-native-kqueue-4.1.79.Final-osx-x86_64.jar
netty-transport-native-unix-common-4.1.100.Final.jar
netty-transport-native-unix-common-4.1.79.Final.jar
netty-transport-native-unix-common-4.1.86.Final.jar
netty-transport-rxtx-4.1.79.Final.jar
netty-transport-sctp-4.1.79.Final.jar
netty-transport-udt-4.1.79.Final.jar
Expand Down Expand Up @@ -258,7 +251,7 @@ opentelemetry-sdk-trace-1.36.0.jar
opentelemetry-semconv-1.30.1-alpha.jar
org.abego.treelayout.core-1.0.3.jar
org.jacoco.agent-0.8.4-runtime.jar
perfmark-api-0.23.0.jar
perfmark-api-0.26.0.jar
pinpoint-annotations-2.4.1.jar
pinpoint-bootstrap-2.4.1.jar
pinpoint-bootstrap-core-2.4.1.jar
Expand All @@ -282,10 +275,10 @@ prometheus-metrics-exposition-formats-1.1.0.jar
prometheus-metrics-model-1.1.0.jar
prometheus-metrics-shaded-protobuf-1.1.0.jar
proto-google-common-protos-2.0.1.jar
protobuf-java-3.19.2.jar
protobuf-java-3.21.5.jar
proto-google-common-protos-2.29.0.jar
protobuf-java-3.25.1.jar
protobuf-java-util-3.25.1.jar
protobuf-java-util-3.15.0.jar
protobuf-java-util-3.21.5.jar
protobuf-java-util-3.5.1.jar
protocol-core-2.20.29.jar
pull-parser-2.jar
Expand Down Expand Up @@ -365,4 +358,4 @@ zipkin-sender-okhttp3-3.3.0.jar
zookeeper-3.7.1.jar
zookeeper-jute-3.7.1.jar
zstd-jni-1.5.0-2.jar
zstd-jni-1.5.2-2.jar
zstd-jni-1.5.2-2.jar