feat(apps): Migrate all apps to Spring AI 2.0 and Spring Boot 4.1

.github/dependabot.yml

@@ -2,6 +2,10 @@
 # package ecosystems to update and where the package manifests are located.
 # Please see the documentation for all configuration options:
 # https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+#
+# Grouping strategy: related dependencies that are released and upgraded
+# together are bundled into a single PR to cut review noise. Anything that
+# does not match a group still gets its own PR (Dependabot's default).
 
 version: 2
 updates:
@@ -10,16 +14,50 @@ updates:
       - "**/*"
     schedule:
       interval: "monthly"
+    open-pull-requests-limit: 15
     groups:
+      # AWS SDK for Java artifacts are versioned in lockstep.
       awssdk:
         patterns:
           - "software.amazon.awssdk:*"
-    open-pull-requests-limit: 15
+      # Spring Boot, Spring Framework, Spring AI and the Spring-adjacent
+      # ecosystem move together on coordinated release trains. Bundling them
+      # keeps a Boot/Spring AI upgrade to a single reviewable PR per module.
+      spring:
+        patterns:
+          - "org.springframework:*"
+          - "org.springframework.*:*"
+          - "org.springaicommunity:*"
+          - "io.awspring.cloud:*"
+      # Build-time Maven plugins.
+      maven-plugins:
+        patterns:
+          - "org.apache.maven.plugins:*"
+          - "org.graalvm.buildtools:*"
+          - "io.spring.javaformat:*"
+          - "com.googlecode.maven-download-plugin:*"
+      # Test tooling.
+      testing:
+        patterns:
+          - "org.testcontainers:*"
+          - "*testcontainers*"
+          - "com.microsoft.playwright:*"
+      # Kubernetes Java client artifacts release together.
+      kubernetes:
+        patterns:
+          - "io.kubernetes:*"
   - package-ecosystem: docker
     directories:
       - "**/*"
     schedule:
       interval: "monthly"
+    groups:
+      docker-images:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
   - package-ecosystem: pip
     directory: "/infra/scripts/setup/thread-dump-lambda"
     schedule:
@@ -37,3 +75,7 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"

apps/ai-jvm-analyzer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.6</version>
+        <version>4.1.0</version>
         <relativePath/>
     </parent>
     <groupId>com.example.ai</groupId>
@@ -21,7 +21,7 @@
         <maven.compiler.target>25</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-ai.version>1.1.7</spring-ai.version>
+        <spring-ai.version>2.0.0</spring-ai.version>
     </properties>
 
     <dependencyManagement>

apps/ai-jvm-analyzer/src/main/java/com/example/ai/jvmanalyzer/GitHubSourceCodeTool.java

@@ -1,6 +1,6 @@
 package com.example.ai.jvmanalyzer;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.tool.annotation.Tool;

apps/aiagent-agentcore/aiagent/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
@@ -16,7 +16,7 @@
 
 	<properties>
 		<java.version>25</java.version>
-		<spring-ai.version>2.0.0-M6</spring-ai.version>
+		<spring-ai.version>2.0.0</spring-ai.version>
 	</properties>
 
 	<dependencies>
@@ -59,7 +59,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-advisors-vector-store</artifactId>
+			<artifactId>spring-ai-vector-store-advisor</artifactId>
 		</dependency>
 
 		<!-- Security - OAuth2 Resource Server for JWT validation -->

apps/aiagent-agentcore/backoffice/trip/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>

apps/aiagent/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -28,7 +28,7 @@
 	</scm>
 	<properties>
 		<java.version>25</java.version>
-		<spring-ai.version>2.0.0-RC2</spring-ai.version>
+		<spring-ai.version>2.0.0</spring-ai.version>
 	</properties>
 	<dependencies>
 		<dependency>

apps/java-spring-ai-agents/aiagent/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>

apps/java-spring-ai-agents/backoffice/tools/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>

apps/java-spring-ai-agents/backoffice/trip/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>

apps/perf-analyzer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.6</version>
+        <version>4.1.0</version>
         <relativePath/>
     </parent>
 
@@ -19,7 +19,7 @@
         <java.version>25</java.version>
         <maven.compiler.release>25</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-ai.version>2.0.0-M6</spring-ai.version>
+        <spring-ai.version>2.0.0</spring-ai.version>
         <aws-sdk.version>2.46.6</aws-sdk.version>
         <kubernetes-client.version>26.0.0</kubernetes-client.version>
     </properties>

apps/perf-collector/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.6</version>
+        <version>4.1.0</version>
         <relativePath/>
     </parent>
 

apps/unicorn-spring-ai-agent/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.unicorn</groupId>
@@ -28,7 +28,7 @@
 	</scm>
 	<properties>
 		<java.version>25</java.version>
-		<spring-ai.version>1.1.7</spring-ai.version>
+		<spring-ai.version>2.0.0</spring-ai.version>
 	</properties>
 	<dependencies>
 		<!-- Initial dependencies -->
@@ -66,7 +66,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-advisors-vector-store</artifactId>
+            <artifactId>spring-ai-vector-store-advisor</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.ai</groupId>

apps/unicorn-store-spring/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.6</version>
+        <version>4.1.0</version>
         <relativePath/>
     </parent>
     <groupId>com.unicorn</groupId>

samples/quality-assurance/ai-agent/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -28,7 +28,7 @@
 	</scm>
 	<properties>
 		<java.version>25</java.version>
-		<spring-ai.version>2.0.0-M6</spring-ai.version>
+		<spring-ai.version>2.0.0</spring-ai.version>
 		<mcp-client-security.version>0.0.3</mcp-client-security.version>
 		<testcontainers.version>2.0.5</testcontainers.version>
 	</properties>

samples/quality-assurance/ai-agent/src/test/java/com/example/ai/agent/service/ChatClientEvaluatorTest.java

@@ -54,7 +54,7 @@ public void setup() {
         OllamaApi ollamaApi = OllamaApi.builder().baseUrl(endpoint).build();
         evaluationModel = OllamaChatModel.builder()
                 .ollamaApi(ollamaApi)
-                .defaultOptions(OllamaChatOptions.builder()
+                .options(OllamaChatOptions.builder()
                         .model(EVALUATION_MODEL_ID)
                         .build())
                 .modelManagementOptions(ModelManagementOptions.builder()

samples/quality-assurance/weather/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -28,7 +28,7 @@
 	</scm>
 	<properties>
 		<java.version>25</java.version>
-		<spring-ai.version>1.1.7</spring-ai.version>
+		<spring-ai.version>2.0.0</spring-ai.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

samples/quality-assurance/weather/src/main/java/com/example/weather/WeatherTools.java

@@ -2,7 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springaicommunity.mcp.annotation.McpTool;
+import org.springframework.ai.mcp.annotation.McpTool;
 import org.springframework.stereotype.Component;
 
 /**

samples/quality-assurance/weather/src/test/java/com/example/weather/McpToolsIntegrationTest.java

@@ -1,6 +1,6 @@
 package com.example.weather;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import io.modelcontextprotocol.client.McpClient;
 import io.modelcontextprotocol.client.McpSyncClient;
 import io.modelcontextprotocol.client.transport.HttpClientStreamableHttpTransport;

samples/security/apikey/ai-agent/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -28,7 +28,7 @@
 	</scm>
 	<properties>
 		<java.version>25</java.version>
-		<spring-ai.version>1.1.7</spring-ai.version>
+		<spring-ai.version>2.0.0</spring-ai.version>
 		<mcp-client-security.version>0.0.3</mcp-client-security.version>
 	</properties>
 	<repositories>

samples/security/apikey/weather/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -28,7 +28,7 @@
 	</scm>
 	<properties>
 		<java.version>25</java.version>
-		<spring-ai.version>1.1.7</spring-ai.version>
+		<spring-ai.version>2.0.0</spring-ai.version>
 		<mcp-security.version>0.1.12</mcp-security.version>
 	</properties>
 	<dependencyManagement>

samples/security/apikey/weather/src/main/java/com/example/weather/WeatherTools.java

@@ -2,7 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springaicommunity.mcp.annotation.McpTool;
+import org.springframework.ai.mcp.annotation.McpTool;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Component;
 

samples/security/oauth/ai-agent/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.6</version>
+		<version>4.1.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -28,7 +28,7 @@
 	</scm>
 	<properties>
 		<java.version>25</java.version>
-		<spring-ai.version>1.1.7</spring-ai.version>
+		<spring-ai.version>2.0.0</spring-ai.version>
 		<mcp-client-security.version>0.1.12</mcp-client-security.version>
 	</properties>
 	<repositories>

samples/security/oauth/ai-agent/src/main/java/com/example/ai/agent/McpConfiguration.java

@@ -1,9 +1,10 @@
 package com.example.ai.agent;
 
+import io.modelcontextprotocol.client.McpClient;
 import io.modelcontextprotocol.client.transport.customizer.McpSyncHttpClientRequestCustomizer;
 import org.springaicommunity.mcp.security.client.sync.AuthenticationMcpTransportContextProvider;
 import org.springaicommunity.mcp.security.client.sync.oauth2.http.client.OAuth2AuthorizationCodeSyncHttpRequestCustomizer;
-import org.springframework.ai.mcp.customizer.McpSyncClientCustomizer;
+import org.springframework.ai.mcp.customizer.McpClientCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager;
@@ -20,7 +21,7 @@ McpSyncHttpClientRequestCustomizer requestCustomizer(OAuth2AuthorizedClientManag
     }
 
     @Bean
-    McpSyncClientCustomizer syncClientCustomizer() {
+    McpClientCustomizer<McpClient.SyncSpec> syncClientCustomizer() {
         return (name, syncSpec) -> syncSpec.transportContextProvider(new AuthenticationMcpTransportContextProvider());
     }