From 5b9b22ac51a4396fd2716a4f42ceb7e1e43786f9 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 07:11:37 -0700
Subject: [PATCH 01/14] update gax to 1.48.0

---
 google-cloud-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index afdccc158cf2..84a4ed711b22 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.47.1</version>
+        <version>1.48.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From 24bcc705384ee1157765c9fe165adcbd4a2437ea Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 07:12:13 -0700
Subject: [PATCH 02/14] update google-auth-library to 0.17.0

---
 google-cloud-clients/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 147c38081733..12fb1626f4e0 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -158,8 +158,8 @@
     <!-- make sure to keep gax version in sync with google-cloud-bom -->
     <gax.version>1.47.1</gax.version>
     <api.common.java.version>1.8.1</api.common.java.version>
-    <google.auth.version>0.16.2</google.auth.version>
     <grpc.version>1.23.0</grpc.version>
+    <google.auth.version>0.17.0</google.auth.version>
     <!-- We are currently using the *-android version to support JDK7. -->
     <guava.version>28.0-android</guava.version>
     <http-client-bom.version>1.31.0</http-client-bom.version>

From cd2c5eca038698ef055ab7f0f9b84c57b32bc541 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 07:16:06 -0700
Subject: [PATCH 03/14] update grpc to 1.23.0 and import grpc-bom

---
 google-api-grpc/pom.xml      | 20 ++++++---------
 google-cloud-clients/pom.xml | 49 +++++++-----------------------------
 2 files changed, 17 insertions(+), 52 deletions(-)

diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index ad800bfc61c3..5bfe0fb11a2b 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -14,6 +14,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <project.javadoc.protobufBaseURL>https://googleapis.dev/java/google-api-grpc/latest</project.javadoc.protobufBaseURL>
+    <grpc.version>1.23.0</grpc.version>
   </properties>
   <developers>
     <developer>
@@ -101,22 +102,17 @@
   <dependencyManagement>
     <dependencies>
       <!-- Common dependencies -->
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java</artifactId>
-        <version>3.7.1</version>
-      </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
-        <artifactId>grpc-stub</artifactId>
-        <version>1.23.0</version>
-        <scope>compile</scope>
+        <artifactId>grpc-bom</artifactId>
+        <version>${grpc.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-protobuf</artifactId>
-        <version>1.23.0</version>
-        <scope>compile</scope>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>3.7.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 12fb1626f4e0..b48e66ac32fb 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -211,6 +211,14 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-bom</artifactId>
+        <version>${grpc.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <dependency>
         <groupId>com.google.apis</groupId>
         <artifactId>google-api-services-bigquery</artifactId>
@@ -285,46 +293,7 @@
         <artifactId>json</artifactId>
         <version>20180813</version>
       </dependency>
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-core</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-netty</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-netty-shaded</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-stub</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-auth</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-protobuf</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-context</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-testing</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
+
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>

From de39e9f1f5ed2da89133cdf6369d669bf0fcf0f6 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 07:17:01 -0700
Subject: [PATCH 04/14] cleanup guava versions to 28.0-android

---
 google-cloud-testing/pom.xml                          | 2 +-
 google-cloud-util/google-cloud-compat-checker/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml
index 18067daee4e9..f87a4c449c8b 100644
--- a/google-cloud-testing/pom.xml
+++ b/google-cloud-testing/pom.xml
@@ -59,7 +59,7 @@
         <groupId>com.google.guava</groupId>
         <artifactId>guava-testlib</artifactId>
         <!-- We are currently using the *-android version to support JDK7. -->
-        <version>26.0-android</version>
+        <version>28.0-android</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml
index b3b9dda2904f..e0d6fdfb6291 100644
--- a/google-cloud-util/google-cloud-compat-checker/pom.xml
+++ b/google-cloud-util/google-cloud-compat-checker/pom.xml
@@ -18,7 +18,7 @@
     <site.installationModule>google-cloud-compat-checker</site.installationModule>
     <grpc.version>1.23.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>
   </properties>
   <dependencies>
     <dependency>

From 495a0c7373a174af58ef0123bb05f702cd6a4f66 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 07:22:15 -0700
Subject: [PATCH 05/14] update protobuf to 3.9.1 and use bom

---
 google-api-grpc/pom.xml                         |  6 ++++--
 google-cloud-clients/pom.xml                    | 17 +++++++----------
 .../google-cloud-conformance-tests/pom.xml      |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 5bfe0fb11a2b..6a0fd7ceed81 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -111,8 +111,10 @@
       </dependency>
       <dependency>
         <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java</artifactId>
-        <version>3.7.1</version>
+        <artifactId>protobuf-bom</artifactId>
+        <version>3.9.1</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index b48e66ac32fb..386a20947c60 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -218,6 +218,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-bom</artifactId>
+        <version>${protobuf.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
 
       <dependency>
         <groupId>com.google.apis</groupId>
@@ -299,16 +306,6 @@
         <artifactId>jsr305</artifactId>
         <version>3.0.2</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java</artifactId>
-        <version>${protobuf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java-util</artifactId>
-        <version>${protobuf.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
diff --git a/google-cloud-testing/google-cloud-conformance-tests/pom.xml b/google-cloud-testing/google-cloud-conformance-tests/pom.xml
index 2e949c9bdd22..e78ec10905df 100644
--- a/google-cloud-testing/google-cloud-conformance-tests/pom.xml
+++ b/google-cloud-testing/google-cloud-conformance-tests/pom.xml
@@ -14,7 +14,7 @@
   </parent>
 
   <properties>
-    <protobuf.version>3.7.1</protobuf.version>
+    <protobuf.version>3.9.1</protobuf.version>
   </properties>
 
   <dependencies>

From de09374b5a3d278bae55e83f68733d3787ad2a1d Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 07:31:47 -0700
Subject: [PATCH 06/14] update opencensus to 0.23.0

---
 google-cloud-clients/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 386a20947c60..7183ea0dc40a 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -166,7 +166,7 @@
     <oauth-client.version>1.30.1</oauth-client.version>
     <protobuf.version>3.9.1</protobuf.version>
     <!-- make sure to keep opencensus version in sync with grpc -->
-    <opencensus.version>0.21.0</opencensus.version>
+    <opencensus.version>0.23.0</opencensus.version>
     <!-- make sure to keep version in sync with google-http-client -->
     <apache.httpclient.version>4.5.5</apache.httpclient.version>
     <!-- test dependency versions -->

From 40a3ce1d2d21cfbecf3ac9691ed957ba75d46685 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 07:45:32 -0700
Subject: [PATCH 07/14] update autovalue to 1.6.5

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

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 7183ea0dc40a..db014d6bd355 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -172,6 +172,7 @@
     <!-- test dependency versions -->
     <easymock.version>3.6</easymock.version>
     <objenesis.version>2.6</objenesis.version>
+    <autovalue.version>1.6.5</autovalue.version>
   </properties>
   <!-- All non-test dependency versions should be added to google-cloud-bom/pom.xml -->
   <dependencyManagement>
@@ -314,7 +315,12 @@
       <dependency>
         <groupId>com.google.auto.value</groupId>
         <artifactId>auto-value</artifactId>
-        <version>1.4</version>
+        <version>${autovalue.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.auto.value</groupId>
+        <artifactId>auto-value-annotations</artifactId>
+        <version>${autovalue.version}</version>
       </dependency>
       <dependency>
         <groupId>io.opencensus</groupId>

From 17bbde26de13b0dd8f698075c8e76b513cca7e53 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 07:52:07 -0700
Subject: [PATCH 08/14] latest autovalue is 1.6.6

---
 google-cloud-clients/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index db014d6bd355..cec1ee3d9e33 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -172,7 +172,7 @@
     <!-- test dependency versions -->
     <easymock.version>3.6</easymock.version>
     <objenesis.version>2.6</objenesis.version>
-    <autovalue.version>1.6.5</autovalue.version>
+    <autovalue.version>1.6.6</autovalue.version>
   </properties>
   <!-- All non-test dependency versions should be added to google-cloud-bom/pom.xml -->
   <dependencyManagement>

From ef67ae4398e5eccdde4c3099a725b05bbb492d5d Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 11:49:28 -0700
Subject: [PATCH 09/14] enable runningSpanStore to capture spans for testing

---
 .../com/google/cloud/pubsub/v1/OpenCensusUtilTest.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java
index d4230003907d..9126b67ba6b1 100644
--- a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java
+++ b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java
@@ -43,6 +43,8 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /** Tests for {@link OpenCensusUtil}. */
@@ -53,6 +55,11 @@ public class OpenCensusUtilTest {
   private static final TagValue TEST_TAG_VAL = TagValue.create("TEST_TAG_VAL");
   private static final String TEST_PARENT_LINK_NAME = "TEST_PARENT_LINK";
 
+  @BeforeClass
+  public static void configureOpenCensus() {
+    Tracing.getExportComponent().getRunningSpanStore().setMaxNumberOfSpans(5);
+  }
+
   // Verifies that trace contexts propagated as an attribute are set as the parent link in the
   // message receiver and that the tag context is not change (for now).
   @Test
@@ -148,7 +155,7 @@ private void assertSpanCount(int expected) {
         }
         Thread.yield();
         if (watch.elapsed(TimeUnit.SECONDS) >= 5) {
-          fail();
+          fail("failed to get spans in 5 seconds");
         }
       }
     }

From 3d572faae57df1dfbb29d492319d52630cce0892 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 12:20:29 -0700
Subject: [PATCH 10/14] lint

---
 .../test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java
index 9126b67ba6b1..afa316220681 100644
--- a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java
+++ b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java
@@ -43,7 +43,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 

From 3426821a5bf2c04cdb99cc0566cb8664d7b0eda5 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 13:23:09 -0700
Subject: [PATCH 11/14] cannot upgrade autovalue right now

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

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index cec1ee3d9e33..ecf18493e60e 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -172,7 +172,7 @@
     <!-- test dependency versions -->
     <easymock.version>3.6</easymock.version>
     <objenesis.version>2.6</objenesis.version>
-    <autovalue.version>1.6.6</autovalue.version>
+    <autovalue.version>1.4</autovalue.version>
   </properties>
   <!-- All non-test dependency versions should be added to google-cloud-bom/pom.xml -->
   <dependencyManagement>
@@ -317,11 +317,6 @@
         <artifactId>auto-value</artifactId>
         <version>${autovalue.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.auto.value</groupId>
-        <artifactId>auto-value-annotations</artifactId>
-        <version>${autovalue.version}</version>
-      </dependency>
       <dependency>
         <groupId>io.opencensus</groupId>
         <artifactId>opencensus-api</artifactId>

From 8e24848afa836c0a1d3475a425ecee7b53ba5986 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 13:45:31 -0700
Subject: [PATCH 12/14] try profiles for autovalue compatibility

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

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index ecf18493e60e..5e26f958046d 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -172,7 +172,6 @@
     <!-- test dependency versions -->
     <easymock.version>3.6</easymock.version>
     <objenesis.version>2.6</objenesis.version>
-    <autovalue.version>1.4</autovalue.version>
   </properties>
   <!-- All non-test dependency versions should be added to google-cloud-bom/pom.xml -->
   <dependencyManagement>
@@ -919,6 +918,35 @@
       </build>
     </profile>
 
+    <profile>
+      <id>autovalue-java7</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <properties>
+        <autovalue.version>1.4</autovalue.version>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>autovalue-java8</id>
+      <activation>
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <properties>
+        <autovalue.version>1.6.6</autovalue.version>
+      </properties>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>com.google.auto.value</groupId>
+            <artifactId>auto-value-annotations</artifactId>
+            <version>${autovalue.version}</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
+
     <profile>
       <!-- Only run checkstyle plugin on Java 8+ (checkstyle artifact only supports Java 8+) -->
       <id>checkstyle-tests</id>

From 278c59d9dfb70a9dceffa83835993f18649ab837 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 14:18:13 -0700
Subject: [PATCH 13/14] exclusion to fix enforcer

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

diff --git a/google-cloud-clients/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml
index d4b9af695a68..94efee8f8ab2 100644
--- a/google-cloud-clients/google-cloud-core/pom.xml
+++ b/google-cloud-clients/google-cloud-core/pom.xml
@@ -53,6 +53,12 @@
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.auto.value</groupId>
+          <artifactId>auto-value-annotations</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

From 93931eb9d616372500d5979d39b2ab2a256c48cd Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 21 Aug 2019 15:19:52 -0700
Subject: [PATCH 14/14] undo exclusion, try via profile

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

diff --git a/google-cloud-clients/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml
index 94efee8f8ab2..d4b9af695a68 100644
--- a/google-cloud-clients/google-cloud-core/pom.xml
+++ b/google-cloud-clients/google-cloud-core/pom.xml
@@ -53,12 +53,6 @@
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.auto.value</groupId>
-          <artifactId>auto-value-annotations</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 5e26f958046d..f20d7148e637 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -926,6 +926,15 @@
       <properties>
         <autovalue.version>1.4</autovalue.version>
       </properties>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>com.google.auto.value</groupId>
+            <artifactId>auto-value-annotations</artifactId>
+            <version>1.6.6</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
     </profile>
 
     <profile>