From e638fdc5617d06add124b11e3924576cefec388e Mon Sep 17 00:00:00 2001
From: Jonas Witschel <diabonas@gmx.de>
Date: Wed, 16 Oct 2019 11:33:02 +0200
Subject: [PATCH 1/3] Fix building with OpenJDK 6 in Travis CI

OpenJDK 6 is no longer supported in the default build environment of
Travis CI, so downgrade to Ubuntu 14.04 LTS (Trusty Tahr). This version
is EOL (like Java 6), but seems to be the only way to continue building
with OpenJDK 6. Even with the downgraded build environment, a manual
workaround is necessary since the usual "jdk" key does not work.
---
 .travis.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 593f8e14..9a656f81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+# openjdk-6-jdk is not available in more recent Ubuntu versions
+dist: trusty
 language: java
 install:
   # Download dependencies with JDK 8 because Maven Central supports
@@ -23,4 +25,10 @@ jdk:
   - oraclejdk9
   - oraclejdk8
   - openjdk7
-  - openjdk6
+
+# The jdk key does not work for openjdk6 in Travis CI any more, so
+# we manually install openjdk-6-jdk and set JAVA_HOME appropriately
+# (https://github.com/travis-ci/travis-ci/issues/9713)
+matrix:
+  include:
+  - env: JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64

From 735afea4abf862a56b24965c05cea3005f0e461c Mon Sep 17 00:00:00 2001
From: Magnus Reftel <Magnus.Reftel@skatteetaten.no>
Date: Thu, 14 May 2020 13:39:14 +0200
Subject: [PATCH 2/3] Upgrade maven to last version supporting JDK 6

Versions before 3.2.3 don't use https when accessing Maven Central,
which is now required (see MNG-5672).
---
 .mvn/wrapper/maven-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 37cb6158..a7173773 100755
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.1.1/apache-maven-3.1.1-bin.zip
\ No newline at end of file
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.2.5/apache-maven-3.2.5-bin.zip

From d37d1b830fb9d767355bba5af00df40c2f43dad6 Mon Sep 17 00:00:00 2001
From: Magnus Reftel <magnus.reftel@skatteetaten.no>
Date: Mon, 27 Jan 2020 16:14:58 +0100
Subject: [PATCH 3/3] pom: use new junit artifactId

Resolves issues #77, #83
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 984df461..20c29511 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,8 +67,8 @@
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
-			<artifactId>junit-dep</artifactId>
-			<version>[4.9,)</version>
+			<artifactId>junit</artifactId>
+			<version>[4.13.2,)</version>
 		</dependency>
 
 		<dependency>