Commit bd3fd81
committed
spring-projectsGH-3379: Spring Boot 4.x compatibility
- Updated Spring Boot dependency to 4.0.0.RC1
- Spring Framework 7 API compatibility (see below)
- Migration to Spring Boot 4.x as per https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-4.0-Migration-Guide :
* Adopt new modular design of starters
* Use new Jackson 3.x API
* Support Property Mapper API changes around null handling
- Updated Swagger codegen templates used by huggingface model to align with latest Spring Framework APIs
- Update elasticsearch test container to 9.2.0
- Added `FailureDetectingExternalResource` from old versions of `testcontainers` library to support `gemfire-testcontainers`
- Other related dependencies updates:
* Spring Retry to 2.0.12
* TestContainers to 2.0.1
* GemFire testcontainers to 2.3.3
* opensearch-testcontainers to 4.0.0
* Rest Assured to 5.5.6
* swagger-codegen-maven-plugin to 3.0.75
Fixes spring-projectsGH-3379 (spring-projects#3379)
Built on-top of spring-projects#4771
- Use only Spring Framework APIs available both in 6.x and 7.x branches
- Add constructors without logic to `*Api` classes in `models` modules to simplify extensibility; effective final fields are marked as final
- Kotlin 2.x support; use kotlin compiler version 2.2.21
- Update MCP SDK to 0.15.0
- Update MCP Annotations to 0.6.0
Future tasks:
- Raise issue to migrate from Spring Retry to Spring Framework 7 built-in retry functionality
- Raise issue with `swagger-codegen-maven-plugin` to support Spring Framework 7
- Raise issue with GemFire to support testcontainers 2.x
Signed-off-by: Dmitry Bedrin <dmitry.bedrin@gmail.com>1 parent a572009 commit bd3fd81
File tree
207 files changed
+1647
-462
lines changed- auto-configurations
- common/spring-ai-autoconfigure-retry
- src
- main/java/org/springframework/ai/retry/autoconfigure
- test/java/org/springframework/ai/retry/autoconfigure
- mcp
- spring-ai-autoconfigure-mcp-client-httpclient
- spring-ai-autoconfigure-mcp-client-webflux
- spring-ai-autoconfigure-mcp-server-webflux
- src/test/java/org/springframework/ai/mcp/server/autoconfigure
- models
- chat/memory
- repository
- spring-ai-autoconfigure-model-chat-memory-repository-cassandra
- src
- main/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure
- test/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure
- spring-ai-autoconfigure-model-chat-memory-repository-cosmos-db
- spring-ai-autoconfigure-model-chat-memory-repository-jdbc
- src
- main/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure
- test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure
- spring-ai-autoconfigure-model-chat-memory-repository-neo4j
- src
- main/java/org/springframework/ai/model/chat/memory/repository/neo4j/autoconfigure
- test/java/org/springframework/ai/model/chat/memory/repository/neo4j/autoconfigure
- spring-ai-autoconfigure-model-chat-memory
- spring-ai-autoconfigure-model-anthropic
- src
- main/java/org/springframework/ai/model/anthropic/autoconfigure
- test/java/org/springframework/ai/model/anthropic/autoconfigure
- spring-ai-autoconfigure-model-deepseek
- src
- main/java/org/springframework/ai/model/deepseek/autoconfigure
- test/java/org/springframework/ai/model/deepseek/autoconfigure
- spring-ai-autoconfigure-model-elevenlabs
- src
- main/java/org/springframework/ai/model/elevenlabs/autoconfigure
- test/java/org/springframework/ai/model/elevenlabs/autoconfigure
- spring-ai-autoconfigure-model-google-genai
- src/test/java/org/springframework/ai/model/google/genai/autoconfigure/chat/tool
- spring-ai-autoconfigure-model-minimax
- src
- main/java/org/springframework/ai/model/minimax/autoconfigure
- test/java/org/springframework/ai/model/minimax/autoconfigure
- spring-ai-autoconfigure-model-mistral-ai
- src
- main/java/org/springframework/ai/model/mistralai/autoconfigure
- test/java/org/springframework/ai/model/mistralai/autoconfigure
- spring-ai-autoconfigure-model-ollama
- src
- main/java/org/springframework/ai/model/ollama/autoconfigure
- test/java/org/springframework/ai/model/ollama/autoconfigure
- spring-ai-autoconfigure-model-openai
- src
- main/java/org/springframework/ai/model/openai/autoconfigure
- test/java/org/springframework/ai/model/openai/autoconfigure
- tool
- spring-ai-autoconfigure-model-postgresml-embedding
- src
- main/java/org/springframework/ai/model/postgresml/autoconfigure
- test/java/org/springframework/ai/model/postgresml/autoconfigure
- spring-ai-autoconfigure-model-stability-ai
- src/main/java/org/springframework/ai/model/stabilityai/autoconfigure
- spring-ai-autoconfigure-model-vertex-ai
- spring-ai-autoconfigure-model-zhipuai
- src
- main/java/org/springframework/ai/model/zhipuai/autoconfigure
- test/java/org/springframework/ai/model/zhipuai/autoconfigure
- vector-stores
- spring-ai-autoconfigure-vector-store-cassandra
- src
- main/java/org/springframework/ai/vectorstore/cassandra/autoconfigure
- test/java/org/springframework/ai/vectorstore/cassandra/autoconfigure
- spring-ai-autoconfigure-vector-store-chroma
- spring-ai-autoconfigure-vector-store-couchbase
- src
- main/java/org/springframework/ai/vectorstore/couchbase/autoconfigure
- test/java/org/springframework/ai/vectorstore/couchbase/autoconfigure
- spring-ai-autoconfigure-vector-store-elasticsearch
- src
- main/java/org/springframework/ai/vectorstore/elasticsearch/autoconfigure
- test/java/org/springframework/ai/vectorstore/elasticsearch/autoconfigure
- spring-ai-autoconfigure-vector-store-gemfire
- src/test/java/org/testcontainers/containers
- spring-ai-autoconfigure-vector-store-mariadb
- src
- main/java/org/springframework/ai/vectorstore/mariadb/autoconfigure
- test/java/org/springframework/ai/vectorstore/mariadb/autoconfigure
- spring-ai-autoconfigure-vector-store-milvus
- spring-ai-autoconfigure-vector-store-mongodb-atlas
- src/test/java/org/springframework/ai/vectorstore/mongodb/autoconfigure
- spring-ai-autoconfigure-vector-store-neo4j
- src
- main/java/org/springframework/ai/vectorstore/neo4j/autoconfigure
- test/java/org/springframework/ai/vectorstore/neo4j/autoconfigure
- spring-ai-autoconfigure-vector-store-opensearch
- src/test/java/org/springframework/ai/vectorstore/opensearch/autoconfigure
- spring-ai-autoconfigure-vector-store-oracle
- src
- main/java/org/springframework/ai/vectorstore/oracle/autoconfigure
- test/java/org/springframework/ai/vectorstore/oracle/autoconfigure
- spring-ai-autoconfigure-vector-store-pgvector
- src
- main/java/org/springframework/ai/vectorstore/pgvector/autoconfigure
- test/java/org/springframework/ai/vectorstore/pgvector/autoconfigure
- spring-ai-autoconfigure-vector-store-pinecone
- spring-ai-autoconfigure-vector-store-qdrant
- spring-ai-autoconfigure-vector-store-redis
- src
- main/java/org/springframework/ai/vectorstore/redis/autoconfigure
- test/java/org/springframework/ai/vectorstore/redis/autoconfigure
- spring-ai-autoconfigure-vector-store-typesense
- spring-ai-autoconfigure-vector-store-weaviate
- document-readers/pdf-reader
- memory/repository
- spring-ai-model-chat-memory-repository-cassandra
- src/test/java/org/springframework/ai/chat/memory/repository/cassandra
- spring-ai-model-chat-memory-repository-jdbc
- src/test/java/org/springframework/ai/chat/memory/repository/jdbc
- spring-ai-model-chat-memory-repository-neo4j
- models
- spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api
- spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/api
- spring-ai-elevenlabs/src/main/java/org/springframework/ai/elevenlabs/api
- spring-ai-huggingface
- src/main/resources/handlebars/Java/libraries/resttemplate
- spring-ai-ollama
- spring-ai-openai
- src
- main/java/org/springframework/ai/openai
- api
- metadata/support
- test/java/org/springframework/ai/openai
- audio
- speech
- transcription
- chat
- image
- moderation
- spring-ai-postgresml
- src/test/java/org/springframework/ai/postgresml
- spring-ai-transformers
- spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/api
- spring-ai-client-chat/src/main/kotlin/org/springframework/ai/chat/client
- spring-ai-integration-tests
- src/test/java/org/springframework/ai/integration/tests/tool
- spring-ai-model/src/test/kotlin/org/springframework/ai/tool/resolution
- spring-ai-retry
- src/main/java/org/springframework/ai/retry
- spring-ai-spring-boot-docker-compose
- src
- main/java/org/springframework/ai/docker/compose/service/connection/mongo
- test/java/org/springframework
- ai/docker/compose/service/connection/mongo
- boot/docker/compose/service/connection/test
- spring-ai-spring-boot-testcontainers
- src
- main/java/org/springframework/ai/testcontainers/service/connection
- mongo
- opensearch
- test/java/org/springframework/ai/testcontainers/service/connection
- mongo
- ollama
- opensearch
- vector-stores
- spring-ai-azure-cosmos-db-store
- spring-ai-cassandra-store
- src/test/java/org/springframework/ai/vectorstore/cassandra
- spring-ai-chroma-store
- spring-ai-couchbase-store
- src/test/java/org/springframework/ai/vectorstore
- spring-ai-elasticsearch-store
- src
- main/java/org/springframework/ai/vectorstore/elasticsearch
- test/java/org/springframework/ai/vectorstore/elasticsearch
- spring-ai-gemfire-store
- src/test/java/org/testcontainers/containers
- spring-ai-mariadb-store
- src/test/java/org/springframework/ai/vectorstore/mariadb
- spring-ai-milvus-store
- src/test/java/org/springframework/ai/vectorstore/milvus
- spring-ai-mongodb-atlas-store
- spring-ai-neo4j-store
- src/test/java/org/springframework/ai/vectorstore/neo4j
- spring-ai-opensearch-store
- src/test/java/org/springframework/ai/vectorstore/opensearch
- spring-ai-oracle-store
- src/test/java/org/springframework/ai/vectorstore/oracle
- spring-ai-pgvector-store
- src/test/java/org/springframework/ai/vectorstore/pgvector
- spring-ai-qdrant-store
- spring-ai-redis-store
- src/test/java/org/springframework/ai/vectorstore/redis
- spring-ai-typesense-store
- src/test/java/org/springframework/ai/vectorstore/typesense
- spring-ai-weaviate-store
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
207 files changed
+1647
-462
lines changedLines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
64 | 69 | | |
65 | 70 | | |
66 | 71 | | |
| |||
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
20 | 21 | | |
21 | 22 | | |
22 | 23 | | |
| |||
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| 34 | + | |
33 | 35 | | |
34 | 36 | | |
35 | 37 | | |
| |||
87 | 89 | | |
88 | 90 | | |
89 | 91 | | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
90 | 98 | | |
91 | 99 | | |
92 | 100 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
85 | | - | |
| 85 | + | |
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
| 91 | + | |
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
| |||
Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
98 | 109 | | |
99 | 110 | | |
100 | 111 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | 19 | | |
21 | 20 | | |
| 21 | + | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
25 | | - | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
46 | 47 | | |
47 | 48 | | |
48 | 49 | | |
49 | | - | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
69 | | - | |
| 68 | + | |
70 | 69 | | |
| 70 | + | |
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
| |||
Lines changed: 6 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
43 | 47 | | |
44 | 48 | | |
45 | 49 | | |
| |||
83 | 87 | | |
84 | 88 | | |
85 | 89 | | |
86 | | - | |
| 90 | + | |
87 | 91 | | |
88 | 92 | | |
89 | 93 | | |
90 | 94 | | |
91 | 95 | | |
92 | | - | |
| 96 | + | |
93 | 97 | | |
94 | 98 | | |
95 | 99 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | 25 | | |
27 | 26 | | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
0 commit comments