From 07f59358dc74e016ae7f8f1fba1c4fc7c820ea38 Mon Sep 17 00:00:00 2001
From: Johannes Rudolph <johannes.rudolph@gmail.com>
Date: Thu, 15 Oct 2020 15:41:46 +0200
Subject: [PATCH] build: replace jabba by proper debian installation

---
 .travis.yml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8381e2b0586..38307bd5bb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,16 +11,18 @@ git:
 before_install:
   # make comparing to origin/master work
   - git remote set-branches --add origin master && git fetch
-  # using jabba for custom jdk management
-  - curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.11.1/install.sh | bash && . ~/.jabba/jabba.sh
-  - jabba install adopt@1.8-0
-  - jabba use "adopt@1.8-0"
+  - whereis java
   - java -version
 
 addons:
   apt:
+    sources:
+    # Official debian package for AdoptOpenJDK from https://adoptopenjdk.net/installation.html#linux-pkg
+    - sourceline: deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ xenial main
+      key_url: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
     packages:
-    - graphviz
+      - graphviz
+      - adoptopenjdk-8-hotspot
 
 before_cache:
   - find $HOME/.ivy2 -name "ivydata-*.properties" -print -delete
@@ -30,12 +32,14 @@ cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt/boot
-    - $HOME/.jabba/jdk
     - $HOME/.cache/coursier
 
 env:
-  # override default (release to maven central) to only close and go to staging repo
-  - CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
+  global:
+    - JAVA_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64
+    - PATH=/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin:$PATH
+    # override default (release to maven central) to only close and go to staging repo
+    - CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
 
 script:
   - sbt -jvm-opts .jvmopts-travis "$CMD"