From 5fbaa370393d957ce0ac48049cdf0de7a6ac347a Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Fri, 28 Jun 2019 09:20:44 -0700
Subject: [PATCH] Update gax -> 1.47.0, guava -> 28.0-android, gson -> 2.8.5

---
 google-cloud-bom/pom.xml     | 2 +-
 google-cloud-clients/pom.xml | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index b36056497828..cd08e6a04abc 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -168,7 +168,7 @@
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-bom</artifactId>
-        <version>1.46.1</version>
+        <version>1.47.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index f252d3e3f16d..b61b5cab9644 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -161,7 +161,7 @@
     <google.auth.version>0.16.2</google.auth.version>
     <grpc.version>1.21.0</grpc.version>
     <!-- We are currently using the *-android version to support JDK7. -->
-    <guava.version>27.1-android</guava.version>
+    <guava.version>28.0-android</guava.version>
     <http-client-bom.version>1.30.1</http-client-bom.version>
     <oauth-client.version>1.30.1</oauth-client.version>
     <protobuf.version>3.7.1</protobuf.version>
@@ -254,6 +254,13 @@
         <version>1.18</version>
       </dependency>
 
+      <!-- TODO(chingor): Remove this when protobuf-java-util and gax-httpjson converge -->
+      <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+        <version>2.8.5</version>
+      </dependency>
+
       <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>