From 5bb5e255833e79fc8be5671aeef6828f93e6a21b Mon Sep 17 00:00:00 2001 From: sanjaypujare Date: Tue, 31 Mar 2020 15:10:09 -0700 Subject: xds: exclude 3 transitive deps from opencensus_proto to use our own (#6878) --- xds/build.gradle | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xds/build.gradle b/xds/build.gradle index f29183890..2c59cba25 100644 --- a/xds/build.gradle +++ b/xds/build.gradle @@ -23,10 +23,15 @@ dependencies { project(':grpc-stub'), project(':grpc-core'), project(':grpc-services'), - project(path: ':grpc-alts', configuration: 'shadow'), - libraries.opencensus_proto + project(path: ':grpc-alts', configuration: 'shadow') def nettyDependency = compile project(':grpc-netty') + compile (libraries.opencensus_proto) { + // prefer our own versions instead of opencensus_proto's + exclude group: 'com.google.protobuf', module: 'protobuf-java' + exclude group: 'io.grpc', module: 'grpc-protobuf' + exclude group: 'io.grpc', module: 'grpc-stub' + } compile (libraries.protobuf_util) { // prefer our own versions instead of protobuf-util's dependency exclude group: 'com.google.guava', module: 'guava' -- cgit v1.2.3