From ef83581733b627c37d26528286e3ba6cb2c0b0cd Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 26 Sep 2025 12:08:09 +0200 Subject: [PATCH] Upgrade to JDK 25. See spring-projects/spring-data-build#2667 --- Jenkinsfile | 10 +++++----- .../Dockerfile | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename ci/{openjdk24-mongodb-8.0 => openjdk25-mongodb-8.0}/Dockerfile (100%) diff --git a/Jenkinsfile b/Jenkinsfile index ce2f27233..c4374cc65 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,10 +20,10 @@ pipeline { stages { stage("Docker images") { parallel { - stage('Publish JDK (Java 24) + MongoDB 8.0') { + stage('Publish JDK (Java 25) + MongoDB 8.0') { when { anyOf { - changeset "ci/openjdk24-mongodb-8.0/**" + changeset "ci/openjdk25-mongodb-8.0/**" changeset "ci/pipeline.properties" } } @@ -32,7 +32,7 @@ pipeline { steps { script { - def image = docker.build("springci/spring-data-with-mongodb-8.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.7.0.version']} ci/openjdk24-mongodb-8.0/") + def image = docker.build("springci/spring-data-with-mongodb-8.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.7.0.version']} ci/openjdk25-mongodb-8.0/") docker.withRegistry(p['docker.registry'], p['docker.credentials']) { image.push() } @@ -42,7 +42,7 @@ pipeline { stage('Publish JDK (Java.next) + MongoDB 8.0') { when { anyOf { - changeset "ci/openjdk24-mongodb-8.0/**" + changeset "ci/openjdk25-mongodb-8.0/**" changeset "ci/pipeline.properties" } } @@ -51,7 +51,7 @@ pipeline { steps { script { - def image = docker.build("springci/spring-data-with-mongodb-8.0:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg MONGODB=${p['docker.mongodb.8.0.version']} ci/openjdk24-mongodb-8.0/") + def image = docker.build("springci/spring-data-with-mongodb-8.0:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg MONGODB=${p['docker.mongodb.8.0.version']} ci/openjdk25-mongodb-8.0/") docker.withRegistry(p['docker.registry'], p['docker.credentials']) { image.push() } diff --git a/ci/openjdk24-mongodb-8.0/Dockerfile b/ci/openjdk25-mongodb-8.0/Dockerfile similarity index 100% rename from ci/openjdk24-mongodb-8.0/Dockerfile rename to ci/openjdk25-mongodb-8.0/Dockerfile