Skip to content

Update to Spring Boot 3.4.2 for dependency management #2176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Update to Spring Boot 3.4.2 for dependency management #2176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions models/spring-ai-ollama/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,11 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
Expand Down
31 changes: 2 additions & 29 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>

<!-- production dependencies -->
<spring-boot.version>3.3.6</spring-boot.version>
<spring-boot.version>3.4.2</spring-boot.version>
<ST4.version>4.3.4</ST4.version>
<azure-open-ai-client.version>1.0.0-beta.13</azure-open-ai-client.version>
<jtokkit.version>1.1.0</jtokkit.version>
Expand Down Expand Up @@ -207,7 +207,6 @@
<sap.hanadb.version>2.20.11</sap.hanadb.version>
<coherence.version>24.09</coherence.version>
<milvus.version>2.3.5</milvus.version>
<oracle.free.version>1.19.8</oracle.free.version>
<gemfire.testcontainers.version>2.3.0</gemfire.testcontainers.version>
<pinecone.version>0.8.0</pinecone.version>
<fastjson.version>2.0.46</fastjson.version>
Expand All @@ -223,40 +222,15 @@
<mariadb.version>3.5.1</mariadb.version>
<commonmark.version>0.22.0</commonmark.version>

<!-- also managed by boot bom -->
<oracle.version>23.4.0.24.05</oracle.version>
<postgresql.version>42.7.2</postgresql.version>
<cassandra.java-driver.version>4.18.1</cassandra.java-driver.version>
<elasticsearch-java.version>8.13.3</elasticsearch-java.version>
<spring-retry.version>2.0.9</spring-retry.version>
<jackson.version>2.16.1</jackson.version>
<!-- not sure if jsonSchema is also managed by boot bom -->
<jackson-module-jsonSchema.version>2.17.2</jackson-module-jsonSchema.version>
<!-- check on kotlin version as managed by boot bom -->
<kotlin.version>1.9.25</kotlin.version>


<!-- testing dependencies also managed by boot bom-->
<httpclient5.version>5.3.1</httpclient5.version>
<testcontainers.version>1.20.1</testcontainers.version>


<!-- testing dependencies -->
<testcontainers.opensearch.version>2.0.1</testcontainers.opensearch.version>
<okhttp3.version>4.12.0</okhttp3.version>

<!-- documentation dependencies -->
<io.spring.maven.antora-version>0.0.4</io.spring.maven.antora-version>
<org.maven.antora-version>1.0.0-alpha.4</org.maven.antora-version>
<asciidoctorj-pdf.version>1.6.2</asciidoctorj-pdf.version> <!-- FIXME build failure with
version 2.3.9 -->
<asciidoctorj-epub.version>1.5.1</asciidoctorj-epub.version>
<spring-asciidoctor-backends.version>0.0.6</spring-asciidoctor-backends.version>

<!-- MCP-->
<mcp.sdk.version>0.7.0-SNAPSHOT</mcp.sdk.version>

<!-- plugin versions -->
<antlr.version>4.13.1</antlr.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
Expand All @@ -268,7 +242,6 @@
<asciidoctor-maven-plugin.version>2.2.3</asciidoctor-maven-plugin.version>
<maven-assembly-plugin.version>3.7.0</maven-assembly-plugin.version>
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
<!-- <maven-site-plugin.version>3.12.1</maven-site-plugin.version> -->
<maven-site-plugin.version>4.0.0-M13</maven-site-plugin.version>
<maven-project-info-reports-plugin.version>3.4.5</maven-project-info-reports-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
Expand Down
10 changes: 0 additions & 10 deletions spring-ai-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,11 @@
<developerConnection>[email protected]:spring-projects/spring-ai.git</developerConnection>
</scm>

<properties>
<antlr.version>4.13.1</antlr.version>
</properties>

<dependencies>

<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jsonSchema</artifactId>
<version>${jackson-module-jsonSchema.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -128,26 +123,22 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>${kotlin.version}</version>
<optional>true</optional>
</dependency>

Expand All @@ -161,7 +152,6 @@
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 0 additions & 2 deletions spring-ai-docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<plugin>
<groupId>org.antora</groupId>
<artifactId>antora-maven-plugin</artifactId>
<version>${org.maven.antora-version}</version>
<extensions>true</extensions>
<configuration>
<options>
Expand All @@ -61,7 +60,6 @@
<plugin>
<groupId>io.spring.maven.antora</groupId>
<artifactId>antora-component-version-maven-plugin</artifactId>
<version>${io.spring.maven.antora-version}</version>
<executions>
<execution>
<goals>
Expand Down
8 changes: 8 additions & 0 deletions spring-ai-docs/src/main/antora/modules/ROOT/pages/upgrade-notes.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ All the Amazon Bedrock Chat models are removed except the Embedding models for C

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

=== Changes to use Spring Boot 3.4.2 for dependency management

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

==== Required Actions

* 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`.
* 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.


== Upgrading to 1.0.0.M5
Expand Down
1 change: 0 additions & 1 deletion spring-ai-retry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<dependency>
<groupId>org.springframework.retry</groupId>
<artifactId>spring-retry</artifactId>
<version>${spring-retry.version}</version>
</dependency>

<dependency>
Expand Down
6 changes: 0 additions & 6 deletions spring-ai-spring-boot-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,19 +155,16 @@
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
<version>${oracle.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ucp</artifactId>
<version>${oracle.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.oracle.database.ha</groupId>
<artifactId>simplefan</artifactId>
<version>${oracle.version}</version>
<optional>true</optional>
</dependency>

Expand Down Expand Up @@ -197,7 +194,6 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
<optional>true</optional>
</dependency>

Expand All @@ -211,7 +207,6 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${mariadb.version}</version>
<optional>true</optional>
</dependency>

Expand Down Expand Up @@ -490,7 +485,6 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>oracle-free</artifactId>
<version>${oracle.free.version}</version>
<scope>test</scope>
</dependency>

Expand Down
3 changes: 0 additions & 3 deletions spring-ai-spring-boot-starters/spring-ai-starter-oracle-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,14 @@
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
<version>${oracle.version}</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ucp</artifactId>
<version>${oracle.version}</version>
</dependency>
<dependency>
<groupId>com.oracle.database.ha</groupId>
<artifactId>simplefan</artifactId>
<version>${oracle.version}</version>
</dependency>
</dependencies>

Expand Down
1 change: 0 additions & 1 deletion spring-ai-spring-boot-testcontainers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
<scope>test</scope>
</dependency>

Expand Down
1 change: 0 additions & 1 deletion vector-stores/spring-ai-cassandra-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-query-builder</artifactId>
<version>${cassandra.java-driver.version}</version>
</dependency>

<!-- TESTING -->
Expand Down
1 change: 0 additions & 1 deletion vector-stores/spring-ai-elasticsearch-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
<dependency>
<groupId>co.elastic.clients</groupId>
<artifactId>elasticsearch-java</artifactId>
<version>${elasticsearch-java.version}</version>
</dependency>

<!-- TESTING -->
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/org/springframework/ai/vectorstore/elasticsearch/ElasticsearchVectorStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ public List<Document> doSimilaritySearch(SearchRequest searchRequest) {
SearchResponse<Document> res = this.elasticsearchClient.search(sr -> sr.index(this.options.getIndexName())
.knn(knn -> knn.queryVector(EmbeddingUtils.toList(vectors))
.similarity(finalThreshold)
.k((long) searchRequest.getTopK())
.k(searchRequest.getTopK())
.field("embedding")
.numCandidates((long) (1.5 * searchRequest.getTopK()))
.numCandidates((int) (1.5 * searchRequest.getTopK()))
.filter(fl -> fl
.queryString(qs -> qs.query(getElasticsearchQueryString(searchRequest.getFilterExpression())))))
.size(searchRequest.getTopK()), Document.class);
Expand Down
2 changes: 0 additions & 2 deletions vector-stores/spring-ai-opensearch-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>${httpclient5.version}</version>
</dependency>

<!-- TESTING -->
Expand Down Expand Up @@ -99,7 +98,6 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>

Expand Down
3 changes: 0 additions & 3 deletions vector-stores/spring-ai-oracle-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,16 @@
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
<version>${oracle.version}</version>
</dependency>

<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ucp</artifactId>
<version>${oracle.version}</version>
</dependency>

<dependency>
<groupId>com.oracle.database.ha</groupId>
<artifactId>simplefan</artifactId>
<version>${oracle.version}</version>
</dependency>

<dependency>
Expand Down
1 change: 0 additions & 1 deletion vector-stores/spring-ai-pgvector-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion vector-stores/spring-ai-typesense-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>org.typesense</groupId>
<artifactId>typesense-java</artifactId>
<version>${typesense.version}</version>
<version>${typesense.version}</version>
</dependency>

<!-- TESTING -->
Expand Down