Upgrade Boot to 4.0.0 GA

- fix breaking compilation issues

Signed-off-by: Christian Tzolov <[email protected]>

Author: tzolov

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

@@ -64,7 +64,7 @@ public class SpringAiRetryAutoConfiguration {
 	@ConditionalOnMissingBean
 	public RetryTemplate retryTemplate(SpringAiRetryProperties properties) {
 		RetryPolicy retryPolicy = RetryPolicy.builder()
-			.maxAttempts(properties.getMaxAttempts())
+			.maxRetries(properties.getMaxAttempts())
 			.includes(TransientAiException.class)
 			.includes(ResourceAccessException.class)
 			.delay(properties.getBackoff().getInitialInterval())

models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelMultimodalIT.java

@@ -94,7 +94,7 @@ public OllamaApi ollamaApi() {
 		@Bean
 		public OllamaChatModel ollamaChat(OllamaApi ollamaApi) {
 			RetryPolicy retryPolicy = RetryPolicy.builder()
-				.maxAttempts(1)
+				.maxRetries(1)
 				.includes(TransientAiException.class)
 				.delay(Duration.ofSeconds(1))
 				.build();

pom.xml

@@ -277,7 +277,7 @@
 		<kotlin.compiler.version>2.2.21</kotlin.compiler.version>
 
 		<!-- production dependencies -->
-		<spring-boot.version>4.0.0-RC2</spring-boot.version>
+		<spring-boot.version>4.0.0</spring-boot.version>
 		<ST4.version>4.3.4</ST4.version>
 		<azure-open-ai-client.version>1.0.0-beta.16</azure-open-ai-client.version>
 		<jtokkit.version>1.1.0</jtokkit.version>

spring-ai-retry/src/main/java/org/springframework/ai/retry/RetryUtils.java

@@ -108,7 +108,7 @@ public void handleError(final @NonNull ClientHttpResponse response) throws IOExc
 
 	private static RetryTemplate createDefaultRetryTemplate() {
 		RetryPolicy retryPolicy = RetryPolicy.builder()
-			.maxAttempts(DEFAULT_MAX_ATTEMPTS)
+			.maxRetries(DEFAULT_MAX_ATTEMPTS)
 			.includes(TransientAiException.class)
 			.includes(ResourceAccessException.class)
 			.delay(Duration.ofMillis(DEFAULT_INITIAL_INTERVAL))
@@ -137,7 +137,7 @@ public void onRetryFailure(final RetryPolicy policy, final Retryable<?> retryabl
 	 */
 	private static RetryTemplate createShortRetryTemplate() {
 		RetryPolicy retryPolicy = RetryPolicy.builder()
-			.maxAttempts(DEFAULT_MAX_ATTEMPTS)
+			.maxRetries(DEFAULT_MAX_ATTEMPTS)
 			.includes(TransientAiException.class)
 			.includes(ResourceAccessException.class)
 			.delay(Duration.ofMillis(SHORT_INITIAL_INTERVAL))