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 @@ - - - - - - - - jdk - - 1.6 - - - /usr/lib/jvm/java-6-openjdk-amd64 - - - - jdk - - 1.7 - - - /usr/lib/jvm/java-7-openjdk-amd64 - - - - jdk - - 1.8 - - - /usr/lib/jvm/java-8-oracle - - - \ No newline at end of file