From 3122a61b24904758f3cc4781cc61198f425af841 Mon Sep 17 00:00:00 2001
From: Sam Laane <laane@google.com>
Date: Wed, 10 Oct 2018 00:06:08 +0000
Subject: [PATCH 01/11] Added explicit sunfire-junit depency to pull it in for
 offline mode.

Without this dependency explicitly listed java mvn dependency:go-offline will not pull it in and mvn -o verify will not work (Unless the tests have been run in online mode. In this case the cached surefire junit can still be used.)
---
 google-cloud-clients/google-cloud-bigtable/pom.xml | 12 ++++++++++++
 google-cloud-clients/google-cloud-spanner/pom.xml  | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index 0ca537829887..3401d6d4fe2b 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -96,6 +96,11 @@
       <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>
@@ -128,6 +133,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>
       </plugin>
     </plugins>
   </build>
diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
index 55cb9332ddc7..353cfc0155f3 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -51,6 +51,13 @@
           <skipTests>${skipUnitTests}</skipTests>
           <reportNameSuffix>sponge_log</reportNameSuffix>
         </configuration>
+	<dependencies>
+	  <dependency>
+	    <groupId>org.apache.maven.surefire</groupId>
+	    <artifactId>surefire-junit4</artifactId>
+	    <version>2.12.4</version>
+	  </dependency>
+	</dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -191,5 +198,10 @@
       <artifactId>json</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>surefire-junit4</artifactId>
+      <version>2.12.4</version>
+    </dependency>
   </dependencies>
 </project>

From fa627dcd353dc731a4ceb530306d3d4ae7662788 Mon Sep 17 00:00:00 2001
From: Sam Laane <laane@google.com>
Date: Mon, 15 Oct 2018 10:32:53 -0700
Subject: [PATCH 02/11] Adding Surefire depency to bigtable admin and logging
 as well.

---
 google-cloud-clients/google-cloud-bigtable-admin/pom.xml | 5 +++++
 google-cloud-clients/google-cloud-logging/pom.xml        | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
index 5afb779f1ebb..9311c1243833 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
@@ -93,6 +93,11 @@
       <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>
diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
index 8e94454beea9..21e7510fe262 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -88,5 +88,10 @@
       <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>
 </project>

From 6070e686f33209b2bfc13a017efbcbfa33f2fcf0 Mon Sep 17 00:00:00 2001
From: Sam Laane <laane@google.com>
Date: Wed, 17 Oct 2018 16:44:04 -0700
Subject: [PATCH 03/11] Looks like I need to tell the plugin that it's using
 the version I'm pulling in.

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

diff --git a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
index 9311c1243833..a046acee386d 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
@@ -130,6 +130,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>
       </plugin>
     </plugins>
   </build>

From 1f0b47fbf500cd49895de0f744fda9755d6a3657 Mon Sep 17 00:00:00 2001
From: Sam Laane <laane@google.com>
Date: Thu, 18 Oct 2018 11:21:57 -0700
Subject: [PATCH 04/11] Looks like the Google Cloud Java Compatibility Checker
 test require surefire version 2.17

[INFO] Building Google Cloud Java Compatibility Checker 0.67.1-alpha-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[WARNING] The POM for org.apache.maven.plugins:maven-surefire-plugin:jar:2.17 is missing, no dependency information available
---
 google-cloud-util/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index 72c8837b7339..b72bc186ba63 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -32,5 +32,12 @@
         </configuration>
       </plugin>
     </plugins>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.maven.surefire</groupId>
+        <artifactId>surefire-junit4</artifactId>
+        <version>2.17</version>
+      </dependency>
+    </dependencies>
   </build>
 </project>

From ba1f31889274c67f9b287af873c5c68c3133d782 Mon Sep 17 00:00:00 2001
From: Sam Laane <laane@google.com>
Date: Thu, 18 Oct 2018 12:07:22 -0700
Subject: [PATCH 05/11] dependecies is not under build.

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

diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index b72bc186ba63..d83c3114cc87 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -13,6 +13,13 @@
   <modules>
     <module>google-cloud-compat-checker</module>
   </modules>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>surefire-junit4</artifactId>
+      <version>2.17</version>
+    </dependency>
+  </dependencies>
   <build>
     <plugins>
       <plugin>
@@ -32,12 +39,5 @@
         </configuration>
       </plugin>
     </plugins>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.maven.surefire</groupId>
-        <artifactId>surefire-junit4</artifactId>
-        <version>2.17</version>
-      </dependency>
-    </dependencies>
   </build>
 </project>

From 30fb767819d2b02e3c89c47adda11ccf6afb4efe Mon Sep 17 00:00:00 2001
From: Sam Laane <samlaane@gmail.com>
Date: Thu, 18 Oct 2018 12:57:58 -0700
Subject: [PATCH 06/11] Some of the GRPC library need dependencies need
 surefire 2.17

[INFO] ------------------------------------------------------------------------
[INFO] Building Google Cloud API gRPC 0.32.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building proto-google-cloud-asset-v1beta1 0.32.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[WARNING] The POM for org.apache.maven.plugins:maven-surefire-plugin:jar:2.17 is missing, no dependency information available
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Skipping grpc-google-cloud-asset-v1beta1
[INFO] This project has been banned from the build due to previous failures.
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building proto-google-cloud-automl-v1beta1 0.32.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[WARNING] The POM for org.apache.maven.plugins:maven-surefire-plugin:jar:2.17 is missing, no dependency information available
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Skipping grpc-google-cloud-automl-v1beta1
[INFO] This project has been banned from the build due to previous failures.
[INFO] ------------------------------------------------------------------------
---
 google-cloud-clients/pom.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index dbc4bb99d7ad..70f0daf20c74 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -169,6 +169,14 @@
     <objenesis.version>2.6</objenesis.version>
   </properties>
   <!-- All non-test dependency versions should be added to google-cloud-bom/pom.xml -->
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>maven-surefire-plugin</artifactId>
+      <version>2.17</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -193,7 +201,6 @@
         <artifactId>datastore-v1-proto-client</artifactId>
         <version>1.6.0</version>
       </dependency>
-
       <dependency>
         <groupId>com.google.apis</groupId>
         <artifactId>google-api-services-dns</artifactId>

From baade249e5e19d25478824d5a03857de25c1d8a4 Mon Sep 17 00:00:00 2001
From: Sam Laane <samlaane@gmail.com>
Date: Thu, 18 Oct 2018 14:16:48 -0700
Subject: [PATCH 07/11] Looks like the file path is org.apache.maven.plugins

---
 google-cloud-clients/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 70f0daf20c74..597411a6af8c 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -171,7 +171,7 @@
   <!-- All non-test dependency versions should be added to google-cloud-bom/pom.xml -->
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.surefire</groupId>
+      <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-surefire-plugin</artifactId>
       <version>2.17</version>
       <scope>test</scope>

From acd321c83e9af36dd5717e754643fbea8f54184d Mon Sep 17 00:00:00 2001
From: Sam Laane <laane@google.com>
Date: Thu, 18 Oct 2018 16:21:48 -0700
Subject: [PATCH 08/11] lets try putting the in utils. It looks like utill uses
 surefire 2.17

---
 google-cloud-clients/pom.xml | 8 --------
 google-cloud-util/pom.xml    | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index b36ade64b32f..c8622d9a35ac 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -169,14 +169,6 @@
     <objenesis.version>2.6</objenesis.version>
   </properties>
   <!-- All non-test dependency versions should be added to google-cloud-bom/pom.xml -->
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-surefire-plugin</artifactId>
-      <version>2.17</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
   <dependencyManagement>
     <dependencies>
       <dependency>
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index d83c3114cc87..d43299b7118b 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -15,6 +15,12 @@
   </modules>
   <dependencies>
     <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <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>

From bc184f7de59b1176fbdada9155919d6ac3c4f57a Mon Sep 17 00:00:00 2001
From: Sam Laane <laane@google.com>
Date: Tue, 23 Oct 2018 16:18:11 -0700
Subject: [PATCH 09/11] Looks like spanner uses surefire-junit47 instead of
 surefire-junit4

---
 google-cloud-clients/google-cloud-bigtable-admin/pom.xml | 2 --
 google-cloud-clients/google-cloud-spanner/pom.xml        | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
index a046acee386d..5d865bd74c05 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
@@ -96,7 +96,6 @@
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-junit4</artifactId>
-      <version>2.19.1</version>
     </dependency>
   </dependencies>
   <profiles>
@@ -134,7 +133,6 @@
  		  <dependency>
  			<groupId>org.apache.maven.surefire</groupId>
  			<artifactId>surefire-junit4</artifactId>
- 			<version>2.19.1</version>
  		  </dependency>
  		</dependencies>
       </plugin>
diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
index 3ed01ef9cf2f..ac6e524f40d6 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -54,7 +54,7 @@
 	<dependencies>
 	  <dependency>
 	    <groupId>org.apache.maven.surefire</groupId>
-	    <artifactId>surefire-junit4</artifactId>
+	    <artifactId>surefire-junit47</artifactId>
 	    <version>2.12.4</version>
 	  </dependency>
 	</dependencies>
@@ -200,7 +200,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-junit4</artifactId>
+      <artifactId>surefire-junit47</artifactId>
       <version>2.12.4</version>
     </dependency>
   </dependencies>

From 39537b21f5867df3e85c53cc7502a22f13372828 Mon Sep 17 00:00:00 2001
From: Sam Laane <laane@google.com>
Date: Tue, 23 Oct 2018 19:26:34 -0700
Subject: [PATCH 10/11] Re-add bigtable admin version

---
 google-cloud-clients/google-cloud-bigtable-admin/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
index 5d865bd74c05..1aee7e32a5d2 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
@@ -96,6 +96,7 @@
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-junit4</artifactId>
+	  <version>2.19.1</version>
     </dependency>
   </dependencies>
   <profiles>
@@ -133,6 +134,7 @@
  		  <dependency>
  			<groupId>org.apache.maven.surefire</groupId>
  			<artifactId>surefire-junit4</artifactId>
+			<version>2.19.1</version>
  		  </dependency>
  		</dependencies>
       </plugin>

From 4efa653eeb18f03b741069d9f27b88e68f52ed9c Mon Sep 17 00:00:00 2001
From: Sam Laane <laane@google.com>
Date: Wed, 24 Oct 2018 12:55:33 -0700
Subject: [PATCH 11/11] Lets not include spanner with this PR.

---
 google-cloud-clients/google-cloud-spanner/pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
index ac6e524f40d6..9a0676bb16d5 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -51,13 +51,6 @@
           <skipTests>${skipUnitTests}</skipTests>
           <reportNameSuffix>sponge_log</reportNameSuffix>
         </configuration>
-	<dependencies>
-	  <dependency>
-	    <groupId>org.apache.maven.surefire</groupId>
-	    <artifactId>surefire-junit47</artifactId>
-	    <version>2.12.4</version>
-	  </dependency>
-	</dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -198,10 +191,5 @@
       <artifactId>json</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-junit47</artifactId>
-      <version>2.12.4</version>
-    </dependency>
   </dependencies>
 </project>