Skip to content

Commit b4fa311

Browse files
ilayaperumalgmarkpollack
ilayaperumalg
authored and
markpollack
committed
Refactoring cleanup
 - Update Spring AI BOM with the newly added modules - Remove unnecessary dependencies from the modules' POM file
1 parent 717e419 commit b4fa311

File tree

32 files changed

+100
-153
lines changed

32 files changed

+100
-153
lines changed

‎advisors/spring-ai-advisors-vector-store/pom.xml

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright 2023-2024 the original author or authors.
3+
~ Copyright 2023-2025 the original author or authors.
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.
@@ -55,46 +55,12 @@
5555
<version>${project.parent.version}</version>
5656
</dependency>
5757

58-
<!-- Spring Framework -->
59-
<dependency>
60-
<groupId>org.springframework</groupId>
61-
<artifactId>spring-context</artifactId>
62-
</dependency>
63-
64-
<dependency>
65-
<groupId>com.fasterxml.jackson.core</groupId>
66-
<artifactId>jackson-databind</artifactId>
67-
</dependency>
68-
69-
<dependency>
70-
<groupId>io.projectreactor</groupId>
71-
<artifactId>reactor-core</artifactId>
72-
</dependency>
73-
74-
<dependency>
75-
<groupId>org.jetbrains.kotlin</groupId>
76-
<artifactId>kotlin-stdlib</artifactId>
77-
<optional>true</optional>
78-
</dependency>
79-
80-
<dependency>
81-
<groupId>org.jetbrains.kotlin</groupId>
82-
<artifactId>kotlin-reflect</artifactId>
83-
<optional>true</optional>
84-
</dependency>
85-
8658
<!-- test dependencies -->
8759
<dependency>
8860
<groupId>org.springframework.boot</groupId>
8961
<artifactId>spring-boot-starter-test</artifactId>
9062
<scope>test</scope>
9163
</dependency>
92-
93-
<dependency>
94-
<groupId>com.fasterxml.jackson.module</groupId>
95-
<artifactId>jackson-module-kotlin</artifactId>
96-
<scope>test</scope>
97-
</dependency>
9864
</dependencies>
9965

10066
</project>

‎auto-configurations/models/chat/observation/spring-ai-autoconfigure-model-chat-observation/src/main/java/org/springframework/ai/model/chat/observation/autoconfigure/ChatObservationAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.springframework.ai.embedding.observation.EmbeddingModelObservationContext;
3737
import org.springframework.ai.image.observation.ImageModelObservationContext;
3838
import org.springframework.ai.model.observation.ErrorLoggingObservationHandler;
39-
import org.springframework.ai.vectorstore.observation.VectorStoreObservationContext;
4039
import org.springframework.beans.factory.ObjectProvider;
4140
import org.springframework.boot.autoconfigure.AutoConfiguration;
4241
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -148,7 +147,7 @@ public ErrorLoggingObservationHandler errorLoggingObservationHandler(Tracer trac
148147
return new ErrorLoggingObservationHandler(tracer,
149148
List.of(EmbeddingModelObservationContext.class, ImageModelObservationContext.class,
150149
ChatModelObservationContext.class, ChatClientObservationContext.class,
151-
AdvisorObservationContext.class, VectorStoreObservationContext.class));
150+
AdvisorObservationContext.class));
152151
}
153152

154153
}

‎auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-observation/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependencies>
4141
<dependency>
4242
<groupId>org.springframework.ai</groupId>
43-
<artifactId>spring-ai-client-chat</artifactId>
43+
<artifactId>spring-ai-vector-store</artifactId>
4444
<version>${project.parent.version}</version>
4545
</dependency>
4646
<dependency>

‎memory/spring-ai-model-chat-memory-neo4j/src/main/java/org/springframework/ai/chat/memory/neo4j/Neo4jChatMemory.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,24 @@
2020
import org.neo4j.driver.Result;
2121
import org.neo4j.driver.Transaction;
2222
import org.springframework.ai.chat.memory.ChatMemory;
23-
import org.springframework.ai.chat.messages.*;
23+
import org.springframework.ai.chat.messages.AssistantMessage;
24+
import org.springframework.ai.chat.messages.Message;
25+
import org.springframework.ai.chat.messages.MessageType;
26+
import org.springframework.ai.chat.messages.SystemMessage;
27+
import org.springframework.ai.chat.messages.ToolResponseMessage;
28+
import org.springframework.ai.chat.messages.UserMessage;
2429
import org.springframework.ai.content.Media;
2530
import org.springframework.ai.content.MediaContent;
2631
import org.springframework.util.MimeType;
2732

2833
import java.net.MalformedURLException;
2934
import java.net.URI;
30-
import java.util.*;
35+
import java.util.ArrayList;
36+
import java.util.HashMap;
37+
import java.util.List;
38+
import java.util.Map;
39+
import java.util.Optional;
40+
import java.util.UUID;
3141

3242
/**
3343
* Chat memory implementation using Neo4j.

‎spring-ai-bom/pom.xml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,46 @@
4242
<dependencyManagement>
4343
<dependencies>
4444

45+
<!-- Spring AI commons -->
46+
47+
<dependency>
48+
<groupId>org.springframework.ai</groupId>
49+
<artifactId>spring-ai-commons</artifactId>
50+
<version>${project.version}</version>
51+
</dependency>
52+
53+
<!-- Spring AI model -->
54+
55+
<dependency>
56+
<groupId>org.springframework.ai</groupId>
57+
<artifactId>spring-ai-model</artifactId>
58+
<version>${project.version}</version>
59+
</dependency>
60+
61+
<!-- Spring AI vector store -->
62+
63+
<dependency>
64+
<groupId>org.springframework.ai</groupId>
65+
<artifactId>spring-ai-vector-store</artifactId>
66+
<version>${project.version}</version>
67+
</dependency>
68+
69+
<!-- Spring AI RAG -->
70+
71+
<dependency>
72+
<groupId>org.springframework.ai</groupId>
73+
<artifactId>spring-ai-rag</artifactId>
74+
<version>${project.version}</version>
75+
</dependency>
76+
77+
<!-- Spring AI Vector Store based Advisors -->
78+
79+
<dependency>
80+
<groupId>org.springframework.ai</groupId>
81+
<artifactId>spring-ai-advisors-vector-store</artifactId>
82+
<version>${project.version}</version>
83+
</dependency>
84+
4585
<!-- Spring AI retry -->
4686

4787
<dependency>
@@ -100,6 +140,20 @@
100140
<version>${project.version}</version>
101141
</dependency>
102142

143+
<!-- Spring AI Chat memory implementations -->
144+
145+
<dependency>
146+
<groupId>org.springframework.ai</groupId>
147+
<artifactId>spring-ai-model-chat-memory-cassandra</artifactId>
148+
<version>${project.version}</version>
149+
</dependency>
150+
151+
<dependency>
152+
<groupId>org.springframework.ai</groupId>
153+
<artifactId>spring-ai-model-chat-memory-neo4j</artifactId>
154+
<version>${project.version}</version>
155+
</dependency>
156+
103157
<!-- Spring AI Models -->
104158

105159
<dependency>

‎spring-ai-client-chat/pom.xml

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
</parent>
2727
<artifactId>spring-ai-client-chat</artifactId>
2828
<packaging>jar</packaging>
29-
<name>Spring AI Core</name>
30-
<description>Core domain for AI programming</description>
29+
<name>Spring AI Chat Client</name>
30+
<description>Spring AI Chat Client AI programming</description>
3131
<url>https://github.com/spring-projects/spring-ai</url>
3232

3333
<scm>
@@ -38,18 +38,6 @@
3838

3939
<dependencies>
4040

41-
<dependency>
42-
<groupId>org.springframework.ai</groupId>
43-
<artifactId>spring-ai-commons</artifactId>
44-
<version>${project.version}</version>
45-
</dependency>
46-
47-
<dependency>
48-
<groupId>org.springframework.ai</groupId>
49-
<artifactId>spring-ai-vector-store</artifactId>
50-
<version>${project.version}</version>
51-
</dependency>
52-
5341
<dependency>
5442
<groupId>org.springframework.ai</groupId>
5543
<artifactId>spring-ai-model</artifactId>
@@ -91,22 +79,6 @@
9179
<artifactId>spring-messaging</artifactId>
9280
</dependency>
9381

94-
<dependency>
95-
<groupId>io.micrometer</groupId>
96-
<artifactId>micrometer-core</artifactId>
97-
</dependency>
98-
99-
<dependency>
100-
<groupId>io.micrometer</groupId>
101-
<artifactId>context-propagation</artifactId>
102-
</dependency>
103-
104-
<dependency>
105-
<groupId>io.micrometer</groupId>
106-
<artifactId>micrometer-tracing-bridge-otel</artifactId>
107-
<optional>true</optional>
108-
</dependency>
109-
11082
<dependency>
11183
<groupId>com.knuddels</groupId>
11284
<artifactId>jtokkit</artifactId>

‎spring-ai-client-chat/src/main/java/org/springframework/ai/aot/SpringAiCoreRuntimeHints.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ public void registerHints(@NonNull RuntimeHints hints, @Nullable ClassLoader cla
5555
Method getName = ReflectionUtils.findMethod(FunctionCallback.class, "getName");
5656
hints.reflection().registerMethod(getName, ExecutableMode.INVOKE);
5757

58-
for (var r : Set.of("antlr4/org/springframework/ai/vectorstore/filter/antlr4/Filters.g4",
59-
"embedding/embedding-model-dimensions.properties")) {
58+
for (var r : Set.of("embedding/embedding-model-dimensions.properties")) {
6059
hints.resources().registerResource(new ClassPathResource(r));
6160
}
6261

‎spring-ai-commons/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<optional>true</optional>
6060
</dependency>
6161

62-
6362
<dependency>
6463
<groupId>com.fasterxml.jackson.module</groupId>
6564
<artifactId>jackson-module-jsonSchema</artifactId>

‎spring-ai-model/pom.xml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,6 @@
4747
<version>${project.parent.version}</version>
4848
</dependency>
4949

50-
<!-- Spring Framework -->
51-
<dependency>
52-
<groupId>org.springframework</groupId>
53-
<artifactId>spring-context</artifactId>
54-
</dependency>
55-
56-
<dependency>
57-
<groupId>com.fasterxml.jackson.core</groupId>
58-
<artifactId>jackson-databind</artifactId>
59-
</dependency>
60-
6150
<dependency>
6251
<groupId>io.micrometer</groupId>
6352
<artifactId>micrometer-observation</artifactId>
@@ -80,6 +69,7 @@
8069
<version>${ST4.version}</version>
8170
</dependency>
8271

72+
<!-- ANTLR for Filter Expression Parsing -->
8373
<dependency>
8474
<groupId>org.antlr</groupId>
8575
<artifactId>antlr4-runtime</artifactId>
@@ -109,7 +99,7 @@
10999
<artifactId>swagger-annotations</artifactId>
110100
<version>${swagger-annotations.version}</version>
111101
</dependency>
112-
102+
113103
<dependency>
114104
<groupId>org.jetbrains.kotlin</groupId>
115105
<artifactId>kotlin-stdlib</artifactId>

‎spring-ai-rag/pom.xml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -54,34 +54,6 @@
5454
<version>${project.parent.version}</version>
5555
</dependency>
5656

57-
<!-- Spring Framework -->
58-
<dependency>
59-
<groupId>org.springframework</groupId>
60-
<artifactId>spring-context</artifactId>
61-
</dependency>
62-
63-
<dependency>
64-
<groupId>com.fasterxml.jackson.core</groupId>
65-
<artifactId>jackson-databind</artifactId>
66-
</dependency>
67-
68-
<dependency>
69-
<groupId>io.projectreactor</groupId>
70-
<artifactId>reactor-core</artifactId>
71-
</dependency>
72-
73-
<dependency>
74-
<groupId>org.jetbrains.kotlin</groupId>
75-
<artifactId>kotlin-stdlib</artifactId>
76-
<optional>true</optional>
77-
</dependency>
78-
79-
<dependency>
80-
<groupId>org.jetbrains.kotlin</groupId>
81-
<artifactId>kotlin-reflect</artifactId>
82-
<optional>true</optional>
83-
</dependency>
84-
8557
<!-- test dependencies -->
8658
<dependency>
8759
<groupId>org.springframework.boot</groupId>

0 commit comments

Comments
 (0)