Skip to content

Commit 25d9903

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 57af708 commit 25d9903

File tree

1 file changed

+5
-53
lines changed

1 file changed

+5
-53
lines changed

Diff for: Jenkinsfile

+5-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,7 +12,7 @@ pipeline {
1212
}
1313

1414
stages {
15-
stage("test: baseline (jdk8)") {
15+
stage("test: baseline (Java 17)") {
1616
when {
1717
anyOf {
1818
branch ''
@@ -29,62 +29,14 @@ pipeline {
2929
steps {
3030
script {
3131
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
32-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
32+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
3333
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
3434
}
3535
}
3636
}
3737
}
3838
}
3939

40-
stage("Test other configurations") {
41-
when {
42-
allOf {
43-
branch ''
44-
not { triggeredBy 'UpstreamCause' }
45-
}
46-
}
47-
parallel {
48-
stage("test: baseline (jdk11)") {
49-
agent {
50-
label 'data'
51-
}
52-
options { timeout(time: 30, unit: 'MINUTES') }
53-
environment {
54-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
55-
}
56-
steps {
57-
script {
58-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
59-
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
60-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
61-
}
62-
}
63-
}
64-
}
65-
}
66-
67-
stage("test: baseline (jdk17)") {
68-
agent {
69-
label 'data'
70-
}
71-
options { timeout(time: 30, unit: 'MINUTES') }
72-
environment {
73-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
74-
}
75-
steps {
76-
script {
77-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
78-
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
79-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
80-
}
81-
}
82-
}
83-
}
84-
}
85-
}
86-
}
87-
8840
stage('Release to artifactory') {
8941
when {
9042
anyOf {
@@ -104,7 +56,7 @@ pipeline {
10456
steps {
10557
script {
10658
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
107-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
59+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
10860
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
10961
'-Dartifactory.server=https://repo.spring.io ' +
11062
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -134,7 +86,7 @@ pipeline {
13486
steps {
13587
script {
13688
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
137-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
89+
docker.image('openjdk/openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
13890
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
13991
'-Dartifactory.server=https://repo.spring.io ' +
14092
"-Dartifactory.username=${ARTIFACTORY_USR} " +

0 commit comments

Comments
 (0)