fix: remove temporary added animal-sniffer-annotations exclusion rule…

… from pom
googleapis · Jan 7, 2020 · 27f138a · 27f138a
1 parent 067289f
commit 27f138a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -159,7 +159,7 @@
     <grpc.version>1.26.0</grpc.version>
     <protobuf.version>3.11.1</protobuf.version>
     <junit.version>4.12</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>