From a3d305487dec3252d2492c900d54e8d33b022e26 Mon Sep 17 00:00:00 2001
From: Garrett Jones <garrettjonesgoogle@users.noreply.github.com>
Date: Fri, 19 Oct 2018 15:13:56 -0700
Subject: [PATCH] Bumping gax, using gax-bom

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

diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index fd748f4328bb..f4038062d6a6 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -167,36 +167,10 @@
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
-        <artifactId>gax</artifactId>
-        <version>1.32.0</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.api</groupId>
-        <artifactId>gax</artifactId>
-        <version>1.32.0</version>
-        <classifier>testlib</classifier>
-      </dependency>
-      <dependency>
-        <groupId>com.google.api</groupId>
-        <artifactId>gax-grpc</artifactId>
-        <version>1.32.0</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.api</groupId>
-        <artifactId>gax-grpc</artifactId>
-        <version>1.32.0</version>
-        <classifier>testlib</classifier>
-      </dependency>
-      <dependency>
-        <groupId>com.google.api</groupId>
-        <artifactId>gax-httpjson</artifactId>
-        <version>0.49.0</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.api</groupId>
-        <artifactId>gax-httpjson</artifactId>
-        <version>0.49.0</version>
-        <classifier>testlib</classifier>
+        <artifactId>gax-bom</artifactId>
+        <version>1.34.0</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index c8622d9a35ac..30e9657eba7e 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -156,7 +156,7 @@
     <site.installationModule>google-cloud-clients</site.installationModule>
     <bom.version>0.67.1-alpha-SNAPSHOT</bom.version><!-- {x-version-update:google-cloud-bom:current} -->
     <api-client.version>1.24.1</api-client.version>
-    <gax.version>1.33.1</gax.version>
+    <gax.version>1.34.0</gax.version>
     <google.auth.version>0.11.0</google.auth.version>
     <grpc.version>1.15.0</grpc.version>
     <nettyssl.version>2.0.7.Final</nettyssl.version>