From 5eb740dbac0cf09d87de50c02ba6d9e9df308305 Mon Sep 17 00:00:00 2001
From: Stefan Henke <stefan.henke@sap.com>
Date: Wed, 20 May 2026 12:18:42 +0200
Subject: [PATCH 1/7] sprintg boot 4 support

---
 pom.xml                                        | 10 +++++-----
 srv/pom.xml                                    | 18 ++++++++++++------
 .../it/TravelServiceIntegrationTest.java       |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6293f0b..9dd5bbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,11 +19,11 @@
 
     <!-- DEPENDENCIES VERSION -->
     <jdk.version>21</jdk.version>
-    <cds.services.version>4.9.0</cds.services.version>
-    <spring.boot.version>3.5.12</spring.boot.version>
-    <sap.cloud.sdk.version>5.27.0</sap.cloud.sdk.version>
-    <sap.cloud.security.version>3.6.8</sap.cloud.security.version>
-    <sap.cloud.security.ams.version>3.8.0</sap.cloud.security.ams.version>
+    <cds.services.version>5.0.0-SNAPSHOT</cds.services.version>
+    <spring.boot.version>4.0.3</spring.boot.version>
+    <sap.cloud.sdk.version>5.29.0</sap.cloud.sdk.version>
+    <sap.cloud.security.version>4.0.5</sap.cloud.security.version>
+    <sap.cloud.security.ams.version>4.1.2</sap.cloud.security.ams.version>
 
     <cds.install-node.downloadUrl>https://nodejs.org/dist/</cds.install-node.downloadUrl>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/srv/pom.xml b/srv/pom.xml
index 1d5c99c..9904157 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -46,14 +46,14 @@
     </dependency>
 
     <dependency>
-      <groupId>com.sap.cloud.security.ams.client</groupId>
-      <artifactId>jakarta-ams</artifactId>
+      <groupId>com.sap.cloud.security.ams</groupId>
+      <artifactId>spring-boot-starter-cap-ams</artifactId>
       <version>${sap.cloud.security.ams.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>com.sap.cloud.security.ams.client</groupId>
-      <artifactId>cap-ams-support</artifactId>
+      <groupId>com.sap.cloud.security.ams</groupId>
+      <artifactId>spring-boot-starter-cap-ams-test</artifactId>
       <version>${sap.cloud.security.ams.version}</version>
     </dependency>
 
@@ -85,6 +85,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webmvc-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-test</artifactId>
@@ -183,9 +189,9 @@
       </plugin>
 
       <plugin>
-        <groupId>com.sap.cloud.security.ams.client</groupId>
+        <groupId>com.sap.cloud.security.ams.dcl</groupId>
         <artifactId>dcl-compiler-plugin</artifactId>
-        <version>${sap.cloud.security.ams.version}</version>
+        <version>1.3.0</version>
         <executions>
           <execution>
             <id>dcl.compile</id>
diff --git a/srv/src/test/java/sap/capire/xtravels/it/TravelServiceIntegrationTest.java b/srv/src/test/java/sap/capire/xtravels/it/TravelServiceIntegrationTest.java
index 853cc77..9b2fbc2 100644
--- a/srv/src/test/java/sap/capire/xtravels/it/TravelServiceIntegrationTest.java
+++ b/srv/src/test/java/sap/capire/xtravels/it/TravelServiceIntegrationTest.java
@@ -23,8 +23,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
 

From abce7edc15eb225a1c6e463b8167c3e0a89fb7f7 Mon Sep 17 00:00:00 2001
From: Stefan Henke <stefan.henke@sap.com>
Date: Wed, 20 May 2026 13:08:38 +0200
Subject: [PATCH 2/7] fix failing test

---
 srv/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srv/pom.xml b/srv/pom.xml
index 9904157..428719e 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -92,8 +92,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-test</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security-test</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

From 71af747a9ff344660cc42bb8ecd701e8bb1584bb Mon Sep 17 00:00:00 2001
From: Stefan Henke <stefan.henke@sap.com>
Date: Wed, 20 May 2026 13:53:10 +0200
Subject: [PATCH 3/7] fixes

---
 pom.xml     | 2 +-
 srv/pom.xml | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 338abb6..b935872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,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-SNAPSHOT</cds.services.version>
     <spring.boot.version>4.0.3</spring.boot.version>
     <sap.cloud.sdk.version>5.30.0</sap.cloud.sdk.version>
diff --git a/srv/pom.xml b/srv/pom.xml
index 428719e..386709f 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -188,21 +188,18 @@
         </executions>
       </plugin>
 
+      <!-- Plugin for DCL -> DCN compilation before tests -->
       <plugin>
         <groupId>com.sap.cloud.security.ams.dcl</groupId>
         <artifactId>dcl-compiler-plugin</artifactId>
         <version>1.3.0</version>
         <executions>
           <execution>
-            <id>dcl.compile</id>
             <goals>
               <goal>compile</goal>
             </goals>
             <configuration>
               <sourceDirectory>${project.basedir}/src/main/resources/ams</sourceDirectory>
-              <dcn>true</dcn>
-              <dcnParameter>pretty</dcnParameter>
-              <compileTestToDcn>true</compileTestToDcn>
             </configuration>
           </execution>
         </executions>

From a1699ea80f4229d5358c647caf2f4478059b8e95 Mon Sep 17 00:00:00 2001
From: Stefan Henke <stefan.henke@sap.com>
Date: Fri, 3 Jul 2026 10:39:18 +0200
Subject: [PATCH 4/7] Update pom.xml

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index b935872..6d1220f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,10 +19,10 @@
 
     <!-- DEPENDENCIES VERSION -->
     <jdk.version>25</jdk.version>
-    <cds.services.version>5.0.0-SNAPSHOT</cds.services.version>
-    <spring.boot.version>4.0.3</spring.boot.version>
-    <sap.cloud.sdk.version>5.30.0</sap.cloud.sdk.version>
-    <sap.cloud.security.version>4.0.5</sap.cloud.security.version>
+    <cds.services.version>5.0.0</cds.services.version>
+    <spring.boot.version>4.1.0</spring.boot.version>
+    <sap.cloud.sdk.version>5.31.0</sap.cloud.sdk.version>
+    <sap.cloud.security.version>4.0.8</sap.cloud.security.version>
     <sap.cloud.security.ams.version>4.1.2</sap.cloud.security.ams.version>
 
     <cds.install-node.downloadUrl>https://nodejs.org/dist/</cds.install-node.downloadUrl>

From 94da8759c819b09c549b9d86232283fcd33f9f46 Mon Sep 17 00:00:00 2001
From: Stefan Henke <stefan.henke@sap.com>
Date: Fri, 3 Jul 2026 10:57:47 +0200
Subject: [PATCH 5/7] Update pom.xml

---
 srv/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srv/pom.xml b/srv/pom.xml
index 386709f..b32bf80 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -55,6 +55,7 @@
       <groupId>com.sap.cloud.security.ams</groupId>
       <artifactId>spring-boot-starter-cap-ams-test</artifactId>
       <version>${sap.cloud.security.ams.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>

From 6b038387aed43dfbc6f6d3f46500d8a78af1aa25 Mon Sep 17 00:00:00 2001
From: Stefan Henke <stefan.henke@sap.com>
Date: Fri, 3 Jul 2026 10:59:43 +0200
Subject: [PATCH 6/7] Update pom.xml

---
 srv/pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srv/pom.xml b/srv/pom.xml
index b32bf80..9a1207e 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -51,13 +51,6 @@
       <version>${sap.cloud.security.ams.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.sap.cloud.security.ams</groupId>
-      <artifactId>spring-boot-starter-cap-ams-test</artifactId>
-      <version>${sap.cloud.security.ams.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
@@ -97,6 +90,13 @@
       <artifactId>spring-boot-starter-security-test</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.sap.cloud.security.ams</groupId>
+      <artifactId>spring-boot-starter-cap-ams-test</artifactId>
+      <version>${sap.cloud.security.ams.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

From d7422e72b989bf61e93fdde9add77e4e8ad216e2 Mon Sep 17 00:00:00 2001
From: Stefan Henke <stefan.henke@sap.com>
Date: Fri, 3 Jul 2026 11:13:26 +0200
Subject: [PATCH 7/7] Update pom.xml

---
 srv/pom.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srv/pom.xml b/srv/pom.xml
index 9a1207e..386709f 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -51,6 +51,12 @@
       <version>${sap.cloud.security.ams.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.sap.cloud.security.ams</groupId>
+      <artifactId>spring-boot-starter-cap-ams-test</artifactId>
+      <version>${sap.cloud.security.ams.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
@@ -90,13 +96,6 @@
       <artifactId>spring-boot-starter-security-test</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>com.sap.cloud.security.ams</groupId>
-      <artifactId>spring-boot-starter-cap-ams-test</artifactId>
-      <version>${sap.cloud.security.ams.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>