From fd898240afedc8c07512cddf59b1f5db4cb9fe8f Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Tue, 3 Nov 2020 10:31:12 +0100 Subject: [PATCH] Update java --- Jenkinsfile | 2 +- build/Dockerfile | 2 +- build/Makefile | 2 +- scm-packaging/docker/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c6dc70b8d7..9acca06822 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -204,7 +204,7 @@ String developmentBranch String mainBranch Maven setupMavenBuild() { - MavenWrapperInDocker mvn = new MavenWrapperInDocker(this, "scmmanager/java-build:11.0.8_10") + MavenWrapperInDocker mvn = new MavenWrapperInDocker(this, "scmmanager/java-build:11.0.9_11.1") mvn.enableDockerHost = true // disable logging durring the build diff --git a/build/Dockerfile b/build/Dockerfile index 6ef5ff1cfb..b5b2585c2b 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -22,7 +22,7 @@ # SOFTWARE. # -FROM adoptopenjdk/openjdk11:x86_64-debian-jdk-11.0.8_10 +FROM adoptopenjdk/openjdk11:x86_64-debian-jdk-11.0.9_11.1 ENV DOCKER_VERSION=19.03.8 \ DOCKER_CHANNEL=stable \ diff --git a/build/Makefile b/build/Makefile index 180b0db68d..8aa8cefc1d 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,4 +1,4 @@ -VERSION:=11.0.8_10 +VERSION:=11.0.9_11.1 .PHONY:build build: diff --git a/scm-packaging/docker/Dockerfile b/scm-packaging/docker/Dockerfile index be60fa9fbe..9c0451a38e 100644 --- a/scm-packaging/docker/Dockerfile +++ b/scm-packaging/docker/Dockerfile @@ -22,7 +22,7 @@ # SOFTWARE. # -FROM adoptopenjdk/openjdk11:jdk-11.0.8_10-alpine-slim +FROM adoptopenjdk/openjdk11:jdk-11.0.9_11.1-alpine-slim ENV SCM_HOME=/var/lib/scm ENV CACHE_DIR=/var/cache/scm/work