@@ -58,10 +58,10 @@ pipeline {
5858 }
5959 }
6060 }
61- stage(' Publish JDK 15 + Cassandra 3.11' ) {
61+ stage(' Publish JDK LTS + Cassandra 3.11' ) {
6262 when {
6363 anyOf {
64- changeset " ci/openjdk15 -8-cassandra-3.11/**"
64+ changeset " ci/openjdk17 -8-cassandra-3.11/**"
6565 changeset " ci/pipeline.properties"
6666 }
6767 }
@@ -70,7 +70,7 @@ pipeline {
7070
7171 steps {
7272 script {
73- def image = docker. build(" springci/spring-data-with-cassandra-3.11:${ p['java.15 .tag']} " , " --build-arg BASE=${ p['docker.java.15 .image']} --build-arg CASSANDRA=${ p['docker.cassandra.3.version']} ci/openjdk15 -8-cassandra-3.11/" )
73+ def image = docker. build(" springci/spring-data-with-cassandra-3.11:${ p['java.lts .tag']} " , " --build-arg BASE=${ p['docker.java.lts .image']} --build-arg CASSANDRA=${ p['docker.cassandra.3.version']} ci/openjdk17 -8-cassandra-3.11/" )
7474 docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
7575 image. push()
7676 }
@@ -129,13 +129,13 @@ pipeline {
129129 docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${ p['java.11.tag']} " ). inside(p[' docker.java.inside.basic' ]) {
130130 sh ' mkdir -p /tmp/jenkins-home'
131131 sh ' JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
132- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
132+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
133133 }
134134 }
135135 }
136136 }
137137 }
138- stage(" test: baseline (jdk15 )" ) {
138+ stage(" test: baseline (LTS )" ) {
139139 agent {
140140 label ' data'
141141 }
@@ -146,10 +146,10 @@ pipeline {
146146 steps {
147147 script {
148148 docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
149- docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${ p['java.15 .tag']} " ). inside(p[' docker.java.inside.basic' ]) {
149+ docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${ p['java.lts .tag']} " ). inside(p[' docker.java.inside.basic' ]) {
150150 sh ' mkdir -p /tmp/jenkins-home'
151151 sh ' JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
152- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
152+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
153153 }
154154 }
155155 }
@@ -177,7 +177,7 @@ pipeline {
177177 steps {
178178 script {
179179 docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
180- docker. image(p[' docker.java.main .image' ]). inside(p[' docker.java.inside.basic' ]) {
180+ docker. image(p[' docker.java.lts .image' ]). inside(p[' docker.java.inside.basic' ]) {
181181 sh ' mkdir -p /tmp/jenkins-home'
182182 sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
183183 ' -Dartifactory.server=https://repo.spring.io ' +
0 commit comments