From 2f67eaf7e623f6a57baf3370f6b4dd56f4593f90 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Sun, 24 Sep 2017 10:38:38 +0200
Subject: [PATCH] [ci] Update travis scripts to use java 9

---
 .travis.yml                   |  4 ++--
 .travis/configure-maven.sh    |  1 -
 .travis/travis-toolchains.xml | 34 ----------------------------------
 3 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 .travis/travis-toolchains.xml

diff --git a/.travis.yml b/.travis.yml
index 627df0e99c..f4f272f1c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,13 @@ sudo: false
 addons:
   apt:
     packages:
-      - oracle-java8-installer
+      - oracle-java9-installer
   ssh_known_hosts:
     - web.sourceforge.net
 
 language: java
 
-jdk: oraclejdk8
+jdk: oraclejdk9
 
 env:
   global:
diff --git a/.travis/configure-maven.sh b/.travis/configure-maven.sh
index a2b17f1054..6d1599a4c4 100755
--- a/.travis/configure-maven.sh
+++ b/.travis/configure-maven.sh
@@ -3,5 +3,4 @@ set -e
 
 echo "MAVEN_OPTS='-Xms1g -Xmx1g'" > $HOME/.mavenrc
 mkdir -p $HOME/.m2
-cp .travis/travis-toolchains.xml $HOME/.m2/toolchains.xml
 cp .travis/travis-settings.xml $HOME/.m2/settings.xml
diff --git a/.travis/travis-toolchains.xml b/.travis/travis-toolchains.xml
deleted file mode 100644
index caba9380c7..0000000000
--- a/.travis/travis-toolchains.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF8"?>
-<toolchains>
-  <!-- place this file in ${user.home}/.m2/toolchains.xml -->
-
-  <!-- see: https://github.com/travis-ci/travis-cookbooks/blob/master/cookbooks/travis_java/templates/ubuntu/jdk_switcher.sh.erb -->
-
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <version>1.6</version>
-    </provides>
-    <configuration>
-      <jdkHome>/usr/lib/jvm/java-6-openjdk-amd64</jdkHome>
-    </configuration>
-  </toolchain>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <version>1.7</version>
-    </provides>
-    <configuration>
-      <jdkHome>/usr/lib/jvm/java-7-openjdk-amd64</jdkHome>
-    </configuration>
-  </toolchain>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <version>1.8</version>
-    </provides>
-    <configuration>
-      <jdkHome>/usr/lib/jvm/java-8-oracle</jdkHome>
-    </configuration>
-  </toolchain>
-</toolchains>
\ No newline at end of file