Skip to content

Commit 61af9ac

Browse files
committed
Upgrade build to Java 25.
Closes gh-944
1 parent 48b7f73 commit 61af9ac

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ pipeline {
1919
stages {
2020
stage("Docker images") {
2121
parallel {
22-
stage('Publish JDK 17 + Vault Docker image') {
22+
stage('Publish JDK 25 + Vault Docker image') {
2323
when {
2424
anyOf {
25-
changeset "ci/openjdk17-vault/Dockerfile"
25+
changeset "ci/openjdk25-vault/Dockerfile"
2626
changeset "src/test/bash/install_vault.sh"
2727
changeset "ci/pipeline.properties"
2828
}
@@ -32,7 +32,7 @@ pipeline {
3232

3333
steps {
3434
script {
35-
def image = docker.build("${p['docker.build.image.name']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VAULT=${p['docker.vault.version']} -f ci/openjdk17-vault/Dockerfile .")
35+
def image = docker.build("${p['docker.build.image.name']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VAULT=${p['docker.vault.version']} -f ci/openjdk25-vault/Dockerfile .")
3636
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
3737
image.push()
3838
}
@@ -42,7 +42,7 @@ pipeline {
4242
}
4343
}
4444

45-
stage("test: baseline (Java 17)") {
45+
stage("test: baseline (Java 25)") {
4646
when {
4747
beforeAgent(true)
4848
anyOf {
File renamed without changes.

ci/pipeline.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Java versions
2-
java.main.tag=17.0.13_11-jdk-focal
2+
java.main.tag=25-jdk-noble
33

44
# Docker container images - standard
5-
docker.java.main.image=eclipse-temurin:${java.main.tag}
5+
docker.java.main.image=library/eclipse-temurin:${java.main.tag}
66

77
# Main docker image name using during the CI build
8-
docker.build.image.name=springci/spring-vault-openjdk17-vault:${java.main.tag}-${docker.vault.version}
8+
docker.build.image.name=springci/spring-vault-openjdk25-vault:${java.main.tag}-${docker.vault.version}
99
docker.image=${docker.build.image.name}
1010

1111
# Supported versions of Vault

0 commit comments

Comments
 (0)