From 30881ec0b1b52fabb34371553f6326870be6396f Mon Sep 17 00:00:00 2001
From: Manuel Fink <manuel.fink@sap.com>
Date: Tue, 30 Jun 2026 16:25:15 +0200
Subject: [PATCH 1/3] Update to CDS 5, Spring Boot 4

---
 ams-cap-bookshop/pom.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ams-cap-bookshop/pom.xml b/ams-cap-bookshop/pom.xml
index ee90303..40b1361 100644
--- a/ams-cap-bookshop/pom.xml
+++ b/ams-cap-bookshop/pom.xml
@@ -15,14 +15,15 @@
         <revision>1.0.0-SNAPSHOT</revision>
 
         <!-- DEPENDENCIES VERSION -->
-        <jdk.version>17</jdk.version>
-        <cds.services.version>4.9.0</cds.services.version>
-        <spring.boot.version>3.5.3</spring.boot.version>
+        <jdk.version>21</jdk.version>
+        <cds.services.version>5.0.0</cds.services.version>
+        <spring.boot.version>4.1.0</spring.boot.version>
 
         <cds.install-node.downloadUrl>https://nodejs.org/dist/</cds.install-node.downloadUrl>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <sap.cloud.security.ams.version>4.2.0</sap.cloud.security.ams.version>
+        <sap.cloud.security.ams.version>4.2.1</sap.cloud.security.ams.version>
         <sap.cloud.security.ams.dcl-compiler.version>1.4.0</sap.cloud.security.ams.dcl-compiler.version>
+        <sap.cloud.security.version>4.0.7</sap.cloud.security.version>
     </properties>
 
     <modules>
@@ -58,11 +59,13 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- SAP Cloud Security - override to get setXsuaaToken method for hybrid scenarios -->
+            <!-- SAP Cloud Security -->
             <dependency>
                 <groupId>com.sap.cloud.security</groupId>
-                <artifactId>java-api</artifactId>
-                <version>4.0.7</version>
+                <artifactId>java-bom</artifactId>
+                <version>${sap.cloud.security.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
             </dependency>
         </dependencies>
     </dependencyManagement>

From fdb022b404ff24d069d12e9e715c96a237bcee18 Mon Sep 17 00:00:00 2001
From: Manuel Fink <manuel.fink@sap.com>
Date: Tue, 30 Jun 2026 16:53:55 +0200
Subject: [PATCH 2/3] Use JDK 25

---
 .github/workflows/build_and_test_cap.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_test_cap.yml b/.github/workflows/build_and_test_cap.yml
index dec5a0d..dce816f 100644
--- a/.github/workflows/build_and_test_cap.yml
+++ b/.github/workflows/build_and_test_cap.yml
@@ -46,10 +46,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
           cache: 'maven'
           cache-dependency-path: ams-cap-bookshop/pom.xml

From f464a44d28fcf3d21780d3fcd2a14991e23a8684 Mon Sep 17 00:00:00 2001
From: Manuel Fink <manuel.fink@sap.com>
Date: Tue, 30 Jun 2026 16:59:07 +0200
Subject: [PATCH 3/3] use JDK 25 in pom.xml

---
 ams-cap-bookshop/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ams-cap-bookshop/pom.xml b/ams-cap-bookshop/pom.xml
index 40b1361..eaa526c 100644
--- a/ams-cap-bookshop/pom.xml
+++ b/ams-cap-bookshop/pom.xml
@@ -15,7 +15,7 @@
         <revision>1.0.0-SNAPSHOT</revision>
 
         <!-- DEPENDENCIES VERSION -->
-        <jdk.version>21</jdk.version>
+        <jdk.version>25</jdk.version>
         <cds.services.version>5.0.0</cds.services.version>
         <spring.boot.version>4.1.0</spring.boot.version>