Skip to content

Commit ef9a4fe

Browse files
committed
Test against Java 20 on CI.
See #2701.
1 parent 410b60a commit ef9a4fe

File tree

2 files changed

+44
-21
lines changed

2 files changed

+44
-21
lines changed

Jenkinsfile

+43-20
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
def p = [:]
22
node {
3-
checkout scm
4-
p = readProperties interpolate: true, file: 'ci/pipeline.properties'
3+
checkout scm
4+
p = readProperties interpolate: true, file: 'ci/pipeline.properties'
55
}
66

77
pipeline {
@@ -18,7 +18,7 @@ pipeline {
1818
}
1919

2020
stages {
21-
stage("test: baseline (Java 17)") {
21+
stage("test: baseline (main)") {
2222
when {
2323
beforeAgent(true)
2424
anyOf {
@@ -32,17 +32,42 @@ pipeline {
3232
options { timeout(time: 60, unit: 'MINUTES') }
3333

3434
environment {
35-
DOCKER_HUB = credentials("${p['docker.credentials']}")
3635
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
3736
}
3837

3938
steps {
4039
script {
41-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
42-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
43-
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
44-
sh "PROFILE=none ci/test.sh"
45-
sh "ci/clean.sh"
40+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
41+
sh "PROFILE=none ci/test.sh"
42+
sh "ci/clean.sh"
43+
}
44+
}
45+
}
46+
}
47+
48+
stage("Test other configurations") {
49+
when {
50+
beforeAgent(true)
51+
allOf {
52+
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
53+
not { triggeredBy 'UpstreamCause' }
54+
}
55+
}
56+
parallel {
57+
stage("test: baseline (next)") {
58+
agent {
59+
label 'data'
60+
}
61+
options { timeout(time: 30, unit: 'MINUTES') }
62+
environment {
63+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
64+
}
65+
steps {
66+
script {
67+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
68+
sh "PROFILE=none ci/test.sh"
69+
sh "ci/clean.sh"
70+
}
4671
}
4772
}
4873
}
@@ -68,17 +93,15 @@ pipeline {
6893

6994
steps {
7095
script {
71-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
72-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
73-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root ' +
74-
'-Dartifactory.server=https://repo.spring.io ' +
75-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
76-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
77-
"-Dartifactory.staging-repository=libs-snapshot-local " +
78-
"-Dartifactory.build-name=spring-data-neo4j " +
79-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
80-
'-Dmaven.test.skip=true clean deploy -U -B'
81-
}
96+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
97+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root ' +
98+
'-Dartifactory.server=https://repo.spring.io ' +
99+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
100+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
101+
"-Dartifactory.staging-repository=libs-snapshot-local " +
102+
"-Dartifactory.build-name=spring-data-neo4j " +
103+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
104+
'-Dmaven.test.skip=true clean deploy -U -B'
82105
}
83106
}
84107
}

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<archunit.version>0.23.1</archunit.version>
7373
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
7474
<asciidoctorj-diagram.version>2.1.0</asciidoctorj-diagram.version>
75-
<byte-buddy.version>1.11.0</byte-buddy.version>
75+
<byte-buddy.version>1.14.3</byte-buddy.version>
7676
<cdi>3.0.1</cdi>
7777
<checkstyle.skip>${skipTests}</checkstyle.skip>
7878
<checkstyle.version>8.40</checkstyle.version>

0 commit comments

Comments
 (0)