Skip to content

Commit adff563

Browse files
committed
Upgrade to Java 17.
Avoid usage of encapsulated tests as dummies. Add dependency override for ASM dependencies. Use Java 17 in CI pipeline. Closes #2465
1 parent 5d75282 commit adff563

File tree

1 file changed

+32
-53
lines changed

1 file changed

+32
-53
lines changed

Diff for: Jenkinsfile

+32-53
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pipeline {
33

44
triggers {
55
pollSCM 'H/10 * * * *'
6-
upstream(upstreamProjects: "spring-data-build/main", threshold: hudson.model.Result.SUCCESS)
6+
upstream(upstreamProjects: "spring-data-build/3.0.x", threshold: hudson.model.Result.SUCCESS)
77
}
88

99
options {
@@ -12,11 +12,11 @@ pipeline {
1212
}
1313

1414
stages {
15-
stage("test: baseline (jdk8)") {
15+
stage("test: baseline (Java 17)") {
1616
when {
1717
beforeAgent(true)
1818
anyOf {
19-
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
19+
branch ''
2020
not { triggeredBy 'UpstreamCause' }
2121
}
2222
}
@@ -30,70 +30,51 @@ pipeline {
3030
steps {
3131
script {
3232
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
33-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
33+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
3434
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
3535
}
3636
}
3737
}
3838
}
3939
}
4040

41-
stage("Test other configurations") {
41+
stage('Release to artifactory') {
4242
when {
4343
beforeAgent(true)
44-
allOf {
45-
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
44+
anyOf {
45+
branch ''
4646
not { triggeredBy 'UpstreamCause' }
4747
}
4848
}
49-
parallel {
50-
stage("test: baseline (jdk11)") {
51-
agent {
52-
label 'data'
53-
}
54-
options { timeout(time: 30, unit: 'MINUTES') }
55-
environment {
56-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
57-
}
58-
steps {
59-
script {
60-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
61-
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
62-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
63-
}
64-
}
65-
}
66-
}
67-
}
49+
agent {
50+
label 'data'
51+
}
52+
options { timeout(time: 20, unit: 'MINUTES') }
6853

69-
stage("test: baseline (jdk17)") {
70-
agent {
71-
label 'data'
72-
}
73-
options { timeout(time: 30, unit: 'MINUTES') }
74-
environment {
75-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
76-
}
77-
steps {
78-
script {
79-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
80-
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
81-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
82-
}
83-
}
54+
environment {
55+
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
56+
}
57+
58+
steps {
59+
script {
60+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
61+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
62+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
63+
'-Dartifactory.server=https://repo.spring.io ' +
64+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
65+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
66+
"-Dartifactory.staging-repository=libs-snapshot-local " +
67+
"-Dartifactory.build-name=spring-data-commons " +
68+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
69+
'-Dmaven.test.skip=true clean deploy -U -B'
8470
}
8571
}
8672
}
8773
}
8874
}
89-
90-
stage('Release to artifactory') {
75+
stage('Publish documentation') {
9176
when {
92-
beforeAgent(true)
93-
anyOf {
94-
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
95-
not { triggeredBy 'UpstreamCause' }
96-
}
77+
branch ''
9778
}
9879
agent {
9980
label 'data'
@@ -107,14 +88,12 @@ pipeline {
10788
steps {
10889
script {
10990
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
110-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
111-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
91+
docker.image('openjdk/openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
92+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
11293
'-Dartifactory.server=https://repo.spring.io ' +
11394
"-Dartifactory.username=${ARTIFACTORY_USR} " +
11495
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
115-
"-Dartifactory.staging-repository=libs-snapshot-local " +
116-
"-Dartifactory.build-name=spring-data-commons " +
117-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
96+
"-Dartifactory.distribution-repository=temp-private-local " +
11897
'-Dmaven.test.skip=true clean deploy -U -B'
11998
}
12099
}

0 commit comments

Comments
 (0)