From 4175ab3ea2ced2c434a907918c1dfaf643f68d65 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 20 Jul 2018 14:54:13 +0200
Subject: [PATCH] Fix installation of JDK 8 on Travis

---
 travis.sh | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/travis.sh b/travis.sh
index b4ad18404fa..b4d0f0e6ed4 100755
--- a/travis.sh
+++ b/travis.sh
@@ -10,17 +10,26 @@ set -euo pipefail
 # at each build.
 #
 installJdk8() {
-  echo "Setup JDK 1.8u181"
+  # copied from https://github.com/SonarSource/travis-utils/blob/master/bin/installJDK8
+  JDK_RELEASE=181
+  echo "Setup JDK 1.8u$JDK_RELEASE"
   mkdir -p ~/jvm
   pushd ~/jvm > /dev/null
-  if [ ! -d "jdk1.8.0_181" ]; then
-    wget --quiet --continue --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jdk-8u181-linux-x64.tar.gz
-    tar xzf jdk-8u181-linux-x64.tar.gz
-    rm jdk-8u181-linux-x64.tar.gz
+
+  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/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jdk-8u181-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_171
+  export JAVA_HOME=~/jvm/jdk1.8.0_$JDK_RELEASE
   export PATH=$JAVA_HOME/bin:$PATH
+  echo "JDK 1.8u$JDK_RELEASE installed"
 }
 
 #
-- 
2.39.5