From a1f05817b3620d0748259e6c8fd8399612a32589 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 24 Sep 2021 12:54:16 -0700 Subject: [PATCH] Replace all AdoptOpenJDK OpenJDK17 references to 'openjdk:17-bullseye'. Resolves gh-538. --- Jenkinsfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 25971a20..45205782 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -131,11 +131,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { -<<<<<<< HEAD docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { -======= - docker.image('adoptopenjdk/openjdk17:latest').inside('-v $HOME:/tmp/jenkins-home') { ->>>>>>> Upgrade to JDK 17. sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`' sh 'rm -Rf `find . -name "ConfigDiskDir*"`' sh 'rm -Rf `find . -name "locator*" | grep -v "src"`' @@ -171,7 +167,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('adoptopenjdk/openjdk17:latest').inside('-v $HOME:/tmp/jenkins-home') { + docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') { sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' + '-Dartifactory.server=https://repo.spring.io ' + "-Dartifactory.username=${ARTIFACTORY_USR} " +