Merge branch '2.1.x'

6 years ago · 2741e0826f
parent 1100ab2db2 82a711403d
commit 2741e0826f
1 changed files with 2 additions and 12 deletions
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@ -16,20 +16,10 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.2/c
 # JAVA
 ###########################################################
 JDK_URL=$( ./get-jdk-url.sh $1 )
-case "$1" in
-	java8)
-		 COMPONENTS=2
-	;;
-	java11)
-		 COMPONENTS=1
-	;;
-	*)
-		echo $"Unknown java version"
-		exit 1
-esac
+
 mkdir -p /opt/openjdk
 cd /opt/openjdk
-curl -L ${JDK_URL} | tar zx --strip-components=${COMPONENTS}
+curl -L ${JDK_URL} | tar zx --strip-components=1
 test -f /opt/openjdk/bin/java