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.

Sign up for GitHub

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] Apply dependency management to grpcVersion and protobufVersion. #4988

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

[ISSUE #4845] Apply dependency management to grpcVersion and protobufVersion. #4988

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
37b4ae2
improve grpc version manage
pmupkin Jun 9, 2024
9b71388
delete submodule grpc version
pmupkin Jun 10, 2024
b2c3de9
resolve ci/cd
pmupkin Jun 10, 2024
f2bf72c
adjust submodule version
pmupkin Jun 11, 2024
eab4d7e
adjust submodule version
pmupkin Jun 11, 2024
cd14fbc
adjust submodule version
pmupkin Jun 11, 2024
242cd1e
remove extra blank lines
pmupkin Jun 13, 2024
b702a29
remove all extra blank lines
pmupkin Jun 13, 2024
a2be74b
add protobufVersion dependency management
pmupkin Jun 18, 2024
aaacb48
Merge branch 'master' into issue-4845
pmupkin Jun 18, 2024
3d4446b
remove extra parentheses
pmupkin Jun 19, 2024
0400a4e
reorder def
pmupkin Jun 19, 2024
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
11 changes: 10 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,9 +655,11 @@ subprojects {
def jacksonVersion = '2.17.1'
def dropwizardMetricsVersion = '4.2.26'
def opentelemetryVersion = '1.36.0'
def cloudeventsVersion = '3.0.0'
def cloudeventsVersion = '2.5.0'
def curatorVersion = '5.7.0'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not downgrade.

def mockitoVersion = '4.11.0'
def protobufVersion = '3.25.3'
def protocVersion = protobufVersion

dependencyManagement {
dependencies {
Expand Down Expand Up @@ -727,6 +729,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"

Expand All @@ -752,7 +755,13 @@ 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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The google.protobuf dependencies should be placed after the grpc dependencies. The same as the protobufVersion var.


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

def grpcVersion = '1.64.0'

dependencies {
api "com.google.guava:guava"
api "org.slf4j:slf4j-api"
Expand Down Expand Up @@ -49,8 +47,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
10 changes: 4 additions & 6 deletions eventmesh-examples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
* limitations under the License.
*/

def grpcVersion = '1.64.0'

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
13 changes: 6 additions & 7 deletions eventmesh-meta/eventmesh-meta-raft/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,18 @@ 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 "com.google.protobuf:protobuf-java-util:${protobufVersion}"
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"
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
Expand All @@ -44,9 +43,9 @@ dependencies {
}

protobuf {
protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" }
protoc { artifact = "com.google.protobuf:protoc" }
plugins {
grpc { artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" }
grpc { artifact = "io.grpc:protoc-gen-grpc-java" }
}
generateProtoTasks {
all()*.plugins {
Expand Down
2 changes: 1 addition & 1 deletion eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
13 changes: 6 additions & 7 deletions eventmesh-protocol-plugin/eventmesh-protocol-grpc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,24 @@ repositories {
mavenCentral()
}

def grpcVersion = '1.64.0'
def protobufVersion = '3.25.3'
def protocVersion = protobufVersion

Comment on lines 27 to 29
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Redundant protobufVersion field.

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 "com.google.protobuf:protobuf-java-util:${protobufVersion}"
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"
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:${grpcVersion}" }
grpc { artifact = "io.grpc:protoc-gen-grpc-java" }
}
generateProtoTasks {
all()*.plugins {
Expand Down
2 changes: 1 addition & 1 deletion eventmesh-protocol-plugin/eventmesh-protocol-http/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
16 changes: 7 additions & 9 deletions eventmesh-sdks/eventmesh-sdk-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
* limitations under the License.
*/

def grpcVersion = '1.64.0'

dependencies {
Pil0tXia marked this conversation as resolved.
Show resolved Hide resolved
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.25.3"
implementation "io.grpc:grpc-protobuf"
implementation "io.grpc:grpc-stub"
implementation "com.google.protobuf:protobuf-java-util"
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'

Expand Down