File tree 1 file changed +1
-5
lines changed
1 file changed +1
-5
lines changed Original file line number Diff line number Diff line change @@ -131,11 +131,7 @@ pipeline {
131
131
steps {
132
132
script {
133
133
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
134
- <<<<<< < HEAD
135
134
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 .
139
135
sh ' rm -Rf `find . -name "BACKUPDEFAULT*"`'
140
136
sh ' rm -Rf `find . -name "ConfigDiskDir*"`'
141
137
sh ' rm -Rf `find . -name "locator*" | grep -v "src"`'
@@ -171,7 +167,7 @@ pipeline {
171
167
steps {
172
168
script {
173
169
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' ) {
175
171
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
176
172
' -Dartifactory.server=https://repo.spring.io ' +
177
173
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
You can’t perform that action at this time.
0 commit comments