From cecc046c26ebc265a1355b43cc6b4bfbcd290ee4 Mon Sep 17 00:00:00 2001
From: Piotr Kubowicz <piotr.kubowicz@gmail.com>
Date: Thu, 5 Jun 2025 14:32:12 +0200
Subject: [PATCH] build: Use spring-web instead of spring-webflux in
 spring-ai-retry

The dependency on spring-webflux was unnecessary, there was no code
inside spring-ai-retry that made use of it.

Also remove 'optional' from slf4j-api dependency (it's not optional,
if you don't have it on classpath, RetryUtils will fail to load).

Add explicit dependency on spring-webflux for modules that directly
import WebClient.

Auto-cherry-pick to 1.0.x

Fixes #3307

Signed-off-by: Piotr Kubowicz <piotr.kubowicz@gmail.com>
---
 models/spring-ai-anthropic/pom.xml  | 5 +++++
 models/spring-ai-deepseek/pom.xml   | 5 +++++
 models/spring-ai-minimax/pom.xml    | 5 +++++
 models/spring-ai-mistral-ai/pom.xml | 5 +++++
 models/spring-ai-ollama/pom.xml     | 5 +++++
 models/spring-ai-openai/pom.xml     | 5 +++++
 models/spring-ai-zhipuai/pom.xml    | 5 +++++
 spring-ai-retry/pom.xml             | 5 ++---
 8 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/models/spring-ai-anthropic/pom.xml b/models/spring-ai-anthropic/pom.xml
index a18c852f8..5c231aa23 100644
--- a/models/spring-ai-anthropic/pom.xml
+++ b/models/spring-ai-anthropic/pom.xml
@@ -77,6 +77,11 @@
 			<artifactId>spring-context-support</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webflux</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
diff --git a/models/spring-ai-deepseek/pom.xml b/models/spring-ai-deepseek/pom.xml
index 2d7c1749d..0f4c2a68a 100644
--- a/models/spring-ai-deepseek/pom.xml
+++ b/models/spring-ai-deepseek/pom.xml
@@ -40,6 +40,11 @@
 			<artifactId>spring-context-support</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webflux</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
diff --git a/models/spring-ai-minimax/pom.xml b/models/spring-ai-minimax/pom.xml
index abb584a22..91c799b67 100644
--- a/models/spring-ai-minimax/pom.xml
+++ b/models/spring-ai-minimax/pom.xml
@@ -60,6 +60,11 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+        </dependency>
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
diff --git a/models/spring-ai-mistral-ai/pom.xml b/models/spring-ai-mistral-ai/pom.xml
index 324861814..71d6f19f9 100644
--- a/models/spring-ai-mistral-ai/pom.xml
+++ b/models/spring-ai-mistral-ai/pom.xml
@@ -61,6 +61,11 @@
 			<artifactId>spring-context-support</artifactId>
 		</dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+        </dependency>
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
diff --git a/models/spring-ai-ollama/pom.xml b/models/spring-ai-ollama/pom.xml
index 3e19393b1..673064e4b 100644
--- a/models/spring-ai-ollama/pom.xml
+++ b/models/spring-ai-ollama/pom.xml
@@ -57,6 +57,11 @@
             <version>${project.parent.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/models/spring-ai-openai/pom.xml b/models/spring-ai-openai/pom.xml
index dab9f0469..6872d37dd 100644
--- a/models/spring-ai-openai/pom.xml
+++ b/models/spring-ai-openai/pom.xml
@@ -72,6 +72,11 @@
 			<artifactId>spring-context-support</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webflux</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
diff --git a/models/spring-ai-zhipuai/pom.xml b/models/spring-ai-zhipuai/pom.xml
index 9afde9b40..1b876f40f 100644
--- a/models/spring-ai-zhipuai/pom.xml
+++ b/models/spring-ai-zhipuai/pom.xml
@@ -58,6 +58,11 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+        </dependency>
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
diff --git a/spring-ai-retry/pom.xml b/spring-ai-retry/pom.xml
index 3895adb7b..20393c99a 100644
--- a/spring-ai-retry/pom.xml
+++ b/spring-ai-retry/pom.xml
@@ -49,13 +49,12 @@
 
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-webflux</artifactId>
+			<artifactId>spring-web</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<optional>true</optional>
 		</dependency>
 
 		<!-- test dependencies -->
@@ -66,4 +65,4 @@
 		</dependency>
 
 	</dependencies>
-</project>
\ No newline at end of file
+</project>