From 6feeae0f13e0e258eedc99832416b42bb13779b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <stephane.nicoll@broadcom.com>
Date: Tue, 14 Oct 2025 12:35:15 +0200
Subject: [PATCH] Switch to building the project with Java 25

Closes gh-2101
---
 .github/workflows/gradle-build.yml | 2 +-
 .github/workflows/maven-build.yml  | 2 +-
 .gitignore                         | 3 ---
 .sdkmanrc                          | 3 +++
 README.md                          | 4 ++--
 build.gradle                       | 2 +-
 pom.xml                            | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 .sdkmanrc

diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index fcf8c2d61..3c1830015 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '24' ]
+        java: [ '25' ]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 306d9da97..740b1129c 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '24' ]
+        java: [ '25' ]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.gitignore b/.gitignore
index d2767ad28..76cb65ff3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,9 +42,6 @@ out/
 ### VS Code ###
 .vscode/
 
-### SDK Man ###
-.sdkmanrc
-
 ### CSS ###
 _site/
 *.css
diff --git a/.sdkmanrc b/.sdkmanrc
new file mode 100644
index 000000000..2b4236b43
--- /dev/null
+++ b/.sdkmanrc
@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=25-librca
diff --git a/README.md b/README.md
index 2a756bbf9..379bd42a6 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ See the presentation here:
 ## Run Petclinic locally
 
 Spring Petclinic is a [Spring Boot](https://spring.io/guides/gs/spring-boot) application built using [Maven](https://spring.io/guides/gs/maven/) or [Gradle](https://spring.io/guides/gs/gradle/).
-Java 24 or later is required for the build, but the application can run with Java 17 or newer:
+Java 25 or later is required for the build, but the application can run with Java 17 or newer:
 
 ```bash
 git clone https://github.com/spring-projects/spring-petclinic.git
@@ -98,7 +98,7 @@ There is a `petclinic.css` in `src/main/resources/static/resources/css`. It was
 
 The following items should be installed in your system:
 
-- Java 24 or newer (full JDK, not a JRE)
+- Java 25 or newer (full JDK, not a JRE)
 - [Git command line tool](https://help.github.com/articles/set-up-git)
 - Your preferred IDE
   - Eclipse with the m2e plugin. Note: when m2e is available, there is an m2 icon in `Help -> About` dialog. If m2e is
diff --git a/build.gradle b/build.gradle
index cf980abe1..c0b4c0a6f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ version = '4.0.0-SNAPSHOT'
 
 java {
   toolchain {
-    languageVersion = JavaLanguageVersion.of(24)
+    languageVersion = JavaLanguageVersion.of(25)
   }
 }
 
diff --git a/pom.xml b/pom.xml
index b3b9e3783..27bf95607 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <properties>
 
     <!-- Generic properties -->
-    <java.version>24</java.version>
+    <java.version>25</java.version>
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>