Use default environment in Travis instead of deprecated

* Ubuntu Trusty instead of Precise
* Maven 3.5.0 (that uses Java 7)
  instead of Maven 3.2.5 (that was using Java 6)
* OpenJDK 6 requires installation

3 files changed, 35 insertions, 14 deletions

diff --git a/.travis.sh b/.travis.sh
index 040cc567..a9401b65 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -9,6 +9,18 @@ then
   exit 1
 fi
 
+function jdk_switcher {
+  DIR=$1
+  if [ ! -d "$DIR" ]; then
+    echo "Not found: $DIR"
+    exit 1
+  fi
+  export JAVA_HOME="$DIR"
+  export JDK_HOME="${JAVA_HOME}"
+  export JAVAC="${JAVA_HOME}/bin/javac"
+  export PATH="${JAVA_HOME}/bin:${PATH}"
+}
+
 # Switch to desired JDK, download if required:
 function install_jdk {
   JDK_URL=$1
@@ -27,24 +39,21 @@ function install_jdk {
 
   if [ -z "${2+false}" ]
   then
-    export JAVA_HOME="/tmp/jdk/$JDK"
-    export JDK_HOME="${JAVA_HOME}"
-    export JAVAC="${JAVA_HOME}/bin/javac"
-    export PATH="${JAVA_HOME}/bin:${PATH}"
+    jdk_switcher "/tmp/jdk/$JDK"
   fi
 }
 
-source $HOME/.jdk_switcher_rc
 case "$JDK" in
 5)
-  jdk_switcher use oraclejdk8
   install_jdk $JDK5_URL false
   ;;
 6)
-  jdk_switcher use openjdk6
   ;;
-7|8)
-  jdk_switcher use oraclejdk${JDK}
+7)
+  jdk_switcher /usr/lib/jvm/java-7-openjdk-amd64
+  ;;
+8)
+  jdk_switcher /usr/lib/jvm/java-8-oracle
   ;;
 8-ea)
   install_jdk $JDK8_EA_URL
@@ -73,7 +82,7 @@ case "$JDK" in
   fi
   ;;
 6)
-  mvn -V -B -e verify -Dbytecode.version=1.6
+  mvn -V -B -e verify -Djdk.version=1.6 -Dbytecode.version=1.6 --toolchains=./.travis/travis-toolchains.xml
   ;;
 7)
   mvn -V -B -e verify -Dbytecode.version=1.7
diff --git a/.travis.yml b/.travis.yml
index c76bcda7..e39a5874 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,10 @@ install: true
 # Use container-based infrastructure:
 sudo: false
 
-dist: precise
 addons:
-  hosts:
-    - travis
-  hostname: travis
+  apt:
+    packages:
+      - openjdk-6-jdk
 
 # Keep Maven local repository between builds:
 cache:
diff --git a/.travis/travis-toolchains.xml b/.travis/travis-toolchains.xml
new file mode 100644
index 00000000..9eb8100a
--- /dev/null
+++ b/.travis/travis-toolchains.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF8"?>
+<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>1.6</version>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-6-openjdk-amd64</jdkHome>
+    </configuration>
+  </toolchain>
+</toolchains>