Skip to content

Commit d552c1d

Browse files
jackxu2011mcallzbl
jackxu2011
authored and
mcallzbl
committed
feat(core): upgrade spring-ai to 1.0.1, spring-boot to 3.4.8 (alibaba#2028)
1 parent 52f1ef0 commit d552c1d

File tree

11 files changed

+60
-83
lines changed

11 files changed

+60
-83
lines changed

‎pom.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@
220220
<maven.compiler.target>${java.version}</maven.compiler.target>
221221

222222
<!-- Spring version -->
223-
<spring-ai.version>1.0.0</spring-ai.version>
224-
<spring-boot.version>3.4.5</spring-boot.version>
223+
<spring-ai.version>1.0.1</spring-ai.version>
224+
<spring-boot.version>3.4.8</spring-boot.version>
225225
<springdoc-openapi.version>2.8.8</springdoc-openapi.version>
226226

227227
<!-- DashScope SDK Version -->
@@ -248,7 +248,7 @@
248248
<commons-exec.version>1.3</commons-exec.version>
249249
<commons-collections4.version>4.4</commons-collections4.version>
250250

251-
<docker-java>3.3.3</docker-java>
251+
<docker-java.version>3.5.3</docker-java.version>
252252

253253
<opennlp-tools.version>2.3.3</opennlp-tools.version>
254254

@@ -348,7 +348,13 @@
348348
<type>pom</type>
349349
<scope>import</scope>
350350
</dependency>
351-
351+
<dependency>
352+
<groupId>com.github.docker-java</groupId>
353+
<artifactId>docker-java-bom</artifactId>
354+
<version>${docker-java.version}</version>
355+
<type>pom</type>
356+
<scope>import</scope>
357+
</dependency>
352358
</dependencies>
353359
</dependencyManagement>
354360

‎spring-ai-alibaba-core/src/test/java/com/alibaba/cloud/ai/dashscope/chat/DashScopeMultiModalChatTests.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
*/
1616
package com.alibaba.cloud.ai.dashscope.chat;
1717

18+
import java.io.IOException;
19+
import java.net.URI;
20+
import java.time.Duration;
21+
import java.util.ArrayList;
22+
import java.util.List;
23+
import java.util.concurrent.atomic.AtomicReference;
24+
1825
import com.alibaba.cloud.ai.dashscope.api.DashScopeApi;
1926
import com.alibaba.cloud.ai.dashscope.api.DashScopeApi.ChatCompletion;
2027
import com.alibaba.cloud.ai.dashscope.api.DashScopeApi.ChatCompletionChunk;
@@ -29,6 +36,9 @@
2936
import org.junit.jupiter.api.Test;
3037
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
3138
import org.mockito.Mockito;
39+
import reactor.core.publisher.Flux;
40+
import reactor.test.StepVerifier;
41+
3242
import org.springframework.ai.chat.messages.UserMessage;
3343
import org.springframework.ai.chat.model.ChatResponse;
3444
import org.springframework.ai.chat.prompt.Prompt;
@@ -39,15 +49,6 @@
3949
import org.springframework.http.MediaType;
4050
import org.springframework.http.ResponseEntity;
4151
import org.springframework.util.MimeTypeUtils;
42-
import reactor.core.publisher.Flux;
43-
import reactor.test.StepVerifier;
44-
45-
import java.io.IOException;
46-
import java.net.URI;
47-
import java.time.Duration;
48-
import java.util.ArrayList;
49-
import java.util.List;
50-
import java.util.concurrent.atomic.AtomicReference;
5152

5253
import static com.alibaba.cloud.ai.dashscope.common.DashScopeApiConstants.MESSAGE_FORMAT;
5354
import static org.assertj.core.api.Assertions.assertThat;
@@ -419,12 +420,11 @@ void integrationTestVideoWithMultipleFrames() throws IOException {
419420
*/
420421
@Test
421422
@Tag("integration")
422-
@EnabledIfEnvironmentVariable(named = "AI_DASHSCOPE_API_KEY", matches = ".+")
423+
@EnabledIfEnvironmentVariable(named = "AI_DASHSCOPE_API_KEY", matches = "sk.+")
423424
void integrationTestAudioWithMultipleFrames() throws IOException {
424425
// Create real API client
425426
String apiKey = System.getenv("AI_DASHSCOPE_API_KEY");
426427
DashScopeApi realApi = DashScopeApi.builder().apiKey(apiKey).build();
427-
;
428428

429429
// Create real chat model
430430
DashScopeChatModel realChatModel = DashScopeChatModel.builder().dashScopeApi(realApi).build();

‎spring-ai-alibaba-core/src/test/java/com/alibaba/cloud/ai/dashscope/image/observation/DashScopeImageModelObservationITests.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package com.alibaba.cloud.ai.dashscope.image.observation;
1717

18+
import java.util.List;
19+
1820
import com.alibaba.cloud.ai.dashscope.api.DashScopeImageApi;
1921
import com.alibaba.cloud.ai.dashscope.api.DashScopeImageApi.DashScopeImageAsyncResponse;
2022
import com.alibaba.cloud.ai.dashscope.api.DashScopeImageApi.DashScopeImageAsyncResponse.DashScopeImageAsyncResponseOutput;
@@ -29,6 +31,7 @@
2931
import org.junit.jupiter.api.Test;
3032
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
3133
import org.mockito.Mockito;
34+
3235
import org.springframework.ai.image.Image;
3336
import org.springframework.ai.image.ImagePrompt;
3437
import org.springframework.ai.image.ImageResponse;
@@ -40,8 +43,6 @@
4043
import org.springframework.http.ResponseEntity;
4144
import org.springframework.web.client.RestClient;
4245

43-
import java.util.List;
44-
4546
import static com.alibaba.cloud.ai.dashscope.common.DashScopeApiConstants.DEFAULT_BASE_URL;
4647
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
4748
import static org.mockito.ArgumentMatchers.any;
@@ -71,7 +72,7 @@ public DashScopeImageModelObservationTests() {
7172

7273
@Test
7374
@Tag("observation")
74-
@EnabledIfEnvironmentVariable(named = "AI_DASHSCOPE_API_KEY", matches = ".*")
75+
@EnabledIfEnvironmentVariable(named = "AI_DASHSCOPE_API_KEY", matches = "sk.+")
7576
void imageModelObservationTest() {
7677

7778
DashScopeImageOptions options = DashScopeImageOptions.builder()

‎spring-ai-alibaba-deepresearch/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
<maven.compiler.source>17</maven.compiler.source>
1414
<maven.compiler.target>17</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<spring-boot.version>3.4.5</spring-boot.version>
16+
<spring-boot.version>3.4.8</spring-boot.version>
1717

1818
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
1919
<moditect-maven-plugin.version>1.2.0.Final</moditect-maven-plugin.version>
2020
<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
2121
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
2222
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
2323

24-
<spring-ai.version>1.0.0</spring-ai.version>
25-
<spring-ai-alibaba.version>1.0.0.3</spring-ai-alibaba.version>
24+
<spring-ai.version>1.0.1</spring-ai.version>
25+
<spring-ai-alibaba.version>1.0.0.4-SNAPSHOT</spring-ai-alibaba.version>
2626

2727
<openhtmltopdf.version>1.1.30</openhtmltopdf.version>
2828
<commonmark.version>0.24.0</commonmark.version>

‎spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/controller/ChatController.java‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package com.alibaba.cloud.ai.example.deepresearch.controller;
1818

19+
import java.util.HashMap;
20+
import java.util.Map;
21+
1922
import com.alibaba.cloud.ai.example.deepresearch.config.DeepResearchProperties;
2023
import com.alibaba.cloud.ai.example.deepresearch.controller.graph.GraphProcess;
2124
import com.alibaba.cloud.ai.example.deepresearch.controller.request.ChatRequestProcess;
@@ -32,7 +35,7 @@
3235
import com.alibaba.cloud.ai.graph.StateGraph;
3336
import com.alibaba.cloud.ai.graph.async.AsyncGenerator;
3437
import com.alibaba.cloud.ai.graph.checkpoint.config.SaverConfig;
35-
import com.alibaba.cloud.ai.graph.checkpoint.constant.SaverConstant;
38+
import com.alibaba.cloud.ai.graph.checkpoint.constant.SaverEnum;
3639
import com.alibaba.cloud.ai.graph.checkpoint.savers.MemorySaver;
3740
import com.alibaba.cloud.ai.graph.exception.GraphRunnerException;
3841
import com.alibaba.cloud.ai.graph.exception.GraphStateException;
@@ -41,19 +44,22 @@
4144
import io.micrometer.observation.ObservationRegistry;
4245
import org.slf4j.Logger;
4346
import org.slf4j.LoggerFactory;
47+
import reactor.core.publisher.Flux;
48+
import reactor.core.publisher.Mono;
49+
import reactor.core.publisher.Sinks;
50+
4451
import org.springframework.beans.factory.ObjectProvider;
4552
import org.springframework.beans.factory.annotation.Autowired;
4653
import org.springframework.beans.factory.annotation.Qualifier;
4754
import org.springframework.http.MediaType;
4855
import org.springframework.http.codec.ServerSentEvent;
4956
import org.springframework.util.StringUtils;
50-
import org.springframework.web.bind.annotation.*;
51-
import reactor.core.publisher.Flux;
52-
import reactor.core.publisher.Mono;
53-
import reactor.core.publisher.Sinks;
54-
55-
import java.util.HashMap;
56-
import java.util.Map;
57+
import org.springframework.web.bind.annotation.CrossOrigin;
58+
import org.springframework.web.bind.annotation.DeleteMapping;
59+
import org.springframework.web.bind.annotation.PostMapping;
60+
import org.springframework.web.bind.annotation.RequestBody;
61+
import org.springframework.web.bind.annotation.RequestMapping;
62+
import org.springframework.web.bind.annotation.RestController;
5763

5864
/**
5965
* @author yingzi
@@ -76,7 +82,9 @@ public class ChatController {
7682
public ChatController(@Qualifier("deepResearch") StateGraph stateGraph, SearchBeanUtil searchBeanUtil,
7783
ObjectProvider<ObservationRegistry> observationRegistry, DeepResearchProperties deepResearchProperties)
7884
throws GraphStateException {
79-
SaverConfig saverConfig = SaverConfig.builder().register(SaverConstant.MEMORY, new MemorySaver()).build();
85+
SaverConfig saverConfig = SaverConfig.builder()
86+
.register(SaverEnum.MEMORY.getValue(), new MemorySaver())
87+
.build();
8088
this.compiledGraph = stateGraph.compile(CompileConfig.builder()
8189
.saverConfig(saverConfig)
8290
.interruptBefore("human_feedback")

‎spring-ai-alibaba-graph-core/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113
<dependency>
114114
<groupId>com.github.docker-java</groupId>
115115
<artifactId>docker-java</artifactId>
116-
<version>${docker-java}</version>
117116
<exclusions>
118117
<exclusion>
119118
<groupId>org.apache.httpcomponents</groupId>
@@ -136,13 +135,11 @@
136135
<dependency>
137136
<groupId>com.github.docker-java</groupId>
138137
<artifactId>docker-java-core</artifactId>
139-
<version>${docker-java}</version>
140138
</dependency>
141139

142140
<dependency>
143141
<groupId>com.github.docker-java</groupId>
144142
<artifactId>docker-java-transport-zerodep</artifactId>
145-
<version>${docker-java}</version>
146143
</dependency>
147144

148145
<dependency>

‎spring-ai-alibaba-jmanus/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<jsoup-version>1.18.1</jsoup-version>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18-
<spring-ai.version>1.0.0</spring-ai.version>
19-
<spring-boot.version>3.4.5</spring-boot.version>
18+
<spring-ai.version>1.0.1</spring-ai.version>
19+
<spring-boot.version>3.4.8</spring-boot.version>
2020
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
2121
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
2222

@@ -114,7 +114,7 @@
114114
<groupId>org.springframework.ai</groupId>
115115
<artifactId>spring-ai-starter-mcp-client-webflux</artifactId>
116116
</dependency>
117-
117+
118118
<!-- MCP SDK -->
119119
<dependency>
120120
<groupId>io.modelcontextprotocol.sdk</groupId>
@@ -319,7 +319,7 @@
319319
<version>2.15.1</version>
320320
</dependency>
321321
</dependencies>
322-
322+
323323

324324
<build>
325325
<finalName>jmanus</finalName>

‎spring-ai-alibaba-nl2sql/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<properties>
2929
<gpdb.version>3.0.0</gpdb.version>
3030
<druid.version>1.2.22</druid.version>
31-
<commons-lang3.version>3.9</commons-lang3.version>
32-
<mysql-connector-java.version>8.0.15</mysql-connector-java.version>
3331
<postgresql.version>42.4.1</postgresql.version>
3432
<commons-collections.version>3.2.1</commons-collections.version>
3533
<commonmark.version>0.17.0</commonmark.version>
@@ -52,21 +50,11 @@
5250
<artifactId>druid</artifactId>
5351
<version>${druid.version}</version>
5452
</dependency>
55-
<dependency>
56-
<groupId>org.apache.commons</groupId>
57-
<artifactId>commons-lang3</artifactId>
58-
<version>${commons-lang3.version}</version>
59-
</dependency>
6053
<dependency>
6154
<groupId>com.baomidou</groupId>
6255
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
6356
<version>3.5.12</version>
6457
</dependency>
65-
<dependency>
66-
<groupId>mysql</groupId>
67-
<artifactId>mysql-connector-java</artifactId>
68-
<version>${mysql-connector-java.version}</version>
69-
</dependency>
7058
<dependency>
7159
<groupId>org.postgresql</groupId>
7260
<artifactId>postgresql</artifactId>

‎spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-chat/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717
<url>https://github.com/alibaba/spring-ai-alibaba</url>
1818
</scm>
1919

20-
<properties>
21-
<spring-ai.version>1.0.0</spring-ai.version>
22-
<spring-ai-alibaba.version>1.0.0.4-SNAPSHOT</spring-ai-alibaba.version>
23-
<maven.compiler.source>17</maven.compiler.source>
24-
<maven.compiler.target>17</maven.compiler.target>
25-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
</properties>
27-
2820
<dependencies>
2921

3022
<dependency>
@@ -84,8 +76,8 @@
8476
<artifactId>commons-lang3</artifactId>
8577
</dependency>
8678
<dependency>
87-
<groupId>mysql</groupId>
88-
<artifactId>mysql-connector-java</artifactId>
79+
<groupId>com.mysql</groupId>
80+
<artifactId>mysql-connector-j</artifactId>
8981
</dependency>
9082
<dependency>
9183
<groupId>org.postgresql</groupId>
@@ -94,14 +86,14 @@
9486
<dependency>
9587
<groupId>com.alibaba.cloud.ai</groupId>
9688
<artifactId>spring-ai-alibaba-core</artifactId>
97-
<version>${spring-ai-alibaba.version}</version>
89+
<version>${project.version}</version>
9890
</dependency>
9991

10092
<!-- Spring AI Alibaba DashScope Starter -->
10193
<dependency>
10294
<groupId>com.alibaba.cloud.ai</groupId>
10395
<artifactId>spring-ai-alibaba-starter-dashscope</artifactId>
104-
<version>${spring-ai-alibaba.version}</version>
96+
<version>${project.version}</version>
10597
</dependency>
10698
<dependency>
10799
<groupId>org.springframework</groupId>
@@ -121,7 +113,7 @@
121113
<dependency>
122114
<groupId>com.alibaba.cloud.ai</groupId>
123115
<artifactId>spring-ai-alibaba-graph-core</artifactId>
124-
<version>${spring-ai-alibaba.version}</version>
116+
<version>${project.version}</version>
125117
</dependency>
126118

127119
<dependency>
@@ -163,7 +155,7 @@
163155
<dependency>
164156
<groupId>com.alibaba.cloud.ai</groupId>
165157
<artifactId>spring-ai-alibaba-starter-store-analyticdb</artifactId>
166-
<version>${spring-ai-alibaba.version}</version>
158+
<version>${project.version}</version>
167159
</dependency>
168160
<dependency>
169161
<groupId>org.springframework.boot</groupId>

‎spring-ai-alibaba-nl2sql/spring-ai-alibaba-nl2sql-common/pom.xml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@
1717
<url>https://github.com/alibaba/spring-ai-alibaba</url>
1818
</scm>
1919

20-
<properties>
21-
<spring-ai.version>1.0.0</spring-ai.version>
22-
<spring-ai-alibaba.version>1.0.0.4-SNAPSHOT</spring-ai-alibaba.version>
23-
<maven.compiler.source>17</maven.compiler.source>
24-
<maven.compiler.target>17</maven.compiler.target>
25-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
</properties>
2720
<dependencies>
2821
<dependency>
2922
<groupId>org.springframework.ai</groupId>
@@ -43,8 +36,8 @@
4336
<artifactId>httpclient5</artifactId>
4437
</dependency>
4538
<dependency>
46-
<groupId>mysql</groupId>
47-
<artifactId>mysql-connector-java</artifactId>
39+
<groupId>com.mysql</groupId>
40+
<artifactId>mysql-connector-j</artifactId>
4841
</dependency>
4942
<dependency>
5043
<groupId>org.postgresql</groupId>
@@ -67,7 +60,7 @@
6760
<dependency>
6861
<groupId>com.alibaba.cloud.ai</groupId>
6962
<artifactId>spring-ai-alibaba-core</artifactId>
70-
<version>${spring-ai-alibaba.version}</version>
63+
<version>${project.version}</version>
7164
<scope>compile</scope>
7265
</dependency>
7366
</dependencies>

0 commit comments

Comments
 (0)