Skip to content

Commit 7603795

Browse files
bdoyle0182Brendan Doyle
andauthored
upgrade etcd java to latest version (#5553)
* upgrade etcd java to latest version * attempt to constrain all grpc dependencies to consistent version --------- Co-authored-by: Brendan Doyle <[email protected]>
1 parent 2746a69 commit 7603795

File tree

2 files changed

+48
-1
lines changed

2 files changed

+48
-1
lines changed

common/scala/build.gradle

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ dependencies {
8686
api "io.kamon:kamon-datadog_${gradle.scala.depVersion}:2.1.12"
8787

8888
// for etcd
89-
api "com.ibm.etcd:etcd-java:0.0.13"
89+
api "com.ibm.etcd:etcd-java:0.0.24"
9090

9191
//tracing support
9292
api "io.opentracing:opentracing-api:0.31.0"
@@ -145,6 +145,51 @@ dependencies {
145145
api "io.netty:netty-transport-native-epoll:${gradle.netty.version}"
146146
api "io.netty:netty-transport-native-unix-common:${gradle.netty.version}"
147147
api "com.lightbend.akka.grpc:akka-grpc-runtime_${gradle.scala.depVersion}:${gradle.akka_gprc.version}"
148+
constraints {
149+
api("com.lightbend.akka.grpc:akka-grpc-runtime_${gradle.scala.depVersion}:${gradle.akka_gprc.version}")
150+
api("io.grpc:grpc-api:${gradle.grpc.version}") {
151+
version {
152+
strictly gradle.grpc.version
153+
}
154+
because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
155+
}
156+
api("io.grpc:grpc-core:${gradle.grpc.version}") {
157+
version {
158+
strictly gradle.grpc.version
159+
}
160+
because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
161+
}
162+
api("io.grpc:grpc-netty:${gradle.grpc.version}") {
163+
version {
164+
strictly gradle.grpc.version
165+
}
166+
because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
167+
}
168+
api("io.grpc:grpc-netty-shaded:${gradle.grpc.version}") {
169+
version {
170+
strictly gradle.grpc.version
171+
}
172+
because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
173+
}
174+
api("io.grpc:grpc-stub:${gradle.grpc.version}") {
175+
version {
176+
strictly gradle.grpc.version
177+
}
178+
because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
179+
}
180+
api("io.grpc:grpc-protobuf:${gradle.grpc.version}") {
181+
version {
182+
strictly gradle.grpc.version
183+
}
184+
because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
185+
}
186+
api("io.grpc:grpc-protobuf-lite:${gradle.grpc.version}") {
187+
version {
188+
strictly gradle.grpc.version
189+
}
190+
because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
191+
}
192+
}
148193
api "com.typesafe.akka:akka-stream_${gradle.scala.depVersion}:${gradle.akka.version}"
149194

150195
// Constraints for transitive dependencies to address security vulnerabilities

settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ gradle.ext.akka_http = [version : '10.2.7']
104104
gradle.ext.akka_management = [version : '1.0.10']
105105
gradle.ext.akka_gprc = [version : '1.0.2']
106106

107+
gradle.ext.grpc = [version : '1.32.1']
108+
107109
gradle.ext.curator = [version : '4.3.0']
108110
gradle.ext.kube_client = [version: '4.10.3']
109111

0 commit comments

Comments
 (0)