Skip to content

Commit a1f0581

Browse files
committed
Replace all AdoptOpenJDK OpenJDK17 references to 'openjdk:17-bullseye'.
Resolves spring-projectsgh-538.
1 parent cd2a8ce commit a1f0581

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

Jenkinsfile

+1-5
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,7 @@ pipeline {
131131
steps {
132132
script {
133133
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
134-
<<<<<<< HEAD
135134
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
136-
=======
137-
docker.image('adoptopenjdk/openjdk17:latest').inside('-v $HOME:/tmp/jenkins-home') {
138-
>>>>>>> Upgrade to JDK 17.
139135
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
140136
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
141137
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
@@ -171,7 +167,7 @@ pipeline {
171167
steps {
172168
script {
173169
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
174-
docker.image('adoptopenjdk/openjdk17:latest').inside('-v $HOME:/tmp/jenkins-home') {
170+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
175171
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
176172
'-Dartifactory.server=https://repo.spring.io ' +
177173
"-Dartifactory.username=${ARTIFACTORY_USR} " +

0 commit comments

Comments
 (0)