From ef909c45982a821c1e69c56319054b60b0f82ea7 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Thu, 15 Nov 2018 15:36:04 -0800
Subject: [PATCH 1/3] Bump gax version to 1.35.0 and guava to 26.0-android

---
 google-cloud-bom/pom.xml                            |  2 +-
 .../google-cloud-bigquerystorage/pom.xml            | 13 +------------
 google-cloud-clients/pom.xml                        |  4 ++--
 google-cloud-testing/pom.xml                        |  2 +-
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index 373036da059a..bf0b78cac582 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.34.0</version>
+        <version>1.35.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/google-cloud-clients/google-cloud-bigquerystorage/pom.xml b/google-cloud-clients/google-cloud-bigquerystorage/pom.xml
index adbdb3b25f8b..03fa30668d5e 100644
--- a/google-cloud-clients/google-cloud-bigquerystorage/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquerystorage/pom.xml
@@ -37,26 +37,17 @@
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax-grpc</artifactId>
-            <version>1.34.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax-grpc</artifactId>
-            <version>1.34.0</version>
             <classifier>testlib</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax</artifactId>
-            <version>0.4.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.api</groupId>
-            <artifactId>gax</artifactId>
-            <version>1.34.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -69,12 +60,10 @@
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax</artifactId>
-            <version>1.34.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax-grpc</artifactId>
-            <version>1.34.0</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 8f5da2912107..35255998c4be 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -156,11 +156,11 @@
     <site.installationModule>google-cloud-clients</site.installationModule>
     <bom.version>0.70.1-alpha-SNAPSHOT</bom.version><!-- {x-version-update:google-cloud-bom:current} -->
     <api-client.version>1.27.0</api-client.version>
-    <gax.version>1.34.0</gax.version>
+    <gax.version>1.35.0</gax.version>
     <google.auth.version>0.12.0</google.auth.version>
     <grpc.version>1.15.0</grpc.version>
     <nettyssl.version>2.0.7.Final</nettyssl.version>
-    <guava.version>20.0</guava.version>
+    <guava.version>26.0-android</guava.version>
     <http-client.version>1.27.0</http-client.version>
     <oauth-client.version>1.27.0</oauth-client.version>
     <protobuf.version>3.6.1</protobuf.version>
diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml
index 8eef85982c9e..320865230702 100644
--- a/google-cloud-testing/pom.xml
+++ b/google-cloud-testing/pom.xml
@@ -51,7 +51,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava-testlib</artifactId>
-        <version>20.0</version>
+        <version>26.0-android</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>

From b579033226ecfadcdc2702c5c1cfde9d2c4c2f46 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Thu, 15 Nov 2018 15:46:25 -0800
Subject: [PATCH 2/3] Update grpc dependency to 1.16.1

---
 google-api-grpc/pom.xml      | 4 ++--
 google-cloud-clients/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 063a64084329..70be1da5ed5d 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -100,13 +100,13 @@
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-stub</artifactId>
-        <version>1.15.0</version>
+        <version>1.16.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-protobuf</artifactId>
-        <version>1.15.0</version>
+        <version>1.16.1</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 35255998c4be..8cf8a7b15859 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -158,7 +158,7 @@
     <api-client.version>1.27.0</api-client.version>
     <gax.version>1.35.0</gax.version>
     <google.auth.version>0.12.0</google.auth.version>
-    <grpc.version>1.15.0</grpc.version>
+    <grpc.version>1.16.1</grpc.version>
     <nettyssl.version>2.0.7.Final</nettyssl.version>
     <guava.version>26.0-android</guava.version>
     <http-client.version>1.27.0</http-client.version>

From 9d04c1089399cc145ef9150cf357e44ce3558b30 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Thu, 15 Nov 2018 15:57:10 -0800
Subject: [PATCH 3/3] Add temporary, specific animal-sniffer-annotation version

---
 google-cloud-clients/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 8cf8a7b15859..3c8a4f6b3083 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -200,6 +200,13 @@
         <version>v1-rev20180813-1.27.0</version>
       </dependency>
 
+      <!-- TODO(chingor): Remove this when grpc and guava converge -->
+      <dependency>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-annotations</artifactId>
+        <version>1.17</version>
+      </dependency>
+
       <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>