From 7089b56de41e020727087f2a542f5b60e90ba036 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 22 Feb 2022 10:14:08 +0100 Subject: [PATCH] Use Java 17 to build snapshots for Artifactory. Closes #726 --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index de4af75..003b3a6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,7 +74,7 @@ pipeline { docker.withRegistry(p['docker.registry'], p['docker.credentials']) { docker.image(p['docker.java.next.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" } } @@ -98,7 +98,7 @@ pipeline { docker.withRegistry(p['docker.registry'], p['docker.credentials']) { 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" } } @@ -128,7 +128,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} " +