Skip to content

Commit cecc046

Browse files
pkubowiczilayaperumalg
authored andcommitted
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>
1 parent e45b1b3 commit cecc046

File tree

8 files changed

+37
-3
lines changed

8 files changed

+37
-3
lines changed

models/spring-ai-anthropic/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@
7777
<artifactId>spring-context-support</artifactId>
7878
</dependency>
7979

80+
<dependency>
81+
<groupId>org.springframework</groupId>
82+
<artifactId>spring-webflux</artifactId>
83+
</dependency>
84+
8085
<dependency>
8186
<groupId>org.slf4j</groupId>
8287
<artifactId>slf4j-api</artifactId>

models/spring-ai-deepseek/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
<artifactId>spring-context-support</artifactId>
4141
</dependency>
4242

43+
<dependency>
44+
<groupId>org.springframework</groupId>
45+
<artifactId>spring-webflux</artifactId>
46+
</dependency>
47+
4348
<dependency>
4449
<groupId>org.slf4j</groupId>
4550
<artifactId>slf4j-api</artifactId>

models/spring-ai-minimax/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@
6060
<artifactId>spring-context-support</artifactId>
6161
</dependency>
6262

63+
<dependency>
64+
<groupId>org.springframework</groupId>
65+
<artifactId>spring-webflux</artifactId>
66+
</dependency>
67+
6368
<dependency>
6469
<groupId>org.slf4j</groupId>
6570
<artifactId>slf4j-api</artifactId>

models/spring-ai-mistral-ai/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@
6161
<artifactId>spring-context-support</artifactId>
6262
</dependency>
6363

64+
<dependency>
65+
<groupId>org.springframework</groupId>
66+
<artifactId>spring-webflux</artifactId>
67+
</dependency>
68+
6469
<dependency>
6570
<groupId>org.slf4j</groupId>
6671
<artifactId>slf4j-api</artifactId>

models/spring-ai-ollama/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@
5757
<version>${project.parent.version}</version>
5858
</dependency>
5959

60+
<dependency>
61+
<groupId>org.springframework</groupId>
62+
<artifactId>spring-webflux</artifactId>
63+
</dependency>
64+
6065
<dependency>
6166
<groupId>com.fasterxml.jackson.core</groupId>
6267
<artifactId>jackson-databind</artifactId>

models/spring-ai-openai/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@
7272
<artifactId>spring-context-support</artifactId>
7373
</dependency>
7474

75+
<dependency>
76+
<groupId>org.springframework</groupId>
77+
<artifactId>spring-webflux</artifactId>
78+
</dependency>
79+
7580
<dependency>
7681
<groupId>org.slf4j</groupId>
7782
<artifactId>slf4j-api</artifactId>

models/spring-ai-zhipuai/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@
5858
<artifactId>spring-context-support</artifactId>
5959
</dependency>
6060

61+
<dependency>
62+
<groupId>org.springframework</groupId>
63+
<artifactId>spring-webflux</artifactId>
64+
</dependency>
65+
6166
<dependency>
6267
<groupId>org.slf4j</groupId>
6368
<artifactId>slf4j-api</artifactId>

spring-ai-retry/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,12 @@
4949

5050
<dependency>
5151
<groupId>org.springframework</groupId>
52-
<artifactId>spring-webflux</artifactId>
52+
<artifactId>spring-web</artifactId>
5353
</dependency>
5454

5555
<dependency>
5656
<groupId>org.slf4j</groupId>
5757
<artifactId>slf4j-api</artifactId>
58-
<optional>true</optional>
5958
</dependency>
6059

6160
<!-- test dependencies -->
@@ -66,4 +65,4 @@
6665
</dependency>
6766

6867
</dependencies>
69-
</project>
68+
</project>

0 commit comments

Comments
 (0)