From 403d9fa2ecfee30482a285ec76806c03990d158c Mon Sep 17 00:00:00 2001
From: Nourhan Shata <nourhan.shata@sap.com>
Date: Sun, 2 Aug 2026 01:18:58 +0200
Subject: [PATCH 1/4] upgrading spring

---
 sample-code/spring-app/pom.xml                                  | 2 +-
 .../src/main/java/com/sap/ai/sdk/app/Application.java           | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sample-code/spring-app/pom.xml b/sample-code/spring-app/pom.xml
index 78c5b57ac..0df0c182a 100644
--- a/sample-code/spring-app/pom.xml
+++ b/sample-code/spring-app/pom.xml
@@ -33,7 +33,7 @@
   </developers>
   <properties>
     <project.rootdir>${project.basedir}/../../</project.rootdir>
-    <spring-boot.version>3.5.16</spring-boot.version>
+    <spring-boot.version>4.1.0</spring-boot.version>
     <cf-logging.version>4.2.0</cf-logging.version>
     <apache-tomcat-embed.version>11.0.24</apache-tomcat-embed.version>
     <mcp-core.version>2.0.0</mcp-core.version>
diff --git a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java
index 0f4ed8348..bd66ca7fe 100644
--- a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java
+++ b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java
@@ -8,7 +8,6 @@
 import javax.annotation.Nonnull;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Primary;
@@ -16,7 +15,6 @@
 /** Main class to start the Spring Boot application. */
 @SpringBootApplication
 @ComponentScan({"com.sap.cloud.sdk", "com.sap.ai.sdk.app"})
-@ServletComponentScan({"com.sap.cloud.sdk", "com.sap.ai.sdk.app"})
 public class Application {
 
   /**

From 60911b4cadd1d15fe284fa1b1269c92a3eaf053d Mon Sep 17 00:00:00 2001
From: Nourhan Shata <nourhan.shata@sap.com>
Date: Mon, 3 Aug 2026 11:34:45 +0200
Subject: [PATCH 2/4] release notes

---
 docs/release_notes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release_notes.md b/docs/release_notes.md
index f1c726585..e5c4933b3 100644
--- a/docs/release_notes.md
+++ b/docs/release_notes.md
@@ -22,6 +22,7 @@
 - [OpenAI] You can now add multiple custom headers to an `OpenAiClient` at once via `.withHeaders()`.
 - [Orchestration] Added `GEMINI_3_1_PRO_PREVIEW_EA` and `MISTRAL_MEDIUM` to model list in `OrchestrationAiModel`.
 - [Orchestration] Reasoning content is now supported for users through `OrchestrationChatResponse.getReasoningText()` and `OrchestrationChatCompletionDelta.getDeltaReasoningText()` to see the thinking processes when using the reasoning models.
+- [spring-app] The `spring-app` is now updated to Spring 7 Spring Boot 4.
 
 ### 📈 Improvements
 

From f35701d20d397d3a51c32e09a091a8ed9f283366 Mon Sep 17 00:00:00 2001
From: Nourhan Shata <nourhan.shata@sap.com>
Date: Tue, 4 Aug 2026 12:00:10 +0200
Subject: [PATCH 3/4] fix

---
 sample-code/spring-app/pom.xml                               | 5 +++++
 .../src/main/java/com/sap/ai/sdk/app/Application.java        | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/sample-code/spring-app/pom.xml b/sample-code/spring-app/pom.xml
index 0df0c182a..5f28f7b96 100644
--- a/sample-code/spring-app/pom.xml
+++ b/sample-code/spring-app/pom.xml
@@ -186,6 +186,11 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot</artifactId>
     </dependency>
+    <dependency>
+      <!-- Provides ServletComponentScan, relocated here in Spring Boot 4 -->
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-web-server</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
diff --git a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java
index bd66ca7fe..7e0cd1ca7 100644
--- a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java
+++ b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java
@@ -8,6 +8,7 @@
 import javax.annotation.Nonnull;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.server.servlet.context.ServletComponentScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Primary;
@@ -15,6 +16,7 @@
 /** Main class to start the Spring Boot application. */
 @SpringBootApplication
 @ComponentScan({"com.sap.cloud.sdk", "com.sap.ai.sdk.app"})
+@ServletComponentScan({"com.sap.cloud.sdk", "com.sap.ai.sdk.app"})
 public class Application {
 
   /**

From abdcfa16fc430ccb3874c08dcdd69f9f638d8778 Mon Sep 17 00:00:00 2001
From: Nourhan Shata <nourhan.shata@sap.com>
Date: Tue, 4 Aug 2026 13:43:31 +0200
Subject: [PATCH 4/4] reverting release notes

---
 docs/release_notes.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/release_notes.md b/docs/release_notes.md
index e5c4933b3..f1c726585 100644
--- a/docs/release_notes.md
+++ b/docs/release_notes.md
@@ -22,7 +22,6 @@
 - [OpenAI] You can now add multiple custom headers to an `OpenAiClient` at once via `.withHeaders()`.
 - [Orchestration] Added `GEMINI_3_1_PRO_PREVIEW_EA` and `MISTRAL_MEDIUM` to model list in `OrchestrationAiModel`.
 - [Orchestration] Reasoning content is now supported for users through `OrchestrationChatResponse.getReasoningText()` and `OrchestrationChatCompletionDelta.getDeltaReasoningText()` to see the thinking processes when using the reasoning models.
-- [spring-app] The `spring-app` is now updated to Spring 7 Spring Boot 4.
 
 ### 📈 Improvements