add jdk11 to docker builds

9 files changed, 26 insertions, 16 deletions

diff --git a/docker/ant/Dockerfile b/docker/ant/Dockerfile
index b4789a2e..7358183e 100644
--- a/docker/ant/Dockerfile
+++ b/docker/ant/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:16.04 as downloader
 
-ARG jdk=10
+ARG jdk=11
 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
 RUN provision/jdk/java-${jdk}.sh
 
@@ -19,7 +19,7 @@ WORKDIR workspace
 
 ADD shared/ ./
 
-ARG jdk=10
+ARG jdk=11
 ADD ant/files/jdk-${jdk} ./
 
 ARG lombokjar=lombok.jar
diff --git a/docker/bazel/Dockerfile b/docker/bazel/Dockerfile
index bbfc4e89..007b7a5b 100644
--- a/docker/bazel/Dockerfile
+++ b/docker/bazel/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:16.04 as downloader
 
-ARG jdk=10
+ARG jdk=11
 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
 RUN provision/jdk/java-${jdk}.sh
 
@@ -23,7 +23,7 @@ ADD bazel/files/ ./
 ARG lombokjar=lombok.jar
 ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar
 
-ARG jdk=10
+ARG jdk=11
 ENV JDK_VERSION=${jdk}
 ENV JAVA_HOME=/opt/jdk
 ENV BAZEL_HOME=/opt/bazel
diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile
index 204fe00f..77f08fe2 100644
--- a/docker/gradle/Dockerfile
+++ b/docker/gradle/Dockerfile
@@ -1,10 +1,10 @@
 FROM ubuntu:16.04 as downloader

 

-ARG jdk=10

+ARG jdk=11

 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh

 RUN provision/jdk/java-${jdk}.sh

 

-ARG gradle=4.7

+ARG gradle=4.10.2

 ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh

 RUN provision/gradle/gradle-${gradle}.sh

 

@@ -22,7 +22,7 @@ ADD gradle/files/ ./
 ARG lombokjar=lombok.jar

 ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar

 

-ARG jdk=10

+ARG jdk=11

 ENV JDK_VERSION=${jdk}

 ENV JAVA_HOME=/opt/jdk

 ENV GRADLE_HOME=/opt/gradle/gradle

diff --git a/docker/gradle/readme.md b/docker/gradle/readme.md
index 486b430b..9744d0ad 100644
--- a/docker/gradle/readme.md
+++ b/docker/gradle/readme.md
@@ -2,11 +2,12 @@
 
 [_(general configuration and options)_](../readme.md)
 
-### `ARG gradle=4.7`
+### `ARG gradle=4.10.2`
 
 The gradle version to be used. Supported values:
 
-- `4.7` (default)
+- `4.10.2` (default)
+- `4.7`
 - `4.2.1`
 
 ## Example build commands:
diff --git a/docker/maven/Dockerfile b/docker/maven/Dockerfile
index a73faaf6..14328486 100644
--- a/docker/maven/Dockerfile
+++ b/docker/maven/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:16.04 as downloader

 

-ARG jdk=10

+ARG jdk=11

 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh

 RUN provision/jdk/java-${jdk}.sh

 

@@ -19,7 +19,7 @@ WORKDIR workspace
 

 ADD shared/ ./

 

-ARG jdk=10

+ARG jdk=11

 ADD maven/files/jdk-${jdk} ./

 

 ARG lombokjar=lombok.jar

diff --git a/docker/provision/gradle/gradle-4.10.2.sh b/docker/provision/gradle/gradle-4.10.2.sh
new file mode 100644
index 00000000..9391714b
--- /dev/null
+++ b/docker/provision/gradle/gradle-4.10.2.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget unzip
+wget https://services.gradle.org/distributions/gradle-4.10.2-bin.zip -O gradle.zip
+mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip
+mv /opt/gradle/gradle-4.10.2 /opt/gradle/gradle
diff --git a/docker/provision/jdk/java-10.sh b/docker/provision/jdk/java-10.sh
index 10790952..4cf75f60 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 -c --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/10.0.1+10/fb4372174a714e6b8c52526dc134031e/jdk-10.0.1_linux-x64_bin.tar.gz -O jdk.tar.gz
+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
 tar -xzf jdk.tar.gz -C /opt/
-mv /opt/jdk-10.0.1 /opt/jdk
+mv /opt/jdk-10.0.2 /opt/jdk
diff --git a/docker/provision/jdk/java-11.sh b/docker/provision/jdk/java-11.sh
new file mode 100644
index 00000000..0d43bbca
--- /dev/null
+++ b/docker/provision/jdk/java-11.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget
+wget https://download.java.net/java/GA/jdk11/13/GPL/openjdk-11.0.1_linux-x64_bin.tar.gz -O jdk.tar.gz
+tar -xzf jdk.tar.gz -C /opt/
+mv /opt/jdk-11.0.1 /opt/jdk
diff --git a/docker/readme.md b/docker/readme.md
index 9939839d..81e500b3 100644
--- a/docker/readme.md
+++ b/docker/readme.md
@@ -10,12 +10,13 @@ Each docker image contains a `/workspace` where all relevant files are located.
 When building the image, a lombok.jar will be downloaded to `/workspace`. By default, this is the latest released version. You

 can download a specific version by adding `--build-arg lombokjar=lombok-<major.minor.build>.jar`

 

-### `ARG jdk=10`

+### `ARG jdk=11`

 

 The jdk version to be used. Supported values:

 

-- `10` (default)

-- `9` (OpenJDK)

+- `11` (default)

+- `10`

+- `9`

 - `8`

 

 The version is also accessible in `JDK_VERSION`.