Skip to content

Commit c76b9c9

Browse files
authored
Merge pull request #152 from ivanauth/fix/dependency-convergence
Fix Maven dependency convergence errors
2 parents 8dcae52 + ba9d391 commit c76b9c9

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

build.gradle

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,32 @@ sourceSets { main {
101101
dependencies {
102102
implementation("io.grpc:grpc-protobuf:${grpcVersion}") {
103103
exclude group: 'com.google.protobuf', module: 'protobuf-java'
104+
exclude group: 'com.google.api.grpc', module: 'proto-google-common-protos'
104105
}
105-
api "com.google.protobuf:protobuf-java:${protocVersion}"
106106
implementation "io.grpc:grpc-stub:${grpcVersion}"
107107
runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"
108108
compileOnly "org.apache.tomcat:annotations-api:6.0.53"
109109

110-
implementation "com.google.api.grpc:proto-google-common-protos:2.61.3"
111-
implementation("build.buf:protovalidate:1.0.0")
110+
implementation("build.buf:protovalidate:1.0.0") {
111+
exclude group: 'com.google.protobuf', module: 'protobuf-java'
112+
exclude group: 'com.google.protobuf', module: 'protobuf-java-util'
113+
exclude group: 'com.google.code.gson', module: 'gson'
114+
exclude group: 'com.google.re2j', module: 're2j'
115+
}
112116
// In the future this can probably be removed in favor of "protovalidate"
113117
// See https://buf.build/blog/protoc-gen-validate-v1-and-v2
114-
implementation("build.buf.protoc-gen-validate:pgv-java-stub:1.2.1")
118+
implementation("build.buf.protoc-gen-validate:pgv-java-stub:1.2.1") {
119+
exclude group: 'com.google.protobuf', module: 'protobuf-java'
120+
exclude group: 'com.google.protobuf', module: 'protobuf-java-util'
121+
exclude group: 'com.google.code.gson', module: 'gson'
122+
exclude group: 'com.google.re2j', module: 're2j'
123+
}
124+
125+
api "com.google.protobuf:protobuf-java:${protocVersion}"
126+
implementation "com.google.protobuf:protobuf-java-util:${protocVersion}"
127+
implementation "com.google.api.grpc:proto-google-common-protos:2.61.3"
128+
implementation "com.google.code.gson:gson:2.11.0"
129+
implementation "com.google.re2j:re2j:1.8"
115130
}
116131

117132
// There is no pre-packaged JAR available that contains the gRPC Gateway proto files

0 commit comments

Comments
 (0)