From d44952b2fbe5e90956fce9498e36e506fcc60dc8 Mon Sep 17 00:00:00 2001
From: Thom Leggett <thom@tteggel.org>
Date: Thu, 15 Nov 2018 09:09:51 +0000
Subject: [PATCH] Upgraded java on circleci base images breaks surefire

---
 .circleci/config.yml               |  3 +++
 .circleci/fix-java-for-surefire.sh | 19 +++++++++++++++++++
 images/build/pom.xml               | 10 ++++++++++
 integration-tests/pom.xml          |  9 +++++++++
 pom.xml                            |  9 +++++++++
 5 files changed, 50 insertions(+)
 create mode 100755 .circleci/fix-java-for-surefire.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23fe9b7a..e8a142bf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,6 +17,9 @@ jobs:
       - run:
           name: Install fn binary (as it is needed for the integration tests)
           command: ./.circleci/install-fn.sh
+      - run:
+          name: Workaround for https://issues.apache.org/jira/browse/SUREFIRE-1588
+          command: ./.circleci/fix-java-for-surefire.sh
       - run:
           name: Install junit-merge
           command: npm install -g junit-merge
diff --git a/.circleci/fix-java-for-surefire.sh b/.circleci/fix-java-for-surefire.sh
new file mode 100755
index 00000000..7daf6372
--- /dev/null
+++ b/.circleci/fix-java-for-surefire.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -ex
+
+cat << 'EOF' > $HOME/.m2/settings.xml
+<settings>
+  <profiles>
+    <profile>
+      <id>SUREFIRE-1588</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+      </properties>
+    </profile>
+  </profiles>
+</settings>
+EOF
diff --git a/images/build/pom.xml b/images/build/pom.xml
index 2a2e01cc..21ad0c0b 100644
--- a/images/build/pom.xml
+++ b/images/build/pom.xml
@@ -11,6 +11,8 @@
 
         <fdk.version>1.0.0-SNAPSHOT</fdk.version>
         <fn.repo.url>http://172.17.0.1:18080</fn.repo.url>
+
+        <surefire.version>2.22.1</surefire.version>
     </properties>
 
     <!-- The artifact is irrelevant, this pom is only used to download dependencies. -->
@@ -55,6 +57,14 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.version}</version>
+                <configuration>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 8eb7e9ad..5aa3be24 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -11,6 +11,7 @@
     <version>1.0.0-SNAPSHOT</version>
     <properties>
         <jackson.version>2.9.6</jackson.version>
+        <surefire.version>2.22.1</surefire.version>
         <junit.version>4.12</junit.version>
         <commons-io.version>2.5</commons-io.version>
         <assertj-core.version>3.6.2</assertj-core.version>
@@ -72,6 +73,14 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.version}</version>
+                <configuration>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/pom.xml b/pom.xml
index be1c5883..9d8257a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
         <jetty.version>9.4.12.v20180830</jetty.version>
         <!--TDD-->
         <jacoco.version>0.8.1</jacoco.version>
+        <surefire.version>2.22.1</surefire.version>
         <junit.version>4.12</junit.version>
         <mockito.version>2.21.0</mockito.version>
         <assertj-core.version>3.10.0</assertj-core.version>
@@ -208,6 +209,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.version}</version>
+                <configuration>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>