Skip to content

Commit acf046b

Browse files
committed
Update all JDK images to AdoptJDK
Closes gh-15158
1 parent 506fbd8 commit acf046b

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

ci/images/setup.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,23 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.2/c
1919
case "$1" in
2020
java8)
2121
JDK_URL=https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u192-b12/OpenJDK8U-jdk_x64_linux_hotspot_8u192b12.tar.gz
22-
JDK_STRIP=2
2322
;;
2423
java9)
25-
JDK_URL=https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz
26-
JDK_STRIP=1
24+
JDK_URL=https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
2725
;;
2826
java10)
29-
JDK_URL=https://download.java.net/java/GA/jdk10/10.0.1/fb4372174a714e6b8c52526dc134031e/10/openjdk-10.0.1_linux-x64_bin.tar.gz
30-
JDK_STRIP=1
27+
JDK_URL=https://github.com/AdoptOpenJDK/openjdk10-releases/releases/download/jdk-10.0.2%2B13/OpenJDK10_x64_Linux_jdk-10.0.2.13.tar.gz
3128
;;
3229
jav11)
33-
JDK_URL=https://download.java.net/java/GA/jdk11/13/GPL/openjdk-11.0.1_linux-x64_bin.tar.gz
34-
JDK_STRIP=1
30+
JDK_URL=https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz
3531
;;
3632
*)
3733
echo $"Unknown java version"
3834
exit 1
3935
esac
4036
mkdir -p /opt/openjdk
4137
cd /opt/openjdk
42-
curl -L ${JDK_URL} | tar zx --strip-components=${JDK_STRIP}
38+
curl -L ${JDK_URL} | tar zx --strip-components=2
4339

4440

4541
###########################################################

0 commit comments

Comments
 (0)