Skip to content

Commit

Permalink
fix: remove temporary added animal-sniffer-annotations exclusion rule…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
athakor authored and BenWhitehead committed Jan 9, 2020
1 parent 6391955 commit fde0a9f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions google-cloud-datastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit fde0a9f

Please sign in to comment.