From 91a4f8794e6cf405ccb62478ebfb4d05104cb17b Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 15 Jan 2019 10:08:20 -0800
Subject: [PATCH 1/3] Update maven-surefire-plugin to 3.0.0-M3 to fix Java 8
 classloader

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

diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index f5e5616dc578..b8f46a2128d7 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -127,7 +127,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>3.0.0-M3</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
index 68c93ef66b6f..2070061a72ec 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -96,7 +96,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>3.0.0-M3</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
index 6ba733b0d6c6..110d8a975faa 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12.4</version>
+        <version>3.0.0-M3</version>
         <configuration>
           <excludedGroups>com.google.cloud.spanner.IntegrationTest</excludedGroups>
           <reportNameSuffix>sponge_log</reportNameSuffix>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index c01bdbea913f..9d4030b13e0d 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -515,7 +515,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>3.0.0-M3</version>
         <configuration>
           <!-- Excludes integration tests and smoke tests when unit tests are run -->
           <excludes>
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index 5575493c9ed1..2fabdd6afac9 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-surefire-plugin</artifactId>
-      <version>2.17</version>
+      <version>3.0.0-M3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -25,7 +25,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.17</version>
+        <version>3.0.0-M3</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>

From ac3faac3061cf8d81c10c2ee021edee25428fbc0 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 15 Jan 2019 10:58:03 -0800
Subject: [PATCH 2/3] Update failsafe plugin to 3.0.0-M3 too

---
 google-cloud-clients/google-cloud-bigtable/pom.xml | 6 +++---
 google-cloud-clients/google-cloud-logging/pom.xml  | 2 +-
 google-cloud-clients/google-cloud-spanner/pom.xml  | 2 +-
 google-cloud-clients/pom.xml                       | 4 ++--
 google-cloud-examples/pom.xml                      | 4 ++--
 google-cloud-util/pom.xml                          | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index b8f46a2128d7..5fe54ce7457b 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -103,7 +103,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>3.0.0-M3</version>
         <executions>
           <execution>
             <goals>
@@ -121,7 +121,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-junit4</artifactId>
-            <version>2.19.1</version>
+            <version>3.0.0-M3</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -132,7 +132,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-junit4</artifactId>
-            <version>2.19.1</version>
+            <version>3.0.0-M3</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
index 2070061a72ec..28a158cd025b 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -101,7 +101,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-junit4</artifactId>
-            <version>2.19.1</version>
+            <version>3.0.0-M3</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 110d8a975faa..b226f64d5d31 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>3.0.0-M3</version>
         <configuration>
           <systemPropertyVariables>
             <spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 9d4030b13e0d..4ec351a6de69 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -573,7 +573,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>3.0.0-M3</version>
         <executions>
           <execution>
             <goals>
@@ -905,7 +905,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.19.1</version>
+            <version>3.0.0-M3</version>
             <executions>
               <execution>
                 <goals>
diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
index 4e9548286f2d..3cf54eda1279 100644
--- a/google-cloud-examples/pom.xml
+++ b/google-cloud-examples/pom.xml
@@ -189,7 +189,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>3.0.0-M3</version>
         <configuration>
           <excludes>
             <exclude>**/IT*.java</exclude>
@@ -223,7 +223,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.19.1</version>
+            <version>3.0.0-M3</version>
             <configuration>
               <excludes combine.self="override"></excludes>
           </configuration>
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index 2fabdd6afac9..ebdb3f6ff70e 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -30,7 +30,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-junit4</artifactId>
-            <version>2.17</version>
+            <version>3.0.0-M3</version>
           </dependency>
         </dependencies>
       </plugin>

From f96e9c5c0063dc3988ddf673c5324d4354a98fe2 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 15 Jan 2019 12:21:04 -0800
Subject: [PATCH 3/3] Specify maven-surefire-plugin version in
 bigtable-emulator

---
 google-cloud-testing/google-cloud-bigtable-emulator/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/google-cloud-testing/google-cloud-bigtable-emulator/pom.xml b/google-cloud-testing/google-cloud-bigtable-emulator/pom.xml
index e39665d3ffb6..b016b5a42d8a 100644
--- a/google-cloud-testing/google-cloud-bigtable-emulator/pom.xml
+++ b/google-cloud-testing/google-cloud-bigtable-emulator/pom.xml
@@ -113,6 +113,11 @@
           <autoReleaseAfterClose>false</autoReleaseAfterClose>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0-M3</version>
+      </plugin>
     </plugins>
   </build>