From 844dc9c78c70eb78122bd56c6df6ef6bd78f4347 Mon Sep 17 00:00:00 2001
From: Enno <458526+ennru@users.noreply.github.com>
Date: Tue, 15 Sep 2020 19:07:15 +0200
Subject: [PATCH] Assure we get the selected JDK

---
 .travis.yml      | 3 +--
 build.sbt        | 8 +++++++-
 scripts/build.sh | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e325f7eb5d..a182c64c6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,7 @@ git:
 
 before_install:
   # using jabba for custom jdk management
-  - if [ ! -f ~/.jabba/jabba.sh ]; then curl -L -v --retry 5 -o jabba-install.sh https://raw.githubusercontent.com/shyiko/jabba/0.11.2/install.sh && bash jabba-install.sh; fi
-  - . ~/.jabba/jabba.sh
+  # see ./scripts/build.sh
 
 # default script for jobs, that do not have any specified
 script: ./scripts/travis.sh
diff --git a/build.sbt b/build.sbt
index baf5c4d768..9edc705187 100644
--- a/build.sbt
+++ b/build.sbt
@@ -190,6 +190,7 @@ lazy val googleCloudPubSubGrpc = alpakkaProject(
       "-P:silencer:pathFilters=akka-grpc/main",
       "-P:silencer:pathFilters=akka-grpc/test"
     ),
+  javacOptions := javacOptions.value.filterNot(_ == "-Xlint:deprecation"),
   crossScalaVersions --= Seq(Dependencies.Scala211) // 2.11 is not supported since Akka gRPC 0.6
 ).enablePlugins(AkkaGrpcPlugin)
 
@@ -259,7 +260,12 @@ lazy val springWeb = alpakkaProject("spring-web", "spring.web", Dependencies.Spr
 
 lazy val simpleCodecs = alpakkaProject("simple-codecs", "simplecodecs")
 
-lazy val slick = alpakkaProject("slick", "slick", Dependencies.Slick)
+lazy val slick = alpakkaProject(
+  "slick",
+  "slick",
+  Dependencies.Slick,
+  javacOptions := javacOptions.value.filterNot(_ == "-Xlint:deprecation")
+)
 
 lazy val eventbridge = alpakkaProject("aws-event-bridge", "aws.eventbridge", Dependencies.Eventbridge)
 
diff --git a/scripts/build.sh b/scripts/build.sh
index 82f757162a..773afd4bf1 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -7,6 +7,10 @@ CMD=$2
 
 [ "$TRAVIS_EVENT_TYPE" == "cron" ] && JDK="adopt@~1.11-0" || JDK="adopt@~1.8-0"
 
+# using jabba for custom jdk management
+if [ ! -f ~/.jabba/jabba.sh ]; then curl -L -v --retry 5 -o jabba-install.sh https://raw.githubusercontent.com/shyiko/jabba/0.11.2/install.sh && bash jabba-install.sh; fi
+. ~/.jabba/jabba.sh
+
 ~/.jabba/bin/jabba install "$JDK"
 ~/.jabba/bin/jabba use "$JDK"
 java -version