@@ -72,15 +72,15 @@ pipeline {
72
72
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
73
73
docker. image(p[' docker.java.11.image' ]). inside(p[' docker.java.inside.docker' ]) {
74
74
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
75
- sh " PROFILE=ci,java11 ci/test.sh"
75
+ sh " PROFILE=ci ci/test.sh"
76
76
sh " ci/clean.sh"
77
77
}
78
78
}
79
79
}
80
80
}
81
81
}
82
82
83
- stage(" test: baseline (jdk15 )" ) {
83
+ stage(" test: baseline (LTS )" ) {
84
84
agent {
85
85
label ' data'
86
86
}
@@ -94,9 +94,9 @@ pipeline {
94
94
steps {
95
95
script {
96
96
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
97
- docker. image(p[' docker.java.15 .image' ]). inside(p[' docker.java.inside.docker' ]) {
97
+ docker. image(p[' docker.java.lts .image' ]). inside(p[' docker.java.inside.docker' ]) {
98
98
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
99
- sh " PROFILE=ci,java11 ci/test.sh"
99
+ sh " PROFILE=ci ci/test.sh"
100
100
sh " ci/clean.sh"
101
101
}
102
102
}
@@ -125,7 +125,7 @@ pipeline {
125
125
steps {
126
126
script {
127
127
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
128
- docker. image(p[' docker.java.main .image' ]). inside(p[' docker.java.inside.basic' ]) {
128
+ docker. image(p[' docker.java.lts .image' ]). inside(p[' docker.java.inside.basic' ]) {
129
129
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc-non-root ' +
130
130
' -Dartifactory.server=https://repo.spring.io ' +
131
131
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
@@ -139,35 +139,6 @@ pipeline {
139
139
}
140
140
}
141
141
}
142
-
143
- stage(' Publish documentation' ) {
144
- when {
145
- branch ' 2.2.x'
146
- }
147
- agent {
148
- label ' data'
149
- }
150
- options { timeout(time : 20 , unit : ' MINUTES' ) }
151
-
152
- environment {
153
- ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
154
- }
155
-
156
- steps {
157
- script {
158
- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
159
- docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
160
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc-non-root ' +
161
- ' -Dartifactory.server=https://repo.spring.io ' +
162
- " -Dartifactory.username=${ ARTIFACTORY_USR} " +
163
- " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
164
- " -Dartifactory.distribution-repository=temp-private-local " +
165
- ' -Dmaven.test.skip=true clean deploy -U -B'
166
- }
167
- }
168
- }
169
- }
170
- }
171
142
}
172
143
173
144
post {
0 commit comments