Skip to content

Commit ade2e96

Browse files
committed
Add baseline build for Java 17 in Maven and Jenkins.
Remove baseline build for Java 16.
1 parent 5649687 commit ade2e96

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pipeline {
7676
}
7777
}
7878

79-
stage("test: baseline (jdk16)") {
79+
stage("test: baseline (jdk17)") {
8080
agent {
8181
label 'data'
8282
}
@@ -87,14 +87,14 @@ pipeline {
8787
steps {
8888
script {
8989
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
90-
docker.image('adoptopenjdk/openjdk16:latest').inside('-v $HOME:/tmp/jenkins-home') {
90+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
9191
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
9292
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
9393
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
9494
sh 'rm -Rf `find . -name "newDB"`'
9595
sh 'rm -Rf `find . -name "server" | grep -v "src"`'
9696
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'
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-java17 clean dependency:list test -Dsort -U -B'
9898
}
9999
}
100100
}

pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,12 @@
5454
</properties>
5555

5656
<repositories>
57+
5758
<repository>
5859
<id>spring-libs-snapshot</id>
5960
<url>https://repo.spring.io/libs-snapshot</url>
6061
</repository>
62+
6163
<repository>
6264
<id>geode-snapshot</id>
6365
<name>Apache Geode Snapshots</name>
@@ -69,12 +71,14 @@
6971
<enabled>true</enabled>
7072
</releases>
7173
</repository>
72-
<!--
74+
75+
<!--
7376
<repository>
7477
<id>apache-snapshots</id>
7578
<url>https://repository.apache.org/content/repositories/orgapachegeode-1060</url>
7679
</repository>
7780
-->
81+
7882
</repositories>
7983

8084
<pluginRepositories>

spring-data-geode/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
</build>
333333
</profile>
334334
<profile>
335-
<id>remote-java16</id>
335+
<id>remote-java17</id>
336336
<build>
337337
<plugins>
338338
<plugin>

0 commit comments

Comments
 (0)