From 298a5376ab73ace71f6676da5e47aed81bdb50aa Mon Sep 17 00:00:00 2001
From: Mark Adamcin <adamcin@gmail.com>
Date: Mon, 9 Sep 2019 09:15:20 -0700
Subject: [PATCH] resolves #18 . cleans up .travis.yml

---
 .travis.yml  | 17 +++++++++--------
 CHANGELOG.md |  6 ++++++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4d8e2e7c5..9f05b726e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,35 @@
 language: java
 matrix:
   include:
-    - os: osx
-      language: bash
-      # for jdk 11.0.1+13
-      osx_image: xcode10.1
+    # primary configuration: tests, site gen, minimum supported version
     - os: linux
       dist: trusty
       language: java
-      jdk: openjdk8
+      jdk: oraclejdk8
       script: ./mvnw -B -e verify site site:stage
       after_success:
         - ./mvnw -B -Pcoverage clean verify coveralls:report
     - os: linux
       dist: trusty
       language: java
-      jdk: openjdk11
+      jdk: openjdk8
     - os: linux
       dist: trusty
       language: java
-      jdk: oraclejdk8
+      jdk: oraclejdk11
     - os: linux
       dist: trusty
       language: java
-      jdk: oraclejdk11
+      jdk: openjdk11
     - os: windows
       language: bash
       before_script:
         - choco install adoptopenjdk11
         - export JAVA_HOME="$(dirname "$(dirname "$(find "/c/Program Files/AdoptOpenJDK" -name javac.exe)")")"
+    - os: osx
+      language: bash
+      # for jdk 11.0.1+13
+      osx_image: xcode10.1
 script:
   - ./mvnw -B -e verify
 cache:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 588c2a7c8..901fe76c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 ## [Unreleased]
 
+### Added
+- GH18 Added CI builds for windows and mac osx.
+
+### Fixed
+- GH20 resolved windows test failures
+
 ## [1.4.2] - 2019-09-06
 
 ### Changed