Skip to content

Commit 7e70d6d

Browse files
committed
Use Java 17 to build snapshots for Artifactory.
Closes #1180
1 parent f565ce4 commit 7e70d6d

File tree

1 file changed

+5
-34
lines changed

1 file changed

+5
-34
lines changed

Jenkinsfile

+5-34
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ pipeline {
7272
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7373
docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.docker']) {
7474
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"
7676
sh "ci/clean.sh"
7777
}
7878
}
7979
}
8080
}
8181
}
8282

83-
stage("test: baseline (jdk15)") {
83+
stage("test: baseline (LTS)") {
8484
agent {
8585
label 'data'
8686
}
@@ -94,9 +94,9 @@ pipeline {
9494
steps {
9595
script {
9696
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']) {
9898
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"
100100
sh "ci/clean.sh"
101101
}
102102
}
@@ -125,7 +125,7 @@ pipeline {
125125
steps {
126126
script {
127127
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']) {
129129
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 ' +
130130
'-Dartifactory.server=https://repo.spring.io ' +
131131
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -139,35 +139,6 @@ pipeline {
139139
}
140140
}
141141
}
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-
}
171142
}
172143

173144
post {

0 commit comments

Comments
 (0)