Skip to content

Commit fd59b2b

Browse files
committed
Add Java 23.0.2 and Java 24.
1 parent 588a492 commit fd59b2b

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pipeline {
2828

2929
steps {
3030
script {
31-
def image = docker.build("springci/spring-data-release-tools:0.20", "ci")
31+
def image = docker.build("springci/spring-data-release-tools:0.22", "ci")
3232
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
3333
image.push()
3434
}
@@ -64,7 +64,7 @@ pipeline {
6464

6565
steps {
6666
script {
67-
docker.image("springci/spring-data-release-tools:0.20").inside() {
67+
docker.image("springci/spring-data-release-tools:0.22").inside() {
6868
sh "ci/build-spring-data-release-cli.bash"
6969
sh "ci/build-and-distribute.bash ${p['release.version']}"
7070
}

ci/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:23.04
1+
FROM ubuntu:25.04
22

33
# Bake a container using sdkman to get all the needed JDKs.
44
ARG USER_UID="1100"
@@ -32,9 +32,9 @@ RUN curl -s "https://get.sdkman.io" | bash
3232
RUN bash -c "cd /home/jenkins && \
3333
chmod a+x /home/jenkins/java-init.sh && \
3434
./java-init.sh && \
35-
rm -rf $HOME/.sdkman/archives/* && \
36-
rm -rf $HOME/.sdkman/tmp/*"
35+
rm -rf /home/jenkins/.sdkman/archives/* && \
36+
rm -rf /home/jenkins/.sdkman/tmp/*"
3737

38-
ENV MAVEN_HOME="$HOME/.sdkman/candidates/maven/current"
39-
ENV JAVA_HOME="$HOME/.sdkman/candidates/java/current"
38+
ENV MAVEN_HOME="/home/jenkins/.sdkman/candidates/maven/current"
39+
ENV JAVA_HOME="/home/jenkins/.sdkman/candidates/java/current"
4040
ENV PATH="$MAVEN_HOME/bin:$JAVA_HOME/bin:$PATH"

ci/java-tools.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Tool requirements
2-
jdks=17.0.13,17.0.12,17.0.9,8.0.382
2+
jdks=24.0.1,23.0.2,17.0.13,8.0.382
33
maven=3.9.9

0 commit comments

Comments
 (0)