From 9f20ef53c36dada2abccd40ce5c4fb676497e30a Mon Sep 17 00:00:00 2001
From: Ajit Thakor <ajit.thakor@qlogic.io>
Date: Thu, 6 Feb 2020 16:51:54 +0530
Subject: [PATCH] fix: remove error_prone_annotations exclusion rules from poms

---
 google-cloud-firestore/pom.xml               | 8 --------
 grpc-google-cloud-firestore-admin-v1/pom.xml | 8 --------
 grpc-google-cloud-firestore-v1/pom.xml       | 8 --------
 grpc-google-cloud-firestore-v1beta1/pom.xml  | 8 --------
 4 files changed, 32 deletions(-)

diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml
index e78337b402..776fe22b81 100644
--- a/google-cloud-firestore/pom.xml
+++ b/google-cloud-firestore/pom.xml
@@ -92,14 +92,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/grpc-google-cloud-firestore-admin-v1/pom.xml b/grpc-google-cloud-firestore-admin-v1/pom.xml
index 2c032741d6..2301dbd5f3 100644
--- a/grpc-google-cloud-firestore-admin-v1/pom.xml
+++ b/grpc-google-cloud-firestore-admin-v1/pom.xml
@@ -35,14 +35,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.protobuf</groupId>
diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml
index b04d8d8c18..c71f4e3d86 100644
--- a/grpc-google-cloud-firestore-v1/pom.xml
+++ b/grpc-google-cloud-firestore-v1/pom.xml
@@ -31,14 +31,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.protobuf</groupId>
diff --git a/grpc-google-cloud-firestore-v1beta1/pom.xml b/grpc-google-cloud-firestore-v1beta1/pom.xml
index ac9ec3f206..11c4c90f6e 100644
--- a/grpc-google-cloud-firestore-v1beta1/pom.xml
+++ b/grpc-google-cloud-firestore-v1beta1/pom.xml
@@ -31,14 +31,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.protobuf</groupId>