From 9ba42609cc1b409d9f96a85c491b2f2d20a7cbe7 Mon Sep 17 00:00:00 2001
From: Christoph John <christoph.john@macd.com>
Date: Mon, 19 Oct 2020 13:46:06 +0200
Subject: [PATCH 1/7] Create maven.yml

---
 .github/workflows/maven.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000000..4c20c9c823
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,23 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, macOS-latest, windows-2016]
+        java: [8, 11, 15]
+      fail-fast: false
+      max-parallel: 4
+    name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Test with Maven
+        run: MAVEN_OPTS='-Xms2g -Xmx3g' mvn test -B -V -Djava.util.logging.config.file=logging.properties

From 99928df72719d0a36d3be06dcf86d46a8b89abbc Mon Sep 17 00:00:00 2001
From: Christoph John <christoph.john@macd.com>
Date: Mon, 19 Oct 2020 14:39:41 +0200
Subject: [PATCH 2/7] Update maven.yml

try to make MAVEN_OPTS work on Windows
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 4c20c9c823..3f3e1e64a8 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -20,4 +20,4 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
       - name: Test with Maven
-        run: MAVEN_OPTS='-Xms2g -Xmx3g' mvn test -B -V -Djava.util.logging.config.file=logging.properties
+        run: MAVEN_OPTS="-Xms2g -Xmx3g"; mvn test -B -V -Djava.util.logging.config.file=logging.properties

From 1a472b547c82631ac026d7670340a6c7aa2ce82e Mon Sep 17 00:00:00 2001
From: Christoph John <christoph.john@macd.com>
Date: Tue, 20 Oct 2020 00:32:07 +0200
Subject: [PATCH 3/7] try to make windows build work

---
 .github/workflows/maven.yml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3f3e1e64a8..00412bd8d3 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -3,6 +3,25 @@ name: Java CI
 on: [push]
 
 jobs:
+  test-win:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-2016]
+        java: [8, 11, 15]
+      fail-fast: false
+      max-parallel: 4
+    name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Test with Maven
+        run: echo "MAVEN_OPTS='-Xms2g -Xmx3g'" > %HOME%\mavenrc_pre.bat; mvn test -B -V -Djava.util.logging.config.file=logging.properties
+
   test:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -20,4 +39,4 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
       - name: Test with Maven
-        run: MAVEN_OPTS="-Xms2g -Xmx3g"; mvn test -B -V -Djava.util.logging.config.file=logging.properties
+        run: echo "MAVEN_OPTS='-Xms2g -Xmx3g'" > ~/.mavenrc; mvn test -B -V -Djava.util.logging.config.file=logging.properties

From 027ac7356cf8474b54f6f3cb8f60ee01af3a2016 Mon Sep 17 00:00:00 2001
From: Christoph John <christoph.john@macd.com>
Date: Tue, 20 Oct 2020 00:33:09 +0200
Subject: [PATCH 4/7] removed windows build from second step

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 00412bd8d3..13043626bf 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, macOS-latest, windows-2016]
+        os: [ubuntu-18.04, macOS-latest]
         java: [8, 11, 15]
       fail-fast: false
       max-parallel: 4

From 240c302451adeb2f9fd4bab926a0b613162d029e Mon Sep 17 00:00:00 2001
From: Christoph John <christoph.john@macd.com>
Date: Tue, 20 Oct 2020 00:38:36 +0200
Subject: [PATCH 5/7] try to set MAVEN_OPTS with "env"

---
 .github/workflows/maven.yml | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 13043626bf..6350dafddd 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -3,30 +3,11 @@ name: Java CI
 on: [push]
 
 jobs:
-  test-win:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [windows-2016]
-        java: [8, 11, 15]
-      fail-fast: false
-      max-parallel: 4
-    name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: ${{ matrix.java }}
-      - name: Test with Maven
-        run: echo "MAVEN_OPTS='-Xms2g -Xmx3g'" > %HOME%\mavenrc_pre.bat; mvn test -B -V -Djava.util.logging.config.file=logging.properties
-
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, macOS-latest]
+        os: [ubuntu-18.04, macOS-latest, windows-2016]
         java: [8, 11, 15]
       fail-fast: false
       max-parallel: 4
@@ -39,4 +20,6 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
       - name: Test with Maven
-        run: echo "MAVEN_OPTS='-Xms2g -Xmx3g'" > ~/.mavenrc; mvn test -B -V -Djava.util.logging.config.file=logging.properties
+        env:
+          MAVEN_OPTS: "-Xms2g -Xmx3g"
+        run: mvn test -B -V -Djava.util.logging.config.file=logging.properties

From 98cc79c367ef95a4872c4cbea0b14ae3206a49b0 Mon Sep 17 00:00:00 2001
From: Christoph John <christoph.john@macd.com>
Date: Tue, 20 Oct 2020 01:09:20 +0200
Subject: [PATCH 6/7] try to make java options work with Powershell

... will hopefully work with unix too
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 6350dafddd..749147d06e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -22,4 +22,4 @@ jobs:
       - name: Test with Maven
         env:
           MAVEN_OPTS: "-Xms2g -Xmx3g"
-        run: mvn test -B -V -Djava.util.logging.config.file=logging.properties
+        run: mvn test -B -V -D"java.util.logging.config.file"="logging.properties"

From 07a119ffa9c5899311a2a02e1cd01da65b40068f Mon Sep 17 00:00:00 2001
From: Christoph John <christoph.john@macd.com>
Date: Tue, 20 Oct 2020 12:48:18 +0200
Subject: [PATCH 7/7] change to trigger rebuild with current master

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 749147d06e..48513eb504 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,5 +21,5 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: Test with Maven
         env:
-          MAVEN_OPTS: "-Xms2g -Xmx3g"
+          MAVEN_OPTS: "-Xms3g -Xmx3g"
         run: mvn test -B -V -D"java.util.logging.config.file"="logging.properties"