Skip to content

Commit de0e065

Browse files
committed
Use AdoptOpenJDK for Ubuntu launch script integration tests
Closes gh-16633
1 parent c11e847 commit de0e065

File tree

3 files changed

+14
-16
lines changed
  • spring-boot-integration-tests/spring-boot-launch-script-tests

3 files changed

+14
-16
lines changed

spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</organization>
1818
<properties>
1919
<main.basedir>${basedir}/../..</main.basedir>
20-
<jersey.version>2.23.1</jersey.version>
20+
<jersey.version>2.27</jersey.version>
2121
</properties>
2222
<dependencies>
2323
<dependency>
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.github.docker-java</groupId>
3939
<artifactId>docker-java</artifactId>
40-
<version>3.0.14</version>
40+
<version>3.1.2</version>
4141
<scope>test</scope>
4242
</dependency>
4343
<dependency>
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
FROM ubuntu:trusty-20160914
22
RUN apt-get update && \
3-
apt-get install -y software-properties-common && \
4-
add-apt-repository ppa:webupd8team/java -y && \
5-
apt-get update && \
6-
echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
7-
apt-get install -y oracle-java8-installer && \
8-
apt-get install -y curl && \
9-
apt-get clean
3+
apt-get install -y software-properties-common curl && \
4+
mkdir -p /opt/openjdk && \
5+
cd /opt/openjdk && \
6+
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
7+
ENV JAVA_HOME /opt/openjdk
8+
ENV PATH $JAVA_HOME/bin:$PATH
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
FROM ubuntu:xenial-20160914
22
RUN apt-get update && \
3-
apt-get install -y software-properties-common && \
4-
add-apt-repository ppa:webupd8team/java -y && \
5-
apt-get update && \
6-
echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
7-
apt-get install -y oracle-java8-installer && \
8-
apt-get install -y curl && \
9-
apt-get clean
3+
apt-get install -y software-properties-common curl && \
4+
mkdir -p /opt/openjdk && \
5+
cd /opt/openjdk && \
6+
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
7+
ENV JAVA_HOME /opt/openjdk
8+
ENV PATH $JAVA_HOME/bin:$PATH

0 commit comments

Comments
 (0)