[docker] use AdoptOpenJdk for all java releases, and add the latest version for all supported build systems

5 files changed, 14 insertions, 12 deletions

diff --git a/docker/provision/jdk/java-10.sh b/docker/provision/jdk/java-10.sh
index 4cf75f60..51aebd25 100755
--- a/docker/provision/jdk/java-10.sh
+++ b/docker/provision/jdk/java-10.sh
@@ -1,4 +1,4 @@
 apt-get update && apt-get install -y wget
-wget https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz -O jdk.tar.gz
+wget https://github.com/AdoptOpenJDK/openjdk10-releases/releases/download/jdk-10.0.2%2B13/OpenJDK10_x64_Linux_jdk-10.0.2%2B13.tar.gz -O jdk.tar.gz
 tar -xzf jdk.tar.gz -C /opt/
-mv /opt/jdk-10.0.2 /opt/jdk
+mv /opt/jdk-10.0.2+13 /opt/jdk
diff --git a/docker/provision/jdk/java-11.sh b/docker/provision/jdk/java-11.sh
index 6252c2ae..21f4e949 100644
--- a/docker/provision/jdk/java-11.sh
+++ b/docker/provision/jdk/java-11.sh
@@ -1,4 +1,4 @@
 apt-get update && apt-get install -y wget
-wget https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O jdk.tar.gz
+wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz -O jdk.tar.gz
 tar -xzf jdk.tar.gz -C /opt/
-mv /opt/jdk-11.0.2 /opt/jdk
\ No newline at end of file
+mv /opt/jdk-11.0.4+11 /opt/jdk
\ No newline at end of file
diff --git a/docker/provision/jdk/java-12.sh b/docker/provision/jdk/java-12.sh
new file mode 100644
index 00000000..6598d56c
--- /dev/null
+++ b/docker/provision/jdk/java-12.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget
+wget https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jdk_x64_linux_hotspot_12.0.2_10.tar.gz -O jdk.tar.gz
+tar -xzf jdk.tar.gz -C /opt/
+mv /opt/jdk-12.0.2+10 /opt/jdk
\ No newline at end of file
diff --git a/docker/provision/jdk/java-8.sh b/docker/provision/jdk/java-8.sh
index 44795c6c..7875ef2c 100755
--- a/docker/provision/jdk/java-8.sh
+++ b/docker/provision/jdk/java-8.sh
@@ -1,6 +1,4 @@
-apt-get update && apt-get install -y software-properties-common
-echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
-add-apt-repository -y ppa:webupd8team/java
-apt-get update && apt-get install -y oracle-java8-installer
-
-mv /usr/lib/jvm/java-8-oracle /opt/jdk
+apt-get update && apt-get install -y wget
+wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz -O jdk.tar.gz
+tar -xzf jdk.tar.gz -C /opt/
+mv /opt/jdk8u222-b10 /opt/jdk
\ No newline at end of file
diff --git a/docker/provision/jdk/java-9.sh b/docker/provision/jdk/java-9.sh
index 483c1a28..4b4bac90 100755
--- a/docker/provision/jdk/java-9.sh
+++ b/docker/provision/jdk/java-9.sh
@@ -1,4 +1,4 @@
 apt-get update && apt-get install -y wget
-wget https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz -O jdk.tar.gz
+wget https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz -O jdk.tar.gz
 tar -xzf jdk.tar.gz -C /opt/
-mv /opt/jdk-9.0.4 /opt/jdk
+mv /opt/jdk-9.0.4+11 /opt/jdk