Skip to content

Commit 6b97248

Browse files
committed
Use Java 17 to build snapshots for Artifactory.
Enable Java 11 profile based on the used Java version. Use Java 17 to build snapshots that are distributed via Artifactory. Closes #1652
1 parent 6408095 commit 6b97248

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pipeline {
5454
script {
5555
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
5656
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
57-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -B'
57+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
5858
}
5959
}
6060
}
@@ -73,7 +73,7 @@ pipeline {
7373
script {
7474
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7575
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
76-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -B'
76+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
7777
}
7878
}
7979
}
@@ -95,7 +95,7 @@ pipeline {
9595
steps {
9696
script {
9797
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
98-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
98+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
9999
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
100100
'-Dartifactory.server=https://repo.spring.io ' +
101101
"-Dartifactory.username=${ARTIFACTORY_USR} " +

ci/pipeline.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Java versions
22
java.main.tag=8u312-b07-jdk
33
java.next.tag=11.0.13_8-jdk
4-
java.lts.tag=17.0.1_12-jdk
4+
java.lts.tag=17.0.2_8-jdk
55

66
# Docker container images - standard
77
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}

parent/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,10 @@
217217
<java-activation.version>1.1.1</java-activation.version>
218218
</properties>
219219

220+
<activation>
221+
<jdk>(11,</jdk>
222+
</activation>
223+
220224
<dependencies>
221225
<dependency>
222226
<groupId>javax.xml.bind</groupId>
@@ -244,7 +248,7 @@
244248
<!--
245249
Profile to be run before a release is executed, currently does the following:
246250

247-
- Prevents thrid-party snapshot dependencies in projects
251+
- Prevents third-party snapshot dependencies in projects
248252
-->
249253

250254
<profile>

0 commit comments

Comments
 (0)