Use travis way of retrieving latest oracle JDK8

diff --git a/.travis.yml b/.travis.yml
index b8ab34ab34c008ceda5701d057f505153e55fa66..9244f15465a0947bf437eb158392db94b2d9cc11 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,11 @@ jdk: oraclejdk8
 script: ./travis.sh
 dist: trusty
 
+addons:
+  apt:
+    packages:
+      - oracle-java8-installer
+
 branches:
   except:
   - /^dogfood\/.*$/

diff --git a/travis.sh b/travis.sh
index 06aced7157979737b115434e11c6427a3ea3a7a0..fb2c900d2051326396929b9ba349349bd7118114 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -3,35 +3,6 @@ set -euo pipefail
 
 ./.travis/setup_ramdisk.sh
 
-#
-# A (too) old version of JDK8 is installed by default on Travis.
-# This method is preferred over Travis apt oracle-java8-installer because
-# JDK is kept in cache. It does not need to be downloaded from Oracle
-# at each build.
-#
-installJdk8() {
-  # copied from https://github.com/SonarSource/travis-utils/blob/master/bin/installJDK8
-  JDK_RELEASE=191
-  echo "Setup JDK 1.8u$JDK_RELEASE"
-  mkdir -p ~/jvm
-  pushd ~/jvm > /dev/null
-
-  if [ ! -d "jdk1.8.0_$JDK_RELEASE" ]; then
-    {
-      wget --quiet --continue --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u191-b12/2787e4a523244c269598db4e85c51e0c/jdk-8u191-linux-x64.tar.gz
-    } || {
-      echo "failed to download JDK 1.8u$JDK_RELEASE"
-      exit 1
-    }
-    tar xzf jdk-8u$JDK_RELEASE-linux-x64.tar.gz
-    rm jdk-8u$JDK_RELEASE-linux-x64.tar.gz
-  fi
-  popd > /dev/null
-  export JAVA_HOME=~/jvm/jdk1.8.0_$JDK_RELEASE
-  export PATH=$JAVA_HOME/bin:$PATH
-  echo "JDK 1.8u$JDK_RELEASE installed"
-}
-
 #
 # Configure Maven settings and install some script utilities
 #
@@ -65,7 +36,6 @@ case "$TARGET" in
 
 BUILD)
   git fetch --unshallow
-  installJdk8
   ./gradlew build sonarqube --no-daemon --console plain \
   -PjacocoEnabled=true \
   -Dsonar.projectKey=org.sonarsource.sonarqube:sonarqube \