From b8d9e30c3e2209bcd4cc0f808dfdf0a0608aa466 Mon Sep 17 00:00:00 2001
From: Mohan Li <67390330+mohanli-ml@users.noreply.github.com>
Date: Thu, 31 Mar 2022 13:51:46 -0700
Subject: [PATCH] fix: update the runtime dependency grpc-java xds to
 googleapis (#1643)

The google-c2p-experimental name resolver is moved from xds package to googleapis package in grpc java, so we need to update the runtime dependency accordingly.
---
 build.gradle          | 4 ++--
 gax-grpc/build.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index ceec0620e..64b9a25f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ ext {
     'maven.io_grpc_grpc_protobuf': "io.grpc:grpc-protobuf:${libraries['version.io_grpc']}",
     'maven.io_grpc_grpc_netty_shaded': "io.grpc:grpc-netty-shaded:${libraries['version.io_grpc']}",
     'maven.io_grpc_grpc_alts': "io.grpc:grpc-alts:${libraries['version.io_grpc']}",
-    'maven.io_grpc_grpc_xds': "io.grpc:grpc-xds:${libraries['version.io_grpc']}",
+    'maven.io_grpc_grpc_googleapis': "io.grpc:grpc-googleapis:${libraries['version.io_grpc']}",
     'maven.com_google_protobuf': "com.google.protobuf:protobuf-java:${libraries['version.com_google_protobuf']}",
     'maven.com_google_protobuf_java_util': "com.google.protobuf:protobuf-java-util:${libraries['version.com_google_protobuf']}")
 }
@@ -322,4 +322,4 @@ sonarqube {
     property 'sonar.organization', 'googleapis'
     property 'sonar.host.url', 'https://sonarcloud.io'
   }
-}
\ No newline at end of file
+}
diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle
index f63c5e3d1..3320a8691 100644
--- a/gax-grpc/build.gradle
+++ b/gax-grpc/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     libraries['maven.io_grpc_grpc_protobuf'],
     libraries['maven.io_grpc_grpc_stub'])
 
-  runtimeOnly libraries['maven.io_grpc_grpc_xds']
+  runtimeOnly libraries['maven.io_grpc_grpc_googleapis']
 
   compileOnly(libraries['maven.com_google_auto_value_auto_value'],
           libraries['maven.org_graalvm_sdk'],