From f5b106971a6e27b2d97cbda250b7e79d8561fab5 Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Tue, 30 Oct 2018 00:50:10 +0100
Subject: add jdk11 to docker builds

---
 docker/gradle/Dockerfile | 6 +++---
 docker/gradle/readme.md  | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'docker/gradle')

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:
-- 
cgit