From fe59de257cd8535d486c11a67df8db664c7379b4 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Wed, 16 Jan 2019 15:10:12 -0800
Subject: [PATCH] Update maven-surefire-plugin to 3.0.0-M3 to fix Java 8
 classloader (#4344)

* Update maven-surefire-plugin to 3.0.0-M3 to fix Java 8 classloader

* Update failsafe plugin to 3.0.0-M3 too

* Specify maven-surefire-plugin version in bigtable-emulator
---
 google-cloud-clients/google-cloud-bigtable/pom.xml        | 8 ++++----
 google-cloud-clients/google-cloud-logging/pom.xml         | 4 ++--
 google-cloud-clients/google-cloud-spanner/pom.xml         | 4 ++--
 google-cloud-clients/pom.xml                              | 6 +++---
 google-cloud-examples/pom.xml                             | 4 ++--
 .../google-cloud-bigtable-emulator/pom.xml                | 5 +++++
 google-cloud-util/pom.xml                                 | 6 +++---
 7 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index f5e5616dc578..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,18 +121,18 @@
           <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>
       <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>
             <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 68c93ef66b6f..28a158cd025b 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -96,12 +96,12 @@
     <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>
             <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 f5d89d02698e..81e8f2826340 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>
@@ -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 7e05ee2fae17..3fafd1597153 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -516,7 +516,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>
@@ -574,7 +574,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>
@@ -906,7 +906,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-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>
 
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index 5575493c9ed1..ebdb3f6ff70e 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,12 +25,12 @@
     <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>
             <artifactId>surefire-junit4</artifactId>
-            <version>2.17</version>
+            <version>3.0.0-M3</version>
           </dependency>
         </dependencies>
       </plugin>