From 7fc6df089ad46bede863094aeb051110567fcdfd Mon Sep 17 00:00:00 2001
From: ddobrin <ddobrin@google.com>
Date: Tue, 3 Mar 2026 19:15:13 -0500
Subject: [PATCH] refactor: Fixes #947 Update Spring Boot version to 4.0.2,
 update Spring AI to 2.0.0-M2, organize corresponding imports

---
 contrib/spring-ai/pom.xml                     |  2 +-
 dev/pom.xml                                   |  5 +++
 .../com/google/adk/web/AdkWebServerTest.java  |  2 +-
 .../google/adk/web/AdkWebServerUITest.java    |  2 +-
 pom.xml                                       | 41 ++++---------------
 5 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/contrib/spring-ai/pom.xml b/contrib/spring-ai/pom.xml
index 64346b1c3..e07deec9e 100644
--- a/contrib/spring-ai/pom.xml
+++ b/contrib/spring-ai/pom.xml
@@ -29,7 +29,7 @@
     <description>Spring AI integration for the Agent Development Kit.</description>
 
     <properties>
-        <spring-ai.version>1.1.0</spring-ai.version>
+        <spring-ai.version>2.0.0-M2</spring-ai.version>
         <testcontainers.version>1.21.3</testcontainers.version>
     </properties>
 
diff --git a/dev/pom.xml b/dev/pom.xml
index 8595995ed..6a0a03467 100644
--- a/dev/pom.xml
+++ b/dev/pom.xml
@@ -63,6 +63,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webmvc-test</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
diff --git a/dev/src/test/java/com/google/adk/web/AdkWebServerTest.java b/dev/src/test/java/com/google/adk/web/AdkWebServerTest.java
index 71aaca180..275001200 100644
--- a/dev/src/test/java/com/google/adk/web/AdkWebServerTest.java
+++ b/dev/src/test/java/com/google/adk/web/AdkWebServerTest.java
@@ -26,8 +26,8 @@
 import org.hamcrest.Matchers;
 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.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
diff --git a/dev/src/test/java/com/google/adk/web/AdkWebServerUITest.java b/dev/src/test/java/com/google/adk/web/AdkWebServerUITest.java
index f4287f786..cfb162db2 100644
--- a/dev/src/test/java/com/google/adk/web/AdkWebServerUITest.java
+++ b/dev/src/test/java/com/google/adk/web/AdkWebServerUITest.java
@@ -24,8 +24,8 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 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.test.web.servlet.MockMvc;
 
 /**
diff --git a/pom.xml b/pom.xml
index d3f2ba432..218235c72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <auto-value.version>1.11.1</auto-value.version>
-    <spring-boot.version>3.4.1</spring-boot.version>
+    <spring-boot.version>4.0.2</spring-boot.version>
     <!-- otel.version capped at 1.51.0 to avoid conflicts with google
          cloud libraries. Once they update their otel dependencies we
          can consider updating ours here as well -->
@@ -55,7 +55,7 @@
     <junit.version>5.11.4</junit.version>
     <mockito.version>5.20.0</mockito.version>
     <java-websocket.version>1.6.0</java-websocket.version>
-    <jackson.version>2.19.0</jackson.version>
+    <jackson.version>2.20.2</jackson.version>
     <okhttp.version>4.12.0</okhttp.version>
     <docker-java.version>3.3.6</docker-java.version>
     <graphviz.version>0.18.1</graphviz.version>
@@ -77,6 +77,13 @@
   <dependencyManagement>
     <dependencies>
       <!-- BOMs for dependency management -->
+      <dependency>
+        <groupId>com.fasterxml.jackson</groupId>
+        <artifactId>jackson-bom</artifactId>
+        <version>${jackson.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
@@ -159,36 +166,6 @@
         <artifactId>error_prone_annotations</artifactId>
         <version>${errorprone.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-core</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-annotations</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.datatype</groupId>
-        <artifactId>jackson-datatype-jdk8</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.datatype</groupId>
-        <artifactId>jackson-datatype-jsr310</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.dataformat</groupId>
-        <artifactId>jackson-dataformat-yaml</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-java</artifactId>