From 2ed2565fe474a691171956c4572beef734d1180b Mon Sep 17 00:00:00 2001
From: Brett Randall <javabrett@gmail.com>
Date: Sat, 11 Nov 2017 03:23:00 -0500
Subject: [PATCH 1/4] Set Travis to run on Trusty and oraclejdk9.

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

diff --git a/.travis.yml b/.travis.yml
index 74f2ed9a..cadeebb9 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
+dist: trusty
 language: java
+jdk:
+  - oraclejdk9
 notifications:
   email:
       - notification@qos.ch

From f13c8c20c26f268463879b2c4ffb408bca815f2c Mon Sep 17 00:00:00 2001
From: Brett Randall <javabrett@gmail.com>
Date: Sat, 11 Nov 2017 03:23:48 -0500
Subject: [PATCH 2/4] Added a profile for Travis executions and disabled
 maven-toolchains-plugin on Travis.

Note that Travis will not support maven-toolchains-plugin, see https://github.com/travis-ci/travis-ci/issues/2727 .
---
 pom.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pom.xml b/pom.xml
index fb083d84..9333d32b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,7 @@
         <version>1.1</version>
         <executions>
           <execution>
+            <id>toolchain</id>
             <goals>
               <goal>toolchain</goal>
             </goals>
@@ -459,6 +460,31 @@
       </build>
     </profile>
 
+    <profile>
+      <id>travis</id>
+      <activation>
+        <property>
+          <name>env.TRAVIS</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-toolchains-plugin</artifactId>
+            <version>1.1</version>
+            <executions>
+              <execution>
+                <id>toolchain</id>
+                <phase>none</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
   </profiles>
 
   <pluginRepositories>

From a8aa7832b7cb8091bc638d12a4fc1abfaaf44d8e Mon Sep 17 00:00:00 2001
From: Brett Randall <javabrett@gmail.com>
Date: Sat, 11 Nov 2017 03:29:08 -0500
Subject: [PATCH 3/4] Added JDK9 to toolchains.

---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9333d32b..f08c3d57 100755
--- a/pom.xml
+++ b/pom.xml
@@ -168,6 +168,9 @@
             <jdk>
               <version>1.6</version>
             </jdk>
+            <jdk>
+              <version>1.9</version>
+            </jdk>
           </toolchains>
         </configuration>
       </plugin>

From 2de3bc7edd446e5859ce748941d322651e756fc5 Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Tue, 30 Jan 2018 11:23:26 +0100
Subject: [PATCH 4/4] inverse Java 1.6/Java 9 jdk element in toolchains. This
 allows javadoc to be built

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f08c3d57..7e8fe88f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -166,10 +166,11 @@
         <configuration>
           <toolchains>
             <jdk>
-              <version>1.6</version>
+              <version>9</version>
             </jdk>
+
             <jdk>
-              <version>1.9</version>
+              <version>1.6</version>
             </jdk>
           </toolchains>
         </configuration>