Spring/spring-data-build
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Java 17 to build snapshots for Artifactory.

Browse Source 
Enable Java 11 profile based on the used Java version.

Use Java 17 to build snapshots that are distributed via Artifactory.

Closes #1652
This commit is contained in:
Mark Paluch
2022-02-21 14:11:56 +01:00
parent 3073795cca
commit 963cc7be01
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@@ -54,7 +54,7 @@ pipeline {
script {
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -B'
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
}
}
}
@@ -73,7 +73,7 @@ pipeline {
script {
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
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 -Pjava11 clean dependency:list verify -Dsort -B'
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
}
}
}
@@ -95,7 +95,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 ' +
'-Dartifactory.server=https://repo.spring.io ' +
"-Dartifactory.username=${ARTIFACTORY_USR} " +

2
ci/pipeline.properties
View File

@@ -1,7 +1,7 @@
# Java versions
java.main.tag=8u312-b07-jdk
java.next.tag=11.0.13_8-jdk
java.lts.tag=17.0.1_12-jdk
java.lts.tag=17.0.2_8-jdk
# Docker container images - standard
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}

6
parent/pom.xml
View File

@@ -218,6 +218,10 @@
<java-activation.version>1.1.1</java-activation.version>
</properties>
<activation>
<jdk>(11,</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -245,7 +249,7 @@
<!--
Profile to be run before a release is executed, currently does the following:
- Prevents thrid-party snapshot dependencies in projects
- Prevents third-party snapshot dependencies in projects
-->
<profile>