Merge branch '2.1.x' into 2.2.x

Author: mbhave

ci/images/spring-boot-ci-image/Dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
-RUN ./setup.sh java8
 ADD get-docker-url.sh /get-docker-url.sh
+RUN ./setup.sh java8
 
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH

ci/images/spring-boot-jdk11-ci-image/Dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
-RUN ./setup.sh java11
 ADD get-docker-url.sh /get-docker-url.sh
+RUN ./setup.sh java11
 
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH

ci/images/spring-boot-jdk14-ci-image/Dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
-RUN ./setup.sh java14
 ADD get-docker-url.sh /get-docker-url.sh
+RUN ./setup.sh java14
 
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH