Merge branch '2.0.x' into 2.1.x

ci/images/setup.sh

@@ -19,15 +19,11 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.2/c
 case "$1" in
 	java8)
 		 JDK_URL=https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u192-b12/OpenJDK8U-jdk_x64_linux_hotspot_8u192b12.tar.gz
-	;;
-	java9)
-		 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
-	;;
-	java10)
-		 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
+		 COMPONENTS=2
 	;;
 	java11)
 		 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
+		 COMPONENTS=1
 	;;
 	*)
 		echo $"Unknown java version"
@@ -35,7 +31,8 @@ case "$1" in
 esac
 mkdir -p /opt/openjdk
 cd /opt/openjdk
-curl -L ${JDK_URL} | tar zx --strip-components=2
+curl -L ${JDK_URL} | tar zx --strip-components=${COMPONENTS}
+test -f /opt/openjdk/bin/java
 
 
 ###########################################################