GH-3379: Spring Framework 7.x compatibility

- 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

Signed-off-by: Dmitry Bedrin <dmitry.bedrin@gmail.com>

Author: bedrin

.github/workflows/continuous-integration.yml

@@ -5,16 +5,11 @@ on:
     # Combined schedule covering both EST and CET working hours
     # Morning/Early builds
     - cron: '30 6 * * 1-5'   # 7:30 AM CET / 1:30 AM EST
-    - cron: '0 9 * * 1-5'    # 10:00 AM CET / 4:00 AM EST
     - cron: '30 11 * * 1-5'  # 12:30 PM CET / 6:30 AM EST
     # Midday builds
-    - cron: '0 14 * * 1-5'   # 3:00 PM CET / 9:00 AM EST
-    - cron: '30 16 * * 1-5'  # 5:30 PM CET / 11:30 AM EST
+    - cron: '30 16 * * 1-5'  # 7:30 PM CET / 11:30 AM EST
     # Afternoon/Evening builds  
-    - cron: '0 19 * * 1-5'   # 8:00 PM CET / 2:00 PM EST
     - cron: '30 21 * * 1-5'  # 10:30 PM CET / 4:30 PM EST
-    - cron: '0 0 * * 2-6'    # 1:00 AM CET / 7:00 PM EST (previous day)
-    - cron: '30 2 * * 2-6'   # 3:30 AM CET / 9:30 PM EST (previous day)
   workflow_dispatch:
   # Note: If push triggers are added in the future, they should include:
   # push:
@@ -29,9 +24,6 @@ jobs:
     name: Build branch
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'spring-projects' }}
-    concurrency:
-      group: continuous-integration-${{ github.ref }}
-      cancel-in-progress: true  # Skip if another build is running - next cron will trigger soon
     services:
       ollama:
         image: ollama/ollama:latest

.github/workflows/new-maven-central-release.yml

@@ -25,7 +25,7 @@ jobs:
           echo "${{ secrets.GPG_PRIVATE_KEY }}" > gpg.asc
           echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
 
-      - name: Release to Sonatype OSSRH
+      - name: Release to Maven Central
         env:
           CENTRAL_TOKEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
           CENTRAL_TOKEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}

README.md

@@ -26,7 +26,7 @@ You can find more details in the [Reference Documentation](https://docs.spring.i
   - **Latest Models**: GPT-5, and other cutting-edge models for advanced AI applications.
 * Portable API support across AI providers for both synchronous and streaming options. Access to [model-specific features](https://docs.spring.io/spring-ai/reference/api/chatmodel.html#_chat_options) is also available.
 * [Structured Outputs](https://docs.spring.io/spring-ai/reference/api/structured-output-converter.html) - Mapping of AI Model output to POJOs.
-* Support for all major [Vector Database providers](https://docs.spring.io/spring-ai/reference/api/vectordbs.html) such as *Apache Cassandra, Azure Vector Search, Chroma, Elasticsearch, Milvus, MongoDB Atlas, MariaDB, Neo4j, Oracle, PostgreSQL/PGVector, PineCone, Qdrant, Redis, and Weaviate*.
+* Support for all major [Vector Database providers](https://docs.spring.io/spring-ai/reference/api/vectordbs.html) such as *Apache Cassandra, Azure Vector Search, Chroma, Elasticsearch, Milvus, MongoDB Atlas, MariaDB, Neo4j, Oracle, PostgreSQL/PGVector, Pinecone, Qdrant, Redis, and Weaviate*.
 * Portable API across Vector Store providers, including a novel SQL-like [metadata filter API](https://docs.spring.io/spring-ai/reference/api/vectordbs.html#metadata-filters).
 * [Tools/Function Calling](https://docs.spring.io/spring-ai/reference/api/tools.html) - permits the model to request the execution of client-side tools and functions, thereby accessing necessary real-time information as required.
 * [Observability](https://docs.spring.io/spring-ai/reference/observability/index.html) - Provides insights into AI-related operations.
@@ -156,4 +156,4 @@ define the source file coding standards we use along with some IDEA editor setti
 
 ## Contributing
 
-Your contributions are always welcome! Please read the [contribution guidelines](CONTRIBUTING.adoc) first.
+Your contributions are always welcome! Please read the [contribution guidelines](CONTRIBUTING.adoc) first.

auto-configurations/common/spring-ai-autoconfigure-retry/src/main/java/org/springframework/ai/retry/autoconfigure/SpringAiRetryAutoConfiguration.java

@@ -17,6 +17,7 @@
 package org.springframework.ai.retry.autoconfigure;
 
 import java.io.IOException;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 
 import org.slf4j.Logger;
@@ -30,6 +31,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.lang.NonNull;
 import org.springframework.retry.RetryCallback;
@@ -87,6 +89,12 @@ public boolean hasError(@NonNull ClientHttpResponse response) throws IOException
 			}
 
 			@Override
+			public void handleError(@NonNull URI url, @NonNull HttpMethod method, @NonNull ClientHttpResponse response)
+					throws IOException {
+				handleError(response);
+			}
+
+			@SuppressWarnings("removal")
 			public void handleError(@NonNull ClientHttpResponse response) throws IOException {
 				if (!response.getStatusCode().isError()) {
 					return;

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-common/src/main/java/org/springframework/ai/mcp/server/common/autoconfigure/McpServerAutoConfiguration.java

@@ -51,6 +51,7 @@
 import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerChangeNotificationProperties;
 import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerProperties;
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
@@ -91,30 +92,10 @@ public class McpServerAutoConfiguration {
 
 	private static final LogAccessor logger = new LogAccessor(McpServerAutoConfiguration.class);
 
-	/**
-	 * Creates a configured ObjectMapper for MCP server JSON serialization.
-	 * <p>
-	 * This ObjectMapper is specifically configured for MCP protocol compliance with:
-	 * <ul>
-	 * <li>Lenient deserialization that doesn't fail on unknown properties</li>
-	 * <li>Proper handling of empty beans during serialization</li>
-	 * <li>Exclusion of null values from JSON output</li>
-	 * <li>Standard Jackson modules for Java 8, JSR-310, and Kotlin support</li>
-	 * </ul>
-	 * <p>
-	 * This bean can be overridden by providing a custom ObjectMapper bean with the name
-	 * "mcpServerObjectMapper".
-	 * @return configured ObjectMapper instance for MCP server operations
-	 */
-	@Bean(name = "mcpServerObjectMapper")
-	@ConditionalOnMissingBean(name = "mcpServerObjectMapper")
-	public ObjectMapper mcpServerObjectMapper() {
-		return McpServerObjectMapperFactory.createObjectMapper();
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
-	public McpServerTransportProviderBase stdioServerTransport(ObjectMapper mcpServerObjectMapper) {
+	public McpServerTransportProviderBase stdioServerTransport(
+			@Qualifier("mcpServerObjectMapper") ObjectMapper mcpServerObjectMapper) {
 		return new StdioServerTransportProvider(new JacksonMcpJsonMapper(mcpServerObjectMapper));
 	}
 

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-common/src/main/java/org/springframework/ai/mcp/server/common/autoconfigure/McpServerObjectMapperAutoConfiguration.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.mcp.server.common.autoconfigure;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import io.modelcontextprotocol.spec.McpSchema;
+
+import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerProperties;
+import org.springframework.ai.util.JacksonUtils;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+
+@AutoConfiguration
+@ConditionalOnClass(McpSchema.class)
+@ConditionalOnProperty(prefix = McpServerProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true",
+		matchIfMissing = true)
+@ConditionalOnMissingBean(name = "mcpServerObjectMapper")
+public class McpServerObjectMapperAutoConfiguration {
+
+	/**
+	 * Creates a configured ObjectMapper for MCP server JSON serialization.
+	 * <p>
+	 * This ObjectMapper is specifically configured for MCP protocol compliance with:
+	 * <ul>
+	 * <li>Lenient deserialization that doesn't fail on unknown properties</li>
+	 * <li>Proper handling of empty beans during serialization</li>
+	 * <li>Exclusion of null values from JSON output</li>
+	 * <li>Standard Jackson modules for Java 8, JSR-310, and Kotlin support</li>
+	 * </ul>
+	 * <p>
+	 * This bean can be overridden by providing a custom ObjectMapper bean with the name
+	 * "mcpServerObjectMapper".
+	 * @return configured ObjectMapper instance for MCP server operations
+	 */
+	// NOTE: defaultCandidate=false prevents this MCP specific mapper from being injected
+	// in code that doesn't explicitly qualify injection point by name.
+	@Bean(name = "mcpServerObjectMapper", defaultCandidate = false)
+	public ObjectMapper mcpServerObjectMapper() {
+		return JsonMapper.builder()
+			// Deserialization configuration
+			.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+			.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)
+			// Serialization configuration
+			.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
+			.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+			.serializationInclusion(JsonInclude.Include.NON_NULL)
+			// Register standard Jackson modules (Jdk8, JavaTime, ParameterNames, Kotlin)
+			.addModules(JacksonUtils.instantiateAvailableModules())
+			.build();
+	}
+
+}

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-common/src/main/java/org/springframework/ai/mcp/server/common/autoconfigure/McpServerObjectMapperFactory.java

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 org.springframework.ai.mcp.server.common.autoconfigure.McpServerAutoConfiguration
+org.springframework.ai.mcp.server.common.autoconfigure.McpServerObjectMapperAutoConfiguration
 org.springframework.ai.mcp.server.common.autoconfigure.ToolCallbackConverterAutoConfiguration
 org.springframework.ai.mcp.server.common.autoconfigure.McpServerStatelessAutoConfiguration
 org.springframework.ai.mcp.server.common.autoconfigure.StatelessToolCallbackConverterAutoConfiguration

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -72,8 +72,9 @@
 
 public class McpServerAutoConfigurationIT {
 
-	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration(
-			AutoConfigurations.of(McpServerAutoConfiguration.class, ToolCallbackConverterAutoConfiguration.class));
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+		.withConfiguration(AutoConfigurations.of(McpServerAutoConfiguration.class,
+				McpServerObjectMapperAutoConfiguration.class, ToolCallbackConverterAutoConfiguration.class));
 
 	@Test
 	void defaultConfiguration() {

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-common/src/test/java/org/springframework/ai/mcp/server/common/autoconfigure/McpServerAutoConfigurationIT.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.mcp.server.common.autoconfigure;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.context.annotation.UserConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests for {@link McpServerObjectMapperAutoConfiguration}
+ *
+ * @author guan xu
+ */
+public class McpServerObjectMapperAutoConfigurationIT {
+
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+		.withConfiguration(AutoConfigurations.of(McpServerObjectMapperAutoConfiguration.class));
+
+	@Test
+	void defaultMcpServerObjectMapper() {
+		this.contextRunner.run(context -> {
+			assertThat(context).hasSingleBean(ObjectMapper.class);
+			assertThat(context).hasBean("mcpServerObjectMapper");
+		});
+	}
+
+	@Test
+	void customizeMcpServerObjectMapper() {
+		this.contextRunner.withConfiguration(UserConfigurations.of(TestConfig.class)).run(context -> {
+			assertThat(context).hasSingleBean(ObjectMapper.class);
+			assertThat(context).hasBean("mcpServerObjectMapper");
+
+			var mcpServerObjectMapper = context.getBean("mcpServerObjectMapper", ObjectMapper.class);
+			var customizedMcpServerObjectMapper = context.getBean(TestConfig.class).mcpServerObjectMapper();
+			assertThat(customizedMcpServerObjectMapper).isSameAs(mcpServerObjectMapper);
+		});
+	}
+
+	@Configuration
+	static class TestConfig {
+
+		@Bean(name = "mcpServerObjectMapper")
+		ObjectMapper mcpServerObjectMapper() {
+			return new ObjectMapper();
+		}
+
+	}
+
+}