Skip to content

Commit ba0e498

Browse files
committed
Upgrade to JDK 17.
Resolves spring-projectsgh-538.
1 parent 8b39608 commit ba0e498

File tree

2 files changed

+5
-65
lines changed

2 files changed

+5
-65
lines changed

Jenkinsfile

+4-64
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pipeline {
1212
}
1313

1414
stages {
15-
stage("test: baseline (jdk8)") {
15+
stage("test: baseline (jdk17)") {
1616
when {
1717
anyOf {
1818
branch 'main'
@@ -29,7 +29,7 @@ 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('adoptopenjdk/openjdk17:latest').inside('-v $HOME:/tmp/jenkins-home') {
3333
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
3434
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
3535
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
@@ -43,66 +43,6 @@ pipeline {
4343
}
4444
}
4545

46-
stage("Test other configurations") {
47-
when {
48-
allOf {
49-
branch 'main'
50-
not { triggeredBy 'UpstreamCause' }
51-
}
52-
}
53-
parallel {
54-
stage("test: baseline (jdk11)") {
55-
agent {
56-
label 'data'
57-
}
58-
options { timeout(time: 30, unit: 'MINUTES') }
59-
environment {
60-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
61-
}
62-
steps {
63-
script {
64-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
65-
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
66-
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
67-
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
68-
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
69-
sh 'rm -Rf `find . -name "newDB"`'
70-
sh 'rm -Rf `find . -name "server" | grep -v "src"`'
71-
sh 'rm -Rf `find . -name "*.log"`'
72-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
73-
}
74-
}
75-
}
76-
}
77-
}
78-
79-
stage("test: baseline (jdk16)") {
80-
agent {
81-
label 'data'
82-
}
83-
options { timeout(time: 30, unit: 'MINUTES') }
84-
environment {
85-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
86-
}
87-
steps {
88-
script {
89-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
90-
docker.image('adoptopenjdk/openjdk16:latest').inside('-v $HOME:/tmp/jenkins-home') {
91-
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
92-
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
93-
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
94-
sh 'rm -Rf `find . -name "newDB"`'
95-
sh 'rm -Rf `find . -name "server" | grep -v "src"`'
96-
sh 'rm -Rf `find . -name "*.log"`'
97-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw -s settings.xml -P java11,remote-java16 clean dependency:list test -Dsort -U -B'
98-
}
99-
}
100-
}
101-
}
102-
}
103-
}
104-
}
105-
10646
stage('Release to artifactory') {
10747
when {
10848
anyOf {
@@ -122,7 +62,7 @@ pipeline {
12262
steps {
12363
script {
12464
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
125-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
65+
docker.image('adoptopenjdk/openjdk17:latest').inside('-v $HOME:/tmp/jenkins-home') {
12666
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
12767
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
12868
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
@@ -158,7 +98,7 @@ pipeline {
15898
steps {
15999
script {
160100
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
161-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
101+
docker.image('adoptopenjdk/openjdk17:latest').inside('-v $HOME:/tmp/jenkins-home') {
162102
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
163103
'-Dartifactory.server=https://repo.spring.io ' +
164104
"-Dartifactory.username=${ARTIFACTORY_USR} " +

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
<properties>
4444
<java-module-name>spring.data.geode</java-module-name>
45-
<source.level>1.8</source.level>
45+
<source.level>17</source.level>
4646
<antlr.version>2.7.7</antlr.version>
4747
<apache-shiro.version>1.7.1</apache-shiro.version>
4848
<cache-api.version>1.1.1</cache-api.version>

0 commit comments

Comments
 (0)