From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 21 Jun 2016 07:11:35 +0000 (+0200)
Subject: Cache JDK8 installer on Travis
X-Git-Tag: 6.0-RC1~267
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=873926459d8383fa42744028f88d2802326af130;p=sonarqube.git

Cache JDK8 installer on Travis
---

diff --git a/.travis.yml b/.travis.yml
index 67229af4f37..921480a0f93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,10 +33,3 @@ notifications:
   webhooks:
     - secure: "CrwnSt40WNegJOkgDOaCwUwP9fCgx68pYQWtcZnj4+bRF7kFuFI+EUFuf7G29oPOf9CjmFVvZ+mS/ZJ9AqtjfWh/Q9f4Zsv9BBfOmTgUcidYp8+hQljeesEXwi2Mqfa2JeRysje4xu2p8b52h+apbbQ2Y2FQsP4uwmj1LEpP32U="
   on_start: always
-
-addons:
-  apt:
-    packages:
-      # upgrade java 8 as the default version 1.8.0_31 prevents from compile sources
-      # https://github.com/travis-ci/travis-ci/issues/4042
-      - oracle-java8-installer
diff --git a/travis.sh b/travis.sh
index 24d670091d6..12dec745b74 100755
--- a/travis.sh
+++ b/travis.sh
@@ -4,11 +4,12 @@ set -euo pipefail
 
 function configureTravis {
   mkdir ~/.local
-  curl -sSL https://github.com/SonarSource/travis-utils/tarball/v25 | tar zx --strip-components 1 -C ~/.local
+  curl -sSL https://github.com/SonarSource/travis-utils/tarball/v29 | tar zx --strip-components 1 -C ~/.local
   source ~/.local/bin/install
   echo "$ARTIFACTORY_URL/npmjs/" > .npmrc
 }
 configureTravis
+. installJDK8
 
 function strongEcho {
   echo ""