Upgrade to spring-boot 4.0.2

Author: cunningt

components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIEmbeddingsMockTest.java

@@ -21,7 +21,7 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.infra.openai.mock.OpenAIMock;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 

components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIEmbeddingsIT.java

@@ -26,7 +26,7 @@
 import org.apache.camel.component.openai.OpenAIConstants;
 import org.apache.camel.test.infra.ollama.services.OllamaService;
 import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty;

components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipSplitTest.java

@@ -19,7 +19,7 @@
 import org.apache.camel.RoutesBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
 public class KameletEipSplitTest extends CamelTestSupport {

components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java

@@ -21,7 +21,6 @@
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
 import org.springframework.amqp.rabbit.retry.RejectAndDontRequeueRecoverer;
-import org.springframework.core.retry.RetryPolicy;
 
 import static org.apache.camel.component.springrabbit.SpringRabbitMQConstants.*;
 
@@ -70,9 +69,9 @@ public AbstractMessageListenerContainer createListenerContainer(SpringRabbitMQEn
         } else {
             RetryInterceptorBuilder<?, ?> builder = RetryInterceptorBuilder.stateless();
             if (endpoint.getMaximumRetryAttempts() <= 0) {
-                builder.retryPolicy(RetryPolicy.withMaxRetries(0));
+                builder.maxRetries(0);
             } else if (endpoint.getMaximumRetryAttempts() > 0) {
-                builder.retryPolicy(RetryPolicy.withMaxRetries(endpoint.getMaximumRetryAttempts()));
+                builder.maxRetries(endpoint.getMaximumRetryAttempts());
             }
             if (endpoint.getRetryDelay() > 0) {
                 builder.backOffOptions(endpoint.getRetryDelay(), 1, endpoint.getRetryDelay());

parent/pom.xml

@@ -416,7 +416,7 @@
         <narayana-version>5.13.1.Final</narayana-version>
         <neoscada-version>0.4.0</neoscada-version>
         <neo4j-version>6.0.2</neo4j-version>
-        <netty-version>4.2.7.Final</netty-version>
+        <netty-version>4.2.9.Final</netty-version>
         <netty-reactive-streams-version>2.0.5</netty-reactive-streams-version>
         <networknt-json-schema-validator-version>1.5.9</networknt-json-schema-validator-version>
         <nimbus-jose-jwt>10.7</nimbus-jose-jwt>
@@ -502,13 +502,13 @@
         <splunk-version>1.9.5_1</splunk-version>
         <spock-version>2.4-groovy-4.0</spock-version>
         <spring-ai-version>1.1.2</spring-ai-version>
-        <spring-cloud-config-version>5.0.0-RC1</spring-cloud-config-version>
+        <spring-cloud-config-version>5.0.1</spring-cloud-config-version>
         <spring-batch-version>6.0.2</spring-batch-version>
         <spring-boot-version>4.0.2</spring-boot-version>
         <spring-data-redis-version>4.0.2</spring-data-redis-version>
-        <spring-ldap-version>4.0.2</spring-ldap-version>
-        <spring-vault-core-version>4.0.2</spring-vault-core-version>
-        <spring-version>7.0.1</spring-version>
+        <spring-ldap-version>4.0.1</spring-ldap-version>
+        <spring-vault-core-version>4.0.0</spring-vault-core-version>
+        <spring-version>7.0.3</spring-version>
         <spring-rabbitmq-version>4.0.2</spring-rabbitmq-version>
         <spring-security-version>7.0.2</spring-security-version>
         <spring-ws-version>5.0.0</spring-ws-version>