From 72cc6dd981ec2af11425f1fb6348f9c07a8a1e73 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 7 Nov 2018 13:35:34 -0500
Subject: [PATCH 1/2] A less intrusive workaround for SUREFIRE-1588.

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a304a29efb..1aeb83c60d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -316,7 +316,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M1</version>
+          <version>2.20</version>
         </plugin>
         <plugin>
           <artifactId>maven-failsafe-plugin</artifactId>
@@ -742,6 +742,8 @@
               <value>${surefireTempDir}</value>
             </property>
           </systemProperties>
+          <!-- SUREFIRE-1588 workaround; too late for systemProperties: -->
+          <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
           <runOrder>alphabetical</runOrder>
         </configuration>
       </plugin>

From b6f429a867f1b75cda4a3f5d12b660523965ddcb Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 7 Nov 2018 16:04:48 -0500
Subject: [PATCH 2/2] Need to consolidate against earlier argLine.

---
 pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1aeb83c60d..67bca12d10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <releaseProfiles> </releaseProfiles>
     <arguments> </arguments>
-    <argLine>-Xmx768M -Djava.awt.headless=true</argLine>
+    <!-- disableClassPathURLCheck is SUREFIRE-1588 workaround; too late for systemProperties: -->
+    <argLine>-Xmx768M -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
     <jenkins.version>2.60.1</jenkins.version>
     <!-- Should only need to override these if using timestamped snapshots (but better to use Incrementals instead): -->
     <jenkins-core.version>${jenkins.version}</jenkins-core.version>
@@ -742,8 +743,6 @@
               <value>${surefireTempDir}</value>
             </property>
           </systemProperties>
-          <!-- SUREFIRE-1588 workaround; too late for systemProperties: -->
-          <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
           <runOrder>alphabetical</runOrder>
         </configuration>
       </plugin>