From 04ac08e5cc103cfe04e18f9d936d1155cb612758 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sun, 29 Sep 2019 15:02:23 +0200 Subject: [PATCH] Fix Travis: Update AdoptOpenJDK (#27815) --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d9d100c573..e40c2328d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,8 @@ scala: - "2.12.9" - "2.13.0" -before_install: - # using jabba for custom jdk management - - curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.11.2/install.sh | bash && . ~/.jabba/jabba.sh - - jabba install $TRAVIS_JDK -install: jabba use "$TRAVIS_JDK" && java -Xmx32m -version +before_install: curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh +install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx32m -version addons: apt: @@ -44,7 +41,7 @@ stages: env: global: - - TRAVIS_JDK=adopt@~1.8.202-08 + - TRAVIS_JDK=8 # encrypt with: travis encrypt WHITESOURCE_PASSWORD=... - secure: "BCWtUqKG7trI7n5OZE2ReCGXQE/f5P8kXpfcpa5DXJeautBnpH/jettY5ermB5JLl12CisG6S4nS3BSKP4Uf8WPpPeSq402CZYTCbUxMWCvS+9N+kEQrHU7iwYqHQBL/RMy6eIyWPRD+JqxKuvlgfNuSEry9pMagwW7mNQrZgYU="