diff --git a/models/spring-ai-ollama/pom.xml b/models/spring-ai-ollama/pom.xml index 679ac3ecbaa..540beb4273b 100644 --- a/models/spring-ai-ollama/pom.xml +++ b/models/spring-ai-ollama/pom.xml @@ -60,13 +60,11 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson.version} diff --git a/pom.xml b/pom.xml index 3fb66c04f42..ce82a087460 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ ${java.version} - 3.3.6 + 3.4.2 4.3.4 1.0.0-beta.13 1.1.0 @@ -207,7 +207,6 @@ 2.20.11 24.09 2.3.5 - 1.19.8 2.3.0 0.8.0 2.0.46 @@ -223,40 +222,15 @@ 3.5.1 0.22.0 - - 23.4.0.24.05 - 42.7.2 - 4.18.1 - 8.13.3 - 2.0.9 - 2.16.1 - - 2.17.2 - - 1.9.25 - - - - 5.3.1 - 1.20.1 - - 2.0.1 4.12.0 - - 0.0.4 - 1.0.0-alpha.4 - 1.6.2 - 1.5.1 - 0.0.6 - 0.7.0-SNAPSHOT + 4.13.1 3.11.0 3.1.2 3.5.2 @@ -268,7 +242,6 @@ 2.2.3 3.7.0 3.5.0 - 4.0.0-M13 3.4.5 3.3.0 diff --git a/spring-ai-core/pom.xml b/spring-ai-core/pom.xml index a082137a9df..53f9ea835bc 100644 --- a/spring-ai-core/pom.xml +++ b/spring-ai-core/pom.xml @@ -36,16 +36,11 @@ git@github.com:spring-projects/spring-ai.git - - 4.13.1 - - com.fasterxml.jackson.module jackson-module-jsonSchema - ${jackson-module-jsonSchema.version} @@ -128,26 +123,22 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson.version} org.jetbrains.kotlin kotlin-stdlib - ${kotlin.version} true org.jetbrains.kotlin kotlin-reflect - ${kotlin.version} true @@ -161,7 +152,6 @@ com.fasterxml.jackson.module jackson-module-kotlin - ${jackson.version} test diff --git a/spring-ai-docs/pom.xml b/spring-ai-docs/pom.xml index 1f3252626e6..cd772303a31 100644 --- a/spring-ai-docs/pom.xml +++ b/spring-ai-docs/pom.xml @@ -38,7 +38,6 @@ org.antora antora-maven-plugin - ${org.maven.antora-version} true @@ -61,7 +60,6 @@ io.spring.maven.antora antora-component-version-maven-plugin - ${io.spring.maven.antora-version} diff --git a/spring-ai-docs/src/main/antora/modules/ROOT/pages/upgrade-notes.adoc b/spring-ai-docs/src/main/antora/modules/ROOT/pages/upgrade-notes.adoc index 70b66e7dfc2..dd6980ad552 100644 --- a/spring-ai-docs/src/main/antora/modules/ROOT/pages/upgrade-notes.adoc +++ b/spring-ai-docs/src/main/antora/modules/ROOT/pages/upgrade-notes.adoc @@ -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 diff --git a/spring-ai-retry/pom.xml b/spring-ai-retry/pom.xml index 596aef76a9e..aa637583496 100644 --- a/spring-ai-retry/pom.xml +++ b/spring-ai-retry/pom.xml @@ -50,7 +50,6 @@ org.springframework.retry spring-retry - ${spring-retry.version} diff --git a/spring-ai-spring-boot-autoconfigure/pom.xml b/spring-ai-spring-boot-autoconfigure/pom.xml index 94cbf519ff7..ff3287836ee 100644 --- a/spring-ai-spring-boot-autoconfigure/pom.xml +++ b/spring-ai-spring-boot-autoconfigure/pom.xml @@ -155,19 +155,16 @@ com.oracle.database.jdbc ojdbc11 - ${oracle.version} true com.oracle.database.jdbc ucp - ${oracle.version} true com.oracle.database.ha simplefan - ${oracle.version} true @@ -197,7 +194,6 @@ org.postgresql postgresql - ${postgresql.version} true @@ -211,7 +207,6 @@ org.mariadb.jdbc mariadb-java-client - ${mariadb.version} true @@ -490,7 +485,6 @@ org.testcontainers oracle-free - ${oracle.free.version} test diff --git a/spring-ai-spring-boot-starters/spring-ai-starter-oracle-store/pom.xml b/spring-ai-spring-boot-starters/spring-ai-starter-oracle-store/pom.xml index 72d2cde2f1f..ca79f16ad13 100644 --- a/spring-ai-spring-boot-starters/spring-ai-starter-oracle-store/pom.xml +++ b/spring-ai-spring-boot-starters/spring-ai-starter-oracle-store/pom.xml @@ -58,17 +58,14 @@ com.oracle.database.jdbc ojdbc11 - ${oracle.version} com.oracle.database.jdbc ucp - ${oracle.version} com.oracle.database.ha simplefan - ${oracle.version} diff --git a/spring-ai-spring-boot-testcontainers/pom.xml b/spring-ai-spring-boot-testcontainers/pom.xml index 72db035a181..6c3152f63bd 100644 --- a/spring-ai-spring-boot-testcontainers/pom.xml +++ b/spring-ai-spring-boot-testcontainers/pom.xml @@ -187,7 +187,6 @@ org.postgresql postgresql - ${postgresql.version} test diff --git a/vector-stores/spring-ai-cassandra-store/pom.xml b/vector-stores/spring-ai-cassandra-store/pom.xml index fd149b3a6d7..16d6d2e7e9d 100644 --- a/vector-stores/spring-ai-cassandra-store/pom.xml +++ b/vector-stores/spring-ai-cassandra-store/pom.xml @@ -51,7 +51,6 @@ org.apache.cassandra java-driver-query-builder - ${cassandra.java-driver.version} diff --git a/vector-stores/spring-ai-elasticsearch-store/pom.xml b/vector-stores/spring-ai-elasticsearch-store/pom.xml index 9ae49b69188..9928fc8a027 100644 --- a/vector-stores/spring-ai-elasticsearch-store/pom.xml +++ b/vector-stores/spring-ai-elasticsearch-store/pom.xml @@ -53,7 +53,6 @@ co.elastic.clients elasticsearch-java - ${elasticsearch-java.version} diff --git a/vector-stores/spring-ai-elasticsearch-store/src/main/java/org/springframework/ai/vectorstore/elasticsearch/ElasticsearchVectorStore.java b/vector-stores/spring-ai-elasticsearch-store/src/main/java/org/springframework/ai/vectorstore/elasticsearch/ElasticsearchVectorStore.java index 377ce78dcbf..6488972d821 100644 --- a/vector-stores/spring-ai-elasticsearch-store/src/main/java/org/springframework/ai/vectorstore/elasticsearch/ElasticsearchVectorStore.java +++ b/vector-stores/spring-ai-elasticsearch-store/src/main/java/org/springframework/ai/vectorstore/elasticsearch/ElasticsearchVectorStore.java @@ -263,9 +263,9 @@ public List doSimilaritySearch(SearchRequest searchRequest) { SearchResponse 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); diff --git a/vector-stores/spring-ai-opensearch-store/pom.xml b/vector-stores/spring-ai-opensearch-store/pom.xml index 4c48a3cb5d7..055f959dceb 100644 --- a/vector-stores/spring-ai-opensearch-store/pom.xml +++ b/vector-stores/spring-ai-opensearch-store/pom.xml @@ -57,7 +57,6 @@ org.apache.httpcomponents.client5 httpclient5 - ${httpclient5.version} @@ -99,7 +98,6 @@ org.testcontainers junit-jupiter - ${testcontainers.version} test diff --git a/vector-stores/spring-ai-oracle-store/pom.xml b/vector-stores/spring-ai-oracle-store/pom.xml index 51fc6e9877d..c2ba7ba3040 100644 --- a/vector-stores/spring-ai-oracle-store/pom.xml +++ b/vector-stores/spring-ai-oracle-store/pom.xml @@ -56,19 +56,16 @@ com.oracle.database.jdbc ojdbc11 - ${oracle.version} com.oracle.database.jdbc ucp - ${oracle.version} com.oracle.database.ha simplefan - ${oracle.version} diff --git a/vector-stores/spring-ai-pgvector-store/pom.xml b/vector-stores/spring-ai-pgvector-store/pom.xml index 4d1247f5497..3afcdcdbd90 100644 --- a/vector-stores/spring-ai-pgvector-store/pom.xml +++ b/vector-stores/spring-ai-pgvector-store/pom.xml @@ -61,7 +61,6 @@ org.postgresql postgresql - ${postgresql.version} diff --git a/vector-stores/spring-ai-typesense-store/pom.xml b/vector-stores/spring-ai-typesense-store/pom.xml index dc4e20e8d97..cb32789ab0d 100644 --- a/vector-stores/spring-ai-typesense-store/pom.xml +++ b/vector-stores/spring-ai-typesense-store/pom.xml @@ -52,7 +52,7 @@ org.typesense typesense-java - ${typesense.version} + ${typesense.version}