Test against Java 21 in CI.

See #2602
Original pull request: #2608
This commit is contained in:
John Blum
2023-06-12 19:01:31 -07:00
committed by Mark Paluch
parent 7add798886
commit 5996078fe5
3 changed files with 6 additions and 5 deletions

6
Jenkinsfile vendored
View File

@@ -40,10 +40,10 @@ pipeline {
}
}
}
stage('Publish JDK 20 + Redis 6.2 Docker Image') {
stage('Publish JDK 21 + Redis 6.2 Docker Image') {
when {
anyOf {
changeset "ci/openjdk20-redis-6.2/Dockerfile"
changeset "ci/openjdk21-redis-6.2/Dockerfile"
changeset "Makefile"
changeset "ci/pipeline.properties"
}
@@ -53,7 +53,7 @@ pipeline {
steps {
script {
def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk20-redis-6.2/Dockerfile .")
def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk21-redis-6.2/Dockerfile .")
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
image.push()
}

View File

@@ -1,10 +1,11 @@
# Java versions
java.main.tag=17.0.7_7-jdk-focal
java.next.tag=20-jdk-jammy
java.next.tag=21-jdk-bullseye
# Docker container images - standard
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/openjdk:${java.next.tag}
# Supported versions of MongoDB
docker.mongodb.4.4.version=4.4.22
docker.mongodb.5.0.version=5.0.18