From ab2cf387891cee898974ca241dd99172839011e9 Mon Sep 17 00:00:00 2001 From: Austin Blatt Date: Wed, 5 Dec 2018 14:43:34 -0800 Subject: [PATCH] (MAINT) Fix cacert for adoptopenjdk10 The previous commit fixed the ability to download adoptopenjdk10 but the cacert was still not compatible with clojars, so when a dependency changed, it could not be downloaded. This commit fixed adoptopen10's cacert in the same way we fixed it for adoptopenjdk8, by downloading 11 and using its fixed cacert. --- ext/travisci/prep-os-essentials-for | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ext/travisci/prep-os-essentials-for b/ext/travisci/prep-os-essentials-for index f01c36c407..acbbc1b3b2 100755 --- a/ext/travisci/prep-os-essentials-for +++ b/ext/travisci/prep-os-essentials-for @@ -24,7 +24,8 @@ case "$OSTYPE" in brew install postgresql@"$pgver" case "$jdkver" in - 8) + 8|10) + # Install AdoptOpenJDK 11, we will use this for its cacert brew cask install https://raw.githubusercontent.com/Homebrew/homebrew-cask/636d8f0d1afce664f47620b46571e42b01c93d8c/Casks/adoptopenjdk.rb cacert_path=/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home/lib/security/cacerts @@ -35,16 +36,15 @@ case "$OSTYPE" in fi brew tap AdoptOpenJDK/openjdk - # brew cask install adoptopenjdk8 brew cask install "adopt$jdk" - old_cacert_path="/Library/Java/JavaVirtualMachines/adoptopenjdk-$jdkver.jdk/Contents/Home/jre/lib/security/cacerts" - rm "$old_cacert_path" + + if test "$jdkver" -eq 8; then + rm "/Library/Java/JavaVirtualMachines/adoptopenjdk-$jdkver.jdk/Contents/Home/jre/lib/security/cacerts" + else + rm "/Library/Java/JavaVirtualMachines/adoptopenjdk-$jdkver.jdk/Contents/Home/lib/security/cacerts" + fi ln -s $cacert_path "$old_cacert_path" ;; - 10) - brew tap AdoptOpenJDK/openjdk - brew cask install "adopt$jdk" - ;; *) echo "JDK version '$jdk' is not supported on Mac OSX" exit 3