From 37712a8ce7f2a22bfbfb85d863de582b3eb1940b Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 15:25:37 +0000
Subject: [PATCH 01/22] Issue #1143, attemot to get travis to build on windows

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 84969e465a..3f8be7de49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 sudo: required
 language: java
 dist: trusty
+os: windows
+
 jdk:
   - openjdk11
 
@@ -8,6 +10,9 @@ before_install:
   - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start;
 
 before_script:
+  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install openjdk ; fi
+  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install maven ; fi
+  
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
   
 script:

From 1e32dcc7e6d56b084317eb2a54be3f8ce7437c01 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 15:49:20 +0000
Subject: [PATCH 02/22] Issue #1143, use matrix for building

---
 .travis.yml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f8be7de49..04b4f2bc77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,22 @@
-sudo: required
-language: java
-dist: trusty
-os: windows
+matrix:
+  include:
+    - sudo: required
+      language: java
+      dist: trusty
+      jdk:
+        - openjdk11
 
-jdk:
-  - openjdk11
+      before_install:
+        - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start;
 
-before_install:
-  - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start;
-
-before_script:
-  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install openjdk ; fi
-  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install maven ; fi
-  
-  - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
+    - os: windows
+      language: generic
+      before_script:
+        - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install openjdk ; fi
+        - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install maven ; fi
   
 script:
+  - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
   - mvn clean install
 
 after_failure:

From f54fe91bab89a554293bcb949c95bcadebcd0113 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 16:06:26 +0000
Subject: [PATCH 03/22] Issue #1143, tidied up travis script

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 04b4f2bc77..3324c22901 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-matrix:
+jobs:
   include:
     - sudo: required
       language: java
@@ -10,10 +10,10 @@ matrix:
         - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start;
 
     - os: windows
-      language: generic
+      language: bash
       before_script:
-        - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install openjdk ; fi
-        - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install maven ; fi
+        - choco install openjdk
+        - choco install maven
   
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"

From db95958c759d5b456a5ff79c8db055d278ec0ac5 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 16:10:04 +0000
Subject: [PATCH 04/22] Issue #1143, pin java version

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3324c22901..8562298af8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ jobs:
     - os: windows
       language: bash
       before_script:
-        - choco install openjdk
+        - choco install openjdk11
         - choco install maven
   
 script:

From 3f3ca0e5f8a7d99d983f7e3a9bf691a34858eb55 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 16:22:08 +0000
Subject: [PATCH 05/22] Issue #1143, print the path for debugging

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8562298af8..b51359bcd8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,13 @@ jobs:
       before_script:
         - choco install openjdk11
         - choco install maven
+        - echo ${PATH}
+        - refreshenv
+        - echo ${PATH}
   
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
+  - echo ${PATH}
   - mvn clean install
 
 after_failure:

From 4422f4cf1014f344c2c4a7d088a769b587fb76b7 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 16:30:40 +0000
Subject: [PATCH 06/22] Issue #1143, make install path of jdk and mvn more
 specific

---
 .travis.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b51359bcd8..39ab8a532e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,11 +12,9 @@ jobs:
     - os: windows
       language: bash
       before_script:
-        - choco install openjdk11
-        - choco install maven
-        - echo ${PATH}
-        - refreshenv
-        - echo ${PATH}
+        - choco install openjdk11 -ia INSTALLDIR="c:\jdk"
+        - choco install maven -ia INSTALLDIR="c:\mvn"
+        - export PATH=$PATH:"/c/jdk":"/c/mvn"
   
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"

From 46bfd01ea85dd237300a3d2ad41d216460d4316c Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 16:35:02 +0000
Subject: [PATCH 07/22] Issue #1143, be incredibly specificy about paths

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 39ab8a532e..45fc7443e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,9 @@ jobs:
     - os: windows
       language: bash
       before_script:
-        - choco install openjdk11 -ia INSTALLDIR="c:\jdk"
-        - choco install maven -ia INSTALLDIR="c:\mvn"
-        - export PATH=$PATH:"/c/jdk":"/c/mvn"
+        - choco install openjdk11
+        - choco install maven
+        - export PATH=$PATH:"/c/Program Files/OpenJDK/openjdk-11.0.5_10/bin":"/C:/ProgramData/chocolatey/lib/maven"
   
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"

From 864a452dca450b28fa0b9b141df10a12e76638c5 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 16:41:00 +0000
Subject: [PATCH 08/22] Issue #1143, correct path for maven

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 45fc7443e6..d218223214 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ jobs:
       before_script:
         - choco install openjdk11
         - choco install maven
-        - export PATH=$PATH:"/c/Program Files/OpenJDK/openjdk-11.0.5_10/bin":"/C:/ProgramData/chocolatey/lib/maven"
+        - export PATH=$PATH:"/c/Program Files/OpenJDK/openjdk-11.0.5_10/bin":"/C:/ProgramData/chocolatey/lib/maven/bin"
   
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"

From d98d1ac654cd693059aa79b8dd26d6d0151999dd Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 16:43:40 +0000
Subject: [PATCH 09/22] Issue #1143, fix typo in maven path

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d218223214..33412cda63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ jobs:
       before_script:
         - choco install openjdk11
         - choco install maven
-        - export PATH=$PATH:"/c/Program Files/OpenJDK/openjdk-11.0.5_10/bin":"/C:/ProgramData/chocolatey/lib/maven/bin"
+        - export PATH=$PATH:"/c/Program Files/OpenJDK/openjdk-11.0.5_10/bin":"/c/ProgramData/chocolatey/lib/maven/bin"
   
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"

From 88478cefb654ec52ca92210d6e52b1c63a57d43a Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 16:56:26 +0000
Subject: [PATCH 10/22] Issue #1143, can we find java at least?

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 33412cda63..3fe6fc71b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ jobs:
         - choco install openjdk11
         - choco install maven
         - export PATH=$PATH:"/c/Program Files/OpenJDK/openjdk-11.0.5_10/bin":"/c/ProgramData/chocolatey/lib/maven/bin"
+        - java -version
   
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"

From c5455ec1108e953dc879c88ea2deb81ec369dfd1 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 17:02:59 +0000
Subject: [PATCH 11/22] Issue #1143, correct maven path again

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3fe6fc71b9..609346e753 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,7 @@ jobs:
       before_script:
         - choco install openjdk11
         - choco install maven
-        - export PATH=$PATH:"/c/Program Files/OpenJDK/openjdk-11.0.5_10/bin":"/c/ProgramData/chocolatey/lib/maven/bin"
-        - java -version
+        - export PATH=$PATH:"/c/Program Files/OpenJDK/openjdk-11.0.5_10/bin":"/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin"
   
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"

From f85db50fd0f527cb7b173c4a28d2b278def06fd7 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 17:27:08 +0000
Subject: [PATCH 12/22] Issue #1143, fixed test to be more os independent

---
 .../builder/model/macros/MacroHierarchyUnitTest.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/display/model/src/test/java/org/csstudio/display/builder/model/macros/MacroHierarchyUnitTest.java b/app/display/model/src/test/java/org/csstudio/display/builder/model/macros/MacroHierarchyUnitTest.java
index a59a93f79f..91744b4c92 100644
--- a/app/display/model/src/test/java/org/csstudio/display/builder/model/macros/MacroHierarchyUnitTest.java
+++ b/app/display/model/src/test/java/org/csstudio/display/builder/model/macros/MacroHierarchyUnitTest.java
@@ -108,13 +108,15 @@ public void testPropertiesAndEnvironment() throws Exception
         assertThat(value, not(nullValue()));
 
         // Check fall back to environment variables
-        value = macros.getValue("HOME");
-        System.out.println("Environment variable $HOME: " + value);
+        String testVariable;
         if(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) {
-            assertThat(value, nullValue());
+            testVariable = "HOMEPATH";
         }else {
-            assertThat(value, not(nullValue()));
+            testVariable = "HOME";
         }
+        value = macros.getValue(testVariable);
+        System.out.println("Environment variable $" + testVariable + ": " + value);
+        assertThat(value, not(nullValue()));
     }
 
     /** Test when macros get expanded

From 276721f231b2142ef4ea71fd5dbce54a5b8a13b4 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 17:42:35 +0000
Subject: [PATCH 13/22] Issue #1143, fixed test to look at PATH env variable as
 this is more OS independent

---
 .../builder/model/macros/MacroHierarchyUnitTest.java   | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/display/model/src/test/java/org/csstudio/display/builder/model/macros/MacroHierarchyUnitTest.java b/app/display/model/src/test/java/org/csstudio/display/builder/model/macros/MacroHierarchyUnitTest.java
index 91744b4c92..0bfd5e491e 100644
--- a/app/display/model/src/test/java/org/csstudio/display/builder/model/macros/MacroHierarchyUnitTest.java
+++ b/app/display/model/src/test/java/org/csstudio/display/builder/model/macros/MacroHierarchyUnitTest.java
@@ -108,14 +108,8 @@ public void testPropertiesAndEnvironment() throws Exception
         assertThat(value, not(nullValue()));
 
         // Check fall back to environment variables
-        String testVariable;
-        if(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) {
-            testVariable = "HOMEPATH";
-        }else {
-            testVariable = "HOME";
-        }
-        value = macros.getValue(testVariable);
-        System.out.println("Environment variable $" + testVariable + ": " + value);
+        value = macros.getValue("PATH");
+        System.out.println("Environment variable $PATH: " + value);
         assertThat(value, not(nullValue()));
     }
 

From 389a9bbc88f1a252513eff3d820f51afb1719fa2 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 18:00:45 +0000
Subject: [PATCH 14/22] Issue #1143, correctly set java home

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 609346e753..b5489f45a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,8 @@ jobs:
       before_script:
         - choco install openjdk11
         - choco install maven
-        - export PATH=$PATH:"/c/Program Files/OpenJDK/openjdk-11.0.5_10/bin":"/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin"
+        - export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.5_10/bin"
+        - export PATH=$PATH:$JAVA_HOME:"/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin"
   
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"

From 9aa55a7cc9893043e09e84f02d75675a45117f13 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 12 Feb 2020 18:16:25 +0000
Subject: [PATCH 15/22] Issue #1143, pin maven version as required for path

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b5489f45a9..7099d84835 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,10 @@ jobs:
       language: bash
       before_script:
         - choco install openjdk11
-        - choco install maven
-        - export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.5_10/bin"
-        - export PATH=$PATH:$JAVA_HOME:"/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin"
+        - choco install maven --version 3.6.3
+        # Need to explicitly set PATH in wondows until https://github.com/chocolatey/choco/issues/1851 is sorted
+        - export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.5_10"
+        - export PATH=$PATH:$JAVA_HOME/bin:"/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin"
   
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"

From efd5fdac7f0b515c973f1359a406bafbec6c13a7 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Thu, 13 Feb 2020 10:35:06 +0000
Subject: [PATCH 16/22] Removed echoing path for debugging

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7099d84835..eff413ff06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,13 +14,12 @@ jobs:
       before_script:
         - choco install openjdk11
         - choco install maven --version 3.6.3
-        # Need to explicitly set PATH in wondows until https://github.com/chocolatey/choco/issues/1851 is sorted
+        # Need to explicitly set PATH in windows until https://github.com/chocolatey/choco/issues/1851 is sorted
         - export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.5_10"
         - export PATH=$PATH:$JAVA_HOME/bin:"/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin"
   
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
-  - echo ${PATH}
   - mvn clean install
 
 after_failure:

From 96645e6aa9af54dbaa33a6b294864c6bf8882f82 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Thu, 13 Feb 2020 10:56:46 +0000
Subject: [PATCH 17/22] Issue #1143, print all processes to see why the build
 is hanging

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index eff413ff06..7826d325f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ jobs:
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
   - mvn clean install
+  - ps aux | less
 
 after_failure:
  - find ./ -type d -name "surefire-reports" -print0 | xargs -0 -I {} find {} -iname "*.txt" -type f | xargs cat

From d89cd4373e1eac4da2af6c37ecb1d6e81a93057f Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Thu, 13 Feb 2020 11:11:59 +0000
Subject: [PATCH 18/22] Issue #1143, try printing more processes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7826d325f5..7a7cb0502c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ jobs:
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
   - mvn clean install
-  - ps aux | less
+  - ps -ef
 
 after_failure:
  - find ./ -type d -name "surefire-reports" -print0 | xargs -0 -I {} find {} -iname "*.txt" -type f | xargs cat

From c03dffca141a043fcb10e10af2ef86482e9f69af Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Thu, 13 Feb 2020 13:11:48 +0000
Subject: [PATCH 19/22] Issue #1143, do nothing on travis install to debug
 windows

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7a7cb0502c..e3e9e7e7a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,8 @@ jobs:
         - export PATH=$PATH:$JAVA_HOME/bin:"/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin"
   
 script:
-  - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
-  - mvn clean install
+  #- MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
+  #- mvn clean install
   - ps -ef
 
 after_failure:

From cf081d7deca7da49526013ae821287169e6439fa Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Thu, 13 Feb 2020 13:30:50 +0000
Subject: [PATCH 20/22] Issue #1143, print more processes in travis file

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e3e9e7e7a3..83c68edd88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,9 @@ jobs:
         - export PATH=$PATH:$JAVA_HOME/bin:"/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin"
   
 script:
-  #- MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
-  #- mvn clean install
-  - ps -ef
+  - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
+  - mvn clean install
+  - ps -Wla
 
 after_failure:
  - find ./ -type d -name "surefire-reports" -print0 | xargs -0 -I {} find {} -iname "*.txt" -type f | xargs cat

From f38f2af28b8fea1b86b6c912a3935cac2a379e1c Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Thu, 13 Feb 2020 14:11:33 +0000
Subject: [PATCH 21/22] Issue #1143, kill errant java process on windows

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 83c68edd88..bc7871cfd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ jobs:
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
   - mvn clean install
-  - ps -Wla
+  - if [ $TRAVIS_OS_NAME = 'windows' ]; then taskkill -IM "java.exe" -F; fi
 
 after_failure:
  - find ./ -type d -name "surefire-reports" -print0 | xargs -0 -I {} find {} -iname "*.txt" -type f | xargs cat

From 3df000d25c97b9c154a97a67586fd5944d1d4758 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Thu, 13 Feb 2020 15:20:51 +0000
Subject: [PATCH 22/22] Issue #1143, Added explanatory comment for taskkill

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bc7871cfd3..f614cdaf20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ jobs:
 script:
   - MAVEN_OPTS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
   - mvn clean install
-  - if [ $TRAVIS_OS_NAME = 'windows' ]; then taskkill -IM "java.exe" -F; fi
+  - if [ $TRAVIS_OS_NAME = 'windows' ]; then taskkill -IM "java.exe" -F; fi # Windows seems to have errant tasks hanging around sometime (https://travis-ci.community/t/errored-job-not-sure-why-test-passed-and-returned-0-solved/3763)
 
 after_failure:
  - find ./ -type d -name "surefire-reports" -print0 | xargs -0 -I {} find {} -iname "*.txt" -type f | xargs cat