update tested versions

meterware · Sep 20, 2019 · 6ab6bc0 · 6ab6bc0
1 parent 6b9b0ca
commit 6ab6bc0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
 language: java
 jdk:
-  - openjdk7
   - oraclejdk8
-  - oraclejdk9
+  - oraclejdk11
+  - openjdk10
+  - openjdk11
 # we run the unit tests.
 # We have no integration tests as yet
 install:
@@ -17,4 +18,4 @@ branches:
         - gh-pages
 notifications:
     email:
-        - russ@russgold.net
+        - russ@russgold.net
diff --git a/src/main/toolchains/travis-ci.xml b/src/main/toolchains/travis-ci.xml
@@ -4,32 +4,41 @@
     <toolchain>
         <type>jdk</type>
         <provides>
-            <!-- note: travis no longer supplies oraclejdk7, so cheating to use the openjdk version -->
-            <version>1.7</version>
+            <version>1.8</version>
             <vendor>oracle</vendor>
         </provides>
         <configuration>
-            <jdkHome>/usr/lib/jvm/java-7-openjdk-amd64</jdkHome>
+            <jdkHome>/usr/lib/jvm/java-8-oracle</jdkHome>
         </configuration>
     </toolchain>
     <toolchain>
         <type>jdk</type>
         <provides>
-            <version>1.8</version>
+            <version>11</version>
             <vendor>oracle</vendor>
         </provides>
         <configuration>
-            <jdkHome>/usr/lib/jvm/java-8-oracle</jdkHome>
+            <jdkHome>/usr/lib/jvm/java-11-oracle</jdkHome>
         </configuration>
     </toolchain>
     <toolchain>
         <type>jdk</type>
         <provides>
-            <version>9</version>
-            <vendor>oracle</vendor>
+            <version>10</version>
+            <vendor>openjdk</vendor>
+        </provides>
+        <configuration>
+            <jdkHome>/usr/lib/jvm/java-10-openjdk-amd64</jdkHome>
+        </configuration>
+    </toolchain>
+    <toolchain>
+        <type>jdk</type>
+        <provides>
+            <version>11</version>
+            <vendor>openjdk</vendor>
         </provides>
         <configuration>
-            <jdkHome>/usr/lib/jvm/java-9-oracle</jdkHome>
+            <jdkHome>/usr/lib/jvm/java-11-openjdk-amd64</jdkHome>
         </configuration>
     </toolchain>
 </toolchains>