From fde0a9fcf38c74143b896a6e6b282047d7dadb6f Mon Sep 17 00:00:00 2001
From: Ajit Thakor <49403056+athakor@users.noreply.github.com>
Date: Fri, 10 Jan 2020 02:06:48 +0530
Subject: [PATCH] fix: remove temporary added animal-sniffer-annotations
 exclusion rule from pom (#16)

| Package | Update | Change |
|---|---|---|
| com.google.guava:guava-bom | minor | `28.1-android` -> `28.2-android` |

The new version of Guava no longer has a dependency on `org.codehaus.mojo:animal-sniffer-annotations`
Fixes #3
---
 google-cloud-datastore/pom.xml | 8 ++++----
 pom.xml                        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 28f10ddf8..a71a4faad 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -34,11 +34,11 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-api</artifactId>
       <exclusions>
-        <!-- currently collides with animal-sniffer-annotations from guava -->
-        <!-- TODO(#3) 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/pom.xml b/pom.xml
index c9d80a678..d4aecb852 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>