@@ -63,14 +63,14 @@ pipeline {
63
63
script {
64
64
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
65
65
docker. image(p[' docker.java.11.image' ]). inside(p[' docker.java.inside.basic' ]) {
66
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
66
+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
67
67
}
68
68
}
69
69
}
70
70
}
71
71
}
72
72
73
- stage(" test: baseline (jdk15 )" ) {
73
+ stage(" test: baseline (LTS )" ) {
74
74
agent {
75
75
label ' data'
76
76
}
@@ -81,8 +81,8 @@ pipeline {
81
81
steps {
82
82
script {
83
83
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
84
- docker. image(p[' docker.java.15 .image' ]). inside(p[' docker.java.inside.basic' ]) {
85
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
84
+ docker. image(p[' docker.java.lts .image' ]). inside(p[' docker.java.inside.basic' ]) {
85
+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
86
86
}
87
87
}
88
88
}
@@ -110,7 +110,7 @@ pipeline {
110
110
steps {
111
111
script {
112
112
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
113
- docker. image(p[' docker.java.main .image' ]). inside(p[' docker.java.inside.basic' ]) {
113
+ docker. image(p[' docker.java.lts .image' ]). inside(p[' docker.java.inside.basic' ]) {
114
114
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
115
115
' -Dartifactory.server=https://repo.spring.io ' +
116
116
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
@@ -124,34 +124,6 @@ pipeline {
124
124
}
125
125
}
126
126
}
127
- stage(' Publish documentation' ) {
128
- when {
129
- branch ' 2.5.x'
130
- }
131
- agent {
132
- label ' data'
133
- }
134
- options { timeout(time : 20 , unit : ' MINUTES' ) }
135
-
136
- environment {
137
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' )
138
- }
139
-
140
- steps {
141
- script {
142
- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
143
- docker. image(' adoptopenjdk/openjdk8:latest' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
144
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
145
- ' -Dartifactory.server=https://repo.spring.io ' +
146
- " -Dartifactory.username=${ ARTIFACTORY_USR} " +
147
- " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
148
- " -Dartifactory.distribution-repository=temp-private-local " +
149
- ' -Dmaven.test.skip=true clean deploy -U -B'
150
- }
151
- }
152
- }
153
- }
154
- }
155
127
}
156
128
157
129
post {
0 commit comments