From 35feb8fb115f41d6ad55298182b5cc4093db984d Mon Sep 17 00:00:00 2001
From: Sam Laane <laane@google.com>
Date: Mon, 19 Nov 2018 21:07:06 -0800
Subject: [PATCH 1/3] Try adding maven-surefire-plugin as a plugin to pull the
 correct surefire-junit.

---
 .../google-cloud-bigtable-admin/pom.xml       | 30 +++++++++++--------
 .../google-cloud-bigtable/pom.xml             | 30 +++++++++++--------
 .../google-cloud-logging/pom.xml              | 20 +++++++++----
 3 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
index ab45d364a4c3..fddcd53fce2c 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
@@ -93,11 +93,6 @@
       <artifactId>grpc-testing</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-junit4</artifactId>
-	  <version>2.19.1</version>
-    </dependency>
   </dependencies>
   <profiles>
     <profile>
@@ -130,13 +125,24 @@
           <perCoreThreadCount>true</perCoreThreadCount>
           <threadCount>2</threadCount>
         </configuration>
-		<dependencies>
- 		  <dependency>
- 			<groupId>org.apache.maven.surefire</groupId>
- 			<artifactId>surefire-junit4</artifactId>
-			<version>2.19.1</version>
- 		  </dependency>
- 		</dependencies>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.19.1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.19.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>
diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index dc13b324cf2c..2f7641c2ec58 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -96,11 +96,6 @@
       <artifactId>grpc-testing</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-junit4</artifactId>
-      <version>2.19.1</version>
-    </dependency>
   </dependencies>
   <profiles>
     <profile>
@@ -133,13 +128,24 @@
           <perCoreThreadCount>true</perCoreThreadCount>
           <threadCount>2</threadCount>
         </configuration>
-	<dependencies>
-	  <dependency>
-	    <groupId>org.apache.maven.surefire</groupId>
-	    <artifactId>surefire-junit4</artifactId>
-	    <version>2.19.1</version>
-	  </dependency>
-	</dependencies>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.maven.surefire</groupId>
+        <artifactId>surefire-junit4</artifactId>
+        <version>2.19.1</version>
+      </dependency>
+    </dependencies>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.19.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>
diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
index fbe5d8796a53..00d550d35edd 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -88,10 +88,20 @@
       <classifier>testlib</classifier>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-junit4</artifactId>
-      <version>2.19.1</version>
-    </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.19.1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
 </project>

From 7179c2216c8713009386af67c10ee2a9896d44e6 Mon Sep 17 00:00:00 2001
From: Sam Laane <laane@google.com>
Date: Tue, 20 Nov 2018 09:55:43 -0800
Subject: [PATCH 2/3] Let's move the surefire-junit4 out of util as well to be
 consistant.

---
 google-cloud-util/pom.xml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index 24b6a31323d7..ab0966fca4ec 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -19,15 +19,21 @@
       <artifactId>maven-surefire-plugin</artifactId>
       <version>2.17</version>
       <scope>test</scope>
-    </dependency>
-	<dependency>
-      <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-junit4</artifactId>
-      <version>2.17</version>
     </dependency>
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.17</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.17</version>
+          </dependency>
+        </dependencies>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>

From 754d9fbb9bbf193824c25c70926417086c9e862f Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 27 Nov 2018 16:52:43 -0800
Subject: [PATCH 3/3] Fix indentation in pom

---
 google-cloud-clients/google-cloud-bigtable/pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index 2f7641c2ec58..44b96703f386 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -128,13 +128,13 @@
           <perCoreThreadCount>true</perCoreThreadCount>
           <threadCount>2</threadCount>
         </configuration>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.maven.surefire</groupId>
-        <artifactId>surefire-junit4</artifactId>
-        <version>2.19.1</version>
-      </dependency>
-    </dependencies>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.19.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>