From de0e065da243668fea1de2f75bc77ea997f7a616 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 24 Apr 2019 09:59:43 +0100
Subject: [PATCH] Use AdoptOpenJDK for Ubuntu launch script integration tests

Closes gh-16633
---
 .../spring-boot-launch-script-tests/pom.xml         |  4 ++--
 .../conf/Ubuntu/trusty-20160914/Dockerfile          | 13 ++++++-------
 .../conf/Ubuntu/xenial-20160914/Dockerfile          | 13 ++++++-------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml b/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml
index f29c21d84e..df59bc13ba 100644
--- a/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml
+++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml
@@ -17,7 +17,7 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<jersey.version>2.23.1</jersey.version>
+		<jersey.version>2.27</jersey.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>com.github.docker-java</groupId>
 			<artifactId>docker-java</artifactId>
-			<version>3.0.14</version>
+			<version>3.1.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile
index 41b96a8fcb..0e4cc372d5 100644
--- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile
+++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile
@@ -1,9 +1,8 @@
 FROM ubuntu:trusty-20160914
 RUN apt-get update && \
-    apt-get install -y software-properties-common && \
-    add-apt-repository ppa:webupd8team/java -y && \
-    apt-get update && \
-    echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
-    apt-get install -y oracle-java8-installer && \
-    apt-get install -y curl && \
-    apt-get clean
+    apt-get install -y software-properties-common curl && \
+    mkdir -p /opt/openjdk && \
+    cd /opt/openjdk && \
+    curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz | tar zx --strip-components=1
+ENV JAVA_HOME /opt/openjdk
+ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile
index 93ac9d080c..e8e84e0c47 100644
--- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile
+++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile
@@ -1,9 +1,8 @@
 FROM ubuntu:xenial-20160914
 RUN apt-get update && \
-    apt-get install -y software-properties-common && \
-    add-apt-repository ppa:webupd8team/java -y && \
-    apt-get update && \
-    echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
-    apt-get install -y oracle-java8-installer && \
-    apt-get install -y curl && \
-    apt-get clean
+    apt-get install -y software-properties-common curl && \
+    mkdir -p /opt/openjdk && \
+    cd /opt/openjdk && \
+    curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz | tar zx --strip-components=1
+ENV JAVA_HOME /opt/openjdk
+ENV PATH $JAVA_HOME/bin:$PATH