From 994bcb4c408bb78e27149db3992e0f3e588b0ef8 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 6 Jan 2020 19:14:09 +0000
Subject: [PATCH 1/2] deps: update dependency com.google.guava:guava-bom to
 v28.2-android

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5894374537..ed7967f0d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
     <grpc.version>1.26.0</grpc.version>
     <protobuf.version>3.11.1</protobuf.version>
     <junit.version>4.13</junit.version>
-    <guava.version>28.1-android</guava.version>
+    <guava.version>28.2-android</guava.version>
     <threeten.version>1.4.0</threeten.version>
     <opencensus.version>0.24.0</opencensus.version>
     <mockito.version>1.10.19</mockito.version>

From 810641dc6e229a7b025ad55f508e1a45592d538f Mon Sep 17 00:00:00 2001
From: BenWhitehead <BenWhitehead@users.noreply.github.com>
Date: Thu, 9 Jan 2020 15:51:45 -0500
Subject: [PATCH 2/2] build: add exclusion of error_prone_annotations to
 grpc-api usage

Fixes #33
---
 google-cloud-firestore/pom.xml               | 8 ++++----
 grpc-google-cloud-firestore-admin-v1/pom.xml | 8 ++++----
 grpc-google-cloud-firestore-v1/pom.xml       | 8 ++++----
 grpc-google-cloud-firestore-v1beta1/pom.xml  | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml
index 0871fdfac9..760229854f 100644
--- a/google-cloud-firestore/pom.xml
+++ b/google-cloud-firestore/pom.xml
@@ -93,11 +93,11 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-api</artifactId>
       <exclusions>
-        <!-- currently collides with animal-sniffer-annotations from guava -->
-        <!-- TODO(#33) try to remove after the next bump of guava -->
+        <!-- currently collides with error_prone_annotations from grpc -->
+        <!-- TODO try to remove after the next bump of grpc -->
         <exclusion>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>animal-sniffer-annotations</artifactId>
+          <groupId>com.google.errorprone</groupId>
+          <artifactId>error_prone_annotations</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
diff --git a/grpc-google-cloud-firestore-admin-v1/pom.xml b/grpc-google-cloud-firestore-admin-v1/pom.xml
index a003cd4ac4..2423edb94f 100644
--- a/grpc-google-cloud-firestore-admin-v1/pom.xml
+++ b/grpc-google-cloud-firestore-admin-v1/pom.xml
@@ -36,11 +36,11 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-api</artifactId>
             <exclusions>
-                <!-- currently collides with animal-sniffer-annotations from guava -->
-                <!-- TODO(#33) try to remove after the next bump of guava -->
+                <!-- currently collides with error_prone_annotations from grpc -->
+                <!-- TODO try to remove after the next bump of grpc -->
                 <exclusion>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>animal-sniffer-annotations</artifactId>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_annotations</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml
index 213f64584e..b5ce8cdd3a 100644
--- a/grpc-google-cloud-firestore-v1/pom.xml
+++ b/grpc-google-cloud-firestore-v1/pom.xml
@@ -32,11 +32,11 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-api</artifactId>
             <exclusions>
-                <!-- currently collides with animal-sniffer-annotations from guava -->
-                <!-- TODO(#33) try to remove after the next bump of guava -->
+                <!-- currently collides with error_prone_annotations from grpc -->
+                <!-- TODO try to remove after the next bump of grpc -->
                 <exclusion>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>animal-sniffer-annotations</artifactId>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_annotations</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
diff --git a/grpc-google-cloud-firestore-v1beta1/pom.xml b/grpc-google-cloud-firestore-v1beta1/pom.xml
index 35adcb9b98..b19c085b77 100644
--- a/grpc-google-cloud-firestore-v1beta1/pom.xml
+++ b/grpc-google-cloud-firestore-v1beta1/pom.xml
@@ -32,11 +32,11 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-api</artifactId>
       <exclusions>
-        <!-- currently collides with animal-sniffer-annotations from guava -->
-        <!-- TODO(#33) try to remove after the next bump of guava -->
+        <!-- currently collides with error_prone_annotations from grpc -->
+        <!-- TODO try to remove after the next bump of grpc -->
         <exclusion>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>animal-sniffer-annotations</artifactId>
+          <groupId>com.google.errorprone</groupId>
+          <artifactId>error_prone_annotations</artifactId>
         </exclusion>
       </exclusions>
     </dependency>