Skip to content

Commit 1c6132c

Browse files
ilayaperumalgilayaperumalg
authored
Update to Spring Boot 3.4.2 for dependency management (#2176)
- Spring AI's dependencies management to derive from Spring Boot 3.4.2 - Remove explicit versioning of dependencies - Update upgrade notes for Spring Boot 3.4.2 - Fix ElasticSearch client changes with the latest dependency derived from Spring Boot 3.4.2
1 parent 54f49b5 commit 1c6132c

File tree

16 files changed

+13
-65
lines changed

16 files changed

+13
-65
lines changed

‎models/spring-ai-ollama/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,11 @@
6060
<dependency>
6161
<groupId>com.fasterxml.jackson.core</groupId>
6262
<artifactId>jackson-databind</artifactId>
63-
<version>${jackson.version}</version>
6463
</dependency>
6564

6665
<dependency>
6766
<groupId>com.fasterxml.jackson.datatype</groupId>
6867
<artifactId>jackson-datatype-jsr310</artifactId>
69-
<version>${jackson.version}</version>
7068
</dependency>
7169

7270
<dependency>

‎pom.xml

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
178178

179179
<!-- production dependencies -->
180-
<spring-boot.version>3.3.6</spring-boot.version>
180+
<spring-boot.version>3.4.2</spring-boot.version>
181181
<ST4.version>4.3.4</ST4.version>
182182
<azure-open-ai-client.version>1.0.0-beta.13</azure-open-ai-client.version>
183183
<jtokkit.version>1.1.0</jtokkit.version>
@@ -207,7 +207,6 @@
207207
<sap.hanadb.version>2.20.11</sap.hanadb.version>
208208
<coherence.version>24.09</coherence.version>
209209
<milvus.version>2.3.5</milvus.version>
210-
<oracle.free.version>1.19.8</oracle.free.version>
211210
<gemfire.testcontainers.version>2.3.0</gemfire.testcontainers.version>
212211
<pinecone.version>0.8.0</pinecone.version>
213212
<fastjson.version>2.0.46</fastjson.version>
@@ -223,40 +222,15 @@
223222
<mariadb.version>3.5.1</mariadb.version>
224223
<commonmark.version>0.22.0</commonmark.version>
225224

226-
<!-- also managed by boot bom -->
227-
<oracle.version>23.4.0.24.05</oracle.version>
228-
<postgresql.version>42.7.2</postgresql.version>
229-
<cassandra.java-driver.version>4.18.1</cassandra.java-driver.version>
230-
<elasticsearch-java.version>8.13.3</elasticsearch-java.version>
231-
<spring-retry.version>2.0.9</spring-retry.version>
232-
<jackson.version>2.16.1</jackson.version>
233-
<!-- not sure if jsonSchema is also managed by boot bom -->
234-
<jackson-module-jsonSchema.version>2.17.2</jackson-module-jsonSchema.version>
235-
<!-- check on kotlin version as managed by boot bom -->
236-
<kotlin.version>1.9.25</kotlin.version>
237-
238-
239-
<!-- testing dependencies also managed by boot bom-->
240-
<httpclient5.version>5.3.1</httpclient5.version>
241-
<testcontainers.version>1.20.1</testcontainers.version>
242-
243225

244226
<!-- testing dependencies -->
245-
<testcontainers.opensearch.version>2.0.1</testcontainers.opensearch.version>
246227
<okhttp3.version>4.12.0</okhttp3.version>
247228

248-
<!-- documentation dependencies -->
249-
<io.spring.maven.antora-version>0.0.4</io.spring.maven.antora-version>
250-
<org.maven.antora-version>1.0.0-alpha.4</org.maven.antora-version>
251-
<asciidoctorj-pdf.version>1.6.2</asciidoctorj-pdf.version> <!-- FIXME build failure with
252-
version 2.3.9 -->
253-
<asciidoctorj-epub.version>1.5.1</asciidoctorj-epub.version>
254-
<spring-asciidoctor-backends.version>0.0.6</spring-asciidoctor-backends.version>
255-
256229
<!-- MCP-->
257230
<mcp.sdk.version>0.7.0-SNAPSHOT</mcp.sdk.version>
258231

259232
<!-- plugin versions -->
233+
<antlr.version>4.13.1</antlr.version>
260234
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
261235
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
262236
<maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
@@ -268,7 +242,6 @@
268242
<asciidoctor-maven-plugin.version>2.2.3</asciidoctor-maven-plugin.version>
269243
<maven-assembly-plugin.version>3.7.0</maven-assembly-plugin.version>
270244
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
271-
<!-- <maven-site-plugin.version>3.12.1</maven-site-plugin.version> -->
272245
<maven-site-plugin.version>4.0.0-M13</maven-site-plugin.version>
273246
<maven-project-info-reports-plugin.version>3.4.5</maven-project-info-reports-plugin.version>
274247
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>

‎spring-ai-core/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,11 @@
3636
<developerConnection>[email protected]:spring-projects/spring-ai.git</developerConnection>
3737
</scm>
3838

39-
<properties>
40-
<antlr.version>4.13.1</antlr.version>
41-
</properties>
42-
4339
<dependencies>
4440

4541
<dependency>
4642
<groupId>com.fasterxml.jackson.module</groupId>
4743
<artifactId>jackson-module-jsonSchema</artifactId>
48-
<version>${jackson-module-jsonSchema.version}</version>
4944
</dependency>
5045

5146
<dependency>
@@ -128,26 +123,22 @@
128123
<dependency>
129124
<groupId>com.fasterxml.jackson.core</groupId>
130125
<artifactId>jackson-databind</artifactId>
131-
<version>${jackson.version}</version>
132126
</dependency>
133127

134128
<dependency>
135129
<groupId>com.fasterxml.jackson.datatype</groupId>
136130
<artifactId>jackson-datatype-jsr310</artifactId>
137-
<version>${jackson.version}</version>
138131
</dependency>
139132

140133
<dependency>
141134
<groupId>org.jetbrains.kotlin</groupId>
142135
<artifactId>kotlin-stdlib</artifactId>
143-
<version>${kotlin.version}</version>
144136
<optional>true</optional>
145137
</dependency>
146138

147139
<dependency>
148140
<groupId>org.jetbrains.kotlin</groupId>
149141
<artifactId>kotlin-reflect</artifactId>
150-
<version>${kotlin.version}</version>
151142
<optional>true</optional>
152143
</dependency>
153144

@@ -161,7 +152,6 @@
161152
<dependency>
162153
<groupId>com.fasterxml.jackson.module</groupId>
163154
<artifactId>jackson-module-kotlin</artifactId>
164-
<version>${jackson.version}</version>
165155
<scope>test</scope>
166156
</dependency>
167157

‎spring-ai-docs/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<plugin>
3939
<groupId>org.antora</groupId>
4040
<artifactId>antora-maven-plugin</artifactId>
41-
<version>${org.maven.antora-version}</version>
4241
<extensions>true</extensions>
4342
<configuration>
4443
<options>
@@ -61,7 +60,6 @@
6160
<plugin>
6261
<groupId>io.spring.maven.antora</groupId>
6362
<artifactId>antora-component-version-maven-plugin</artifactId>
64-
<version>${io.spring.maven.antora-version}</version>
6563
<executions>
6664
<execution>
6765
<goals>

‎spring-ai-docs/src/main/antora/modules/ROOT/pages/upgrade-notes.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ All the Amazon Bedrock Chat models are removed except the Embedding models for C
5555

5656
NOTE: Refer to xref:api/chat/bedrock-converse.adoc[Bedrock Converse] documentation for using the chat models.
5757

58+
=== Changes to use Spring Boot 3.4.2 for dependency management
59+
60+
Spring AI updates to use Spring Boot 3.4.2 for the dependency management. You can refer https://github.com/spring-projects/spring-boot/blob/v3.4.2/spring-boot-project/spring-boot-dependencies/build.gradle[here] for the dependencies which Spring Boot 3.4.2
61+
62+
==== Required Actions
63+
64+
* If you are upgrading to Spring Boot 3.4.2, please make sure to refer to https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.4-Release-Notes#upgrading-from-spring-boot-33[this] documentation for the changes required to configure the REST Client. Notably, if you don’t have an HTTP client library on the classpath, this will likely result in the use of `JdkClientHttpRequestFactory` where `SimpleClientHttpRequestFactory` would have been used previously. To switch to use `SimpleClientHttpRequestFactory`, you need to set `spring.http.client.factory=simple`.
65+
* If you are using a different version of Spring Boot (say Spring Boot 3.3.x) and need a specific version of a dependency, you can override it in your build configuration.
5866

5967

6068
== Upgrading to 1.0.0.M5

‎spring-ai-retry/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
<dependency>
5151
<groupId>org.springframework.retry</groupId>
5252
<artifactId>spring-retry</artifactId>
53-
<version>${spring-retry.version}</version>
5453
</dependency>
5554

5655
<dependency>

‎spring-ai-spring-boot-autoconfigure/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,19 +155,16 @@
155155
<dependency>
156156
<groupId>com.oracle.database.jdbc</groupId>
157157
<artifactId>ojdbc11</artifactId>
158-
<version>${oracle.version}</version>
159158
<optional>true</optional>
160159
</dependency>
161160
<dependency>
162161
<groupId>com.oracle.database.jdbc</groupId>
163162
<artifactId>ucp</artifactId>
164-
<version>${oracle.version}</version>
165163
<optional>true</optional>
166164
</dependency>
167165
<dependency>
168166
<groupId>com.oracle.database.ha</groupId>
169167
<artifactId>simplefan</artifactId>
170-
<version>${oracle.version}</version>
171168
<optional>true</optional>
172169
</dependency>
173170

@@ -197,7 +194,6 @@
197194
<dependency>
198195
<groupId>org.postgresql</groupId>
199196
<artifactId>postgresql</artifactId>
200-
<version>${postgresql.version}</version>
201197
<optional>true</optional>
202198
</dependency>
203199

@@ -211,7 +207,6 @@
211207
<dependency>
212208
<groupId>org.mariadb.jdbc</groupId>
213209
<artifactId>mariadb-java-client</artifactId>
214-
<version>${mariadb.version}</version>
215210
<optional>true</optional>
216211
</dependency>
217212

@@ -490,7 +485,6 @@
490485
<dependency>
491486
<groupId>org.testcontainers</groupId>
492487
<artifactId>oracle-free</artifactId>
493-
<version>${oracle.free.version}</version>
494488
<scope>test</scope>
495489
</dependency>
496490

‎spring-ai-spring-boot-starters/spring-ai-starter-oracle-store/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,14 @@
5858
<dependency>
5959
<groupId>com.oracle.database.jdbc</groupId>
6060
<artifactId>ojdbc11</artifactId>
61-
<version>${oracle.version}</version>
6261
</dependency>
6362
<dependency>
6463
<groupId>com.oracle.database.jdbc</groupId>
6564
<artifactId>ucp</artifactId>
66-
<version>${oracle.version}</version>
6765
</dependency>
6866
<dependency>
6967
<groupId>com.oracle.database.ha</groupId>
7068
<artifactId>simplefan</artifactId>
71-
<version>${oracle.version}</version>
7269
</dependency>
7370
</dependencies>
7471

‎spring-ai-spring-boot-testcontainers/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@
187187
<dependency>
188188
<groupId>org.postgresql</groupId>
189189
<artifactId>postgresql</artifactId>
190-
<version>${postgresql.version}</version>
191190
<scope>test</scope>
192191
</dependency>
193192

‎vector-stores/spring-ai-cassandra-store/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<dependency>
5252
<groupId>org.apache.cassandra</groupId>
5353
<artifactId>java-driver-query-builder</artifactId>
54-
<version>${cassandra.java-driver.version}</version>
5554
</dependency>
5655

5756
<!-- TESTING -->

0 commit comments

Comments
 (0)