From 5c653cb3bd0cae61b908ce106b40681ec3b081b6 Mon Sep 17 00:00:00 2001
From: Peter Schuller <schuller@audriga.com>
Date: Tue, 22 Jan 2019 08:36:09 +0100
Subject: [PATCH 1/4] fixes unclosed scanner

---
 src/test/java/com/github/bordertech/buildtools/BadgerTest.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/com/github/bordertech/buildtools/BadgerTest.java b/src/test/java/com/github/bordertech/buildtools/BadgerTest.java
index 473c9c1..668875a 100644
--- a/src/test/java/com/github/bordertech/buildtools/BadgerTest.java
+++ b/src/test/java/com/github/bordertech/buildtools/BadgerTest.java
@@ -186,9 +186,11 @@ public static boolean contains(final File file, final String search) {
 			while (scanner.hasNextLine()) {
 				String line = scanner.nextLine();
 				if (line.contains(search)) {
+					scanner.close();
 					return true;
 				}
 			}
+			scanner.close();
 		} catch (FileNotFoundException ex) {
 			Assert.fail(ex.getMessage());
 		}

From 0867187a5292e2c1d087a41b2466d22e3e6b6376 Mon Sep 17 00:00:00 2001
From: Peter Schuller <schuller@audriga.com>
Date: Wed, 23 Jan 2019 08:29:13 +0100
Subject: [PATCH 2/4] pins to last known docker working image

As tests were running properly on my machine I did some research.
https://discuss.circleci.com/t/the-forked-vm-terminated-without-properly-saying-goodbye-while-running-tests/26246
indicated that changes to the image might be the reason for the failing
build. To verify this I selected the last known working configuration in
this commit.
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2487d83..0ba37f8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/openjdk:8-jdk
+      - image: circleci/openjdk@sha256:3966b1286381d1785a0ec66ae6f456ec4a1c70010f042f408f0eabf121297ba8
       
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images

From 5247f518b0ac36f867d09e3f29d17ad473c95b95 Mon Sep 17 00:00:00 2001
From: Peter Schuller <schuller@audriga.com>
Date: Wed, 23 Jan 2019 08:43:03 +0100
Subject: [PATCH 3/4] Revert "pins to last known docker working image"

Older docker image is not available anymore.
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0ba37f8..2487d83 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/openjdk@sha256:3966b1286381d1785a0ec66ae6f456ec4a1c70010f042f408f0eabf121297ba8
+      - image: circleci/openjdk:8-jdk
       
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images

From dcec25c76e2e579726bbd76fc5e5f9b0997c5a45 Mon Sep 17 00:00:00 2001
From: Peter Schuller <schuller@audriga.com>
Date: Wed, 23 Jan 2019 09:24:02 +0100
Subject: [PATCH 4/4] should fix surefire now

The issue is also being discussed at the debian mailing list
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
They either suggest a downgrade of java or a not to use the
system class loader. I've added configuration for the latter.
---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index 79a5c7f..9c75f25 100755
--- a/pom.xml
+++ b/pom.xml
@@ -60,4 +60,16 @@
 		</dependency>
 	</dependencies>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.20</version>
+				<configuration>
+					<useSystemClassLoader>false</useSystemClassLoader>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>