Skip to content

Commit c1dcb9f

Browse files
BenWhiteheadWhiteSource Renovate
andauthored
deps: update dependency com.google.guava:guava-bom to v28.2-android (#76)
* deps: update dependency com.google.guava:guava-bom to v28.2-android * build: add exclusion of error_prone_annotations to grpc-api usage Fixes #33 Co-authored-by: WhiteSource Renovate <renovatebot@gmail.com>
1 parent 2f3a14b commit c1dcb9f

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

google-cloud-firestore/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@
9393
<groupId>io.grpc</groupId>
9494
<artifactId>grpc-api</artifactId>
9595
<exclusions>
96-
<!-- currently collides with animal-sniffer-annotations from guava -->
97-
<!-- TODO(#33) try to remove after the next bump of guava -->
96+
<!-- currently collides with error_prone_annotations from grpc -->
97+
<!-- TODO try to remove after the next bump of grpc -->
9898
<exclusion>
99-
<groupId>org.codehaus.mojo</groupId>
100-
<artifactId>animal-sniffer-annotations</artifactId>
99+
<groupId>com.google.errorprone</groupId>
100+
<artifactId>error_prone_annotations</artifactId>
101101
</exclusion>
102102
</exclusions>
103103
</dependency>

grpc-google-cloud-firestore-admin-v1/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
<groupId>io.grpc</groupId>
3737
<artifactId>grpc-api</artifactId>
3838
<exclusions>
39-
<!-- currently collides with animal-sniffer-annotations from guava -->
40-
<!-- TODO(#33) try to remove after the next bump of guava -->
39+
<!-- currently collides with error_prone_annotations from grpc -->
40+
<!-- TODO try to remove after the next bump of grpc -->
4141
<exclusion>
42-
<groupId>org.codehaus.mojo</groupId>
43-
<artifactId>animal-sniffer-annotations</artifactId>
42+
<groupId>com.google.errorprone</groupId>
43+
<artifactId>error_prone_annotations</artifactId>
4444
</exclusion>
4545
</exclusions>
4646
</dependency>

grpc-google-cloud-firestore-v1/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
<groupId>io.grpc</groupId>
3333
<artifactId>grpc-api</artifactId>
3434
<exclusions>
35-
<!-- currently collides with animal-sniffer-annotations from guava -->
36-
<!-- TODO(#33) try to remove after the next bump of guava -->
35+
<!-- currently collides with error_prone_annotations from grpc -->
36+
<!-- TODO try to remove after the next bump of grpc -->
3737
<exclusion>
38-
<groupId>org.codehaus.mojo</groupId>
39-
<artifactId>animal-sniffer-annotations</artifactId>
38+
<groupId>com.google.errorprone</groupId>
39+
<artifactId>error_prone_annotations</artifactId>
4040
</exclusion>
4141
</exclusions>
4242
</dependency>

grpc-google-cloud-firestore-v1beta1/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
<groupId>io.grpc</groupId>
3333
<artifactId>grpc-api</artifactId>
3434
<exclusions>
35-
<!-- currently collides with animal-sniffer-annotations from guava -->
36-
<!-- TODO(#33) try to remove after the next bump of guava -->
35+
<!-- currently collides with error_prone_annotations from grpc -->
36+
<!-- TODO try to remove after the next bump of grpc -->
3737
<exclusion>
38-
<groupId>org.codehaus.mojo</groupId>
39-
<artifactId>animal-sniffer-annotations</artifactId>
38+
<groupId>com.google.errorprone</groupId>
39+
<artifactId>error_prone_annotations</artifactId>
4040
</exclusion>
4141
</exclusions>
4242
</dependency>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<grpc.version>1.26.0</grpc.version>
160160
<protobuf.version>3.11.1</protobuf.version>
161161
<junit.version>4.13</junit.version>
162-
<guava.version>28.1-android</guava.version>
162+
<guava.version>28.2-android</guava.version>
163163
<threeten.version>1.4.0</threeten.version>
164164
<opencensus.version>0.24.0</opencensus.version>
165165
<mockito.version>1.10.19</mockito.version>

0 commit comments

Comments
 (0)