From e9af002edc314bd68f15aae2b3d48f0ce440456b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 22 Feb 2022 10:15:53 +0100 Subject: [PATCH] Use Java 17 to build snapshots for Artifactory. Closes #726 --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7ef73fa..61aa8d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,7 +72,7 @@ pipeline { docker.withRegistry(p['docker.registry'], p['docker.credentials']) { docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.docker']) { sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" - sh 'PROFILE=ci,java11 ci/test.sh' + sh 'PROFILE=ci ci/test.sh' sh "ci/clean.sh" } } @@ -80,7 +80,7 @@ pipeline { } } - stage("test: baseline (jdk15)") { + stage("test: baseline (LTS)") { agent { label 'data' } @@ -94,9 +94,9 @@ pipeline { steps { script { docker.withRegistry(p['docker.registry'], p['docker.credentials']) { - docker.image(p['docker.java.15.image']).inside(p['docker.java.inside.docker']) { + docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) { sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" - sh 'PROFILE=ci,java11 ci/test.sh' + sh 'PROFILE=ci ci/test.sh' sh "ci/clean.sh" } } @@ -125,7 +125,7 @@ pipeline { steps { script { docker.withRegistry(p['docker.registry'], p['docker.credentials']) { - docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { + docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) { 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-r2dbc-non-root ' + '-Dartifactory.server=https://repo.spring.io ' + "-Dartifactory.username=${ARTIFACTORY_USR} " +