fix: remove error_prone_annotations exclusion rules from poms

googleapis · Jan 31, 2020 · 8446bce · 8446bce
1 parent d6d74a1
commit 8446bce
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
@@ -33,14 +33,6 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-api</artifactId>
-      <exclusions>
-        <!-- currently collides with error_prone_annotations from grpc -->
-        <!-- TODO: try to remove after the next bump of grpc -->
-        <exclusion>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_annotations</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.api</groupId>

diff --git a/pom.xml b/pom.xml
@@ -156,7 +156,7 @@
     <google.api-common.version>1.8.1</google.api-common.version>
     <google.common-protos.version>1.17.0</google.common-protos.version>
     <gax.version>1.52.0</gax.version>
-    <grpc.version>1.26.0</grpc.version>
+    <grpc.version>1.27.0</grpc.version>
     <protobuf.version>3.11.1</protobuf.version>
     <junit.version>4.13</junit.version>
     <guava.version>28.2-android</guava.version>