From cbca213deafea360f7120f8fe7f4e7747ad28e47 Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Thu, 27 May 2021 18:46:07 +0000
Subject: [PATCH 1/2] fix: exclude protobuf from conformance-tests

---
 google-cloud-bigtable/pom.xml | 14 ++++++++++++++
 pom.xml                       | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index d1021dfd2..9c04f238f 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -203,6 +203,20 @@
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-conformance-tests</artifactId>
       <scope>test</scope>
+      <exclusions>
+      <!--
+      * The protos for bigtable are already included in the classpath
+        as the declared dependency above. Exclude it here.
+      * Exclude the firestore protos to prevent creating a dependency
+        diamond with any transitive dependencies.
+      * Exclude protobuf-java to prefer the version declared here
+        in the project.
+      -->
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
diff --git a/pom.xml b/pom.xml
index 01ab3196e..41e17b52c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,20 +163,6 @@
               <groupId>com.google.cloud</groupId>
               <artifactId>google-cloud-conformance-tests</artifactId>
               <version>0.1.0</version>
-              <exclusions>
-                <!--
-                * The protos for bigtable are already included in the classpath
-                  as the declared dependency above. Exclude it here.
-                * Exclude the firestore protos to prevent creating a dependency
-                  diamond with any transitive dependencies.
-                * Exclude protobuf-java to prefer the version declared here
-                  in the project.
-                -->
-                <exclusion>
-                  <groupId>*</groupId>
-                  <artifactId>*</artifactId>
-                </exclusion>
-              </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.google.truth</groupId>

From 64b52d5eb21c1a4b518861a6b346ec86745a3230 Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Thu, 27 May 2021 19:39:23 +0000
Subject: [PATCH 2/2] formatting

---
 google-cloud-bigtable/pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index 9c04f238f..80ed1b2f3 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -204,14 +204,14 @@
       <artifactId>google-cloud-conformance-tests</artifactId>
       <scope>test</scope>
       <exclusions>
-      <!--
-      * The protos for bigtable are already included in the classpath
-        as the declared dependency above. Exclude it here.
-      * Exclude the firestore protos to prevent creating a dependency
-        diamond with any transitive dependencies.
-      * Exclude protobuf-java to prefer the version declared here
-        in the project.
-      -->
+        <!--
+        * The protos for bigtable are already included in the classpath
+          as the declared dependency above. Exclude it here.
+        * Exclude the firestore protos to prevent creating a dependency
+          diamond with any transitive dependencies.
+        * Exclude protobuf-java to prefer the version declared here
+          in the project.
+        -->
         <exclusion>
           <groupId>*</groupId>
           <artifactId>*</artifactId>