This is an automated email from the ASF dual-hosted git repository. tcunning pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 476d0fce219f6b658e7e45ba3f5c08921eea5d16 Author: Tom Cunningham <[email protected]> AuthorDate: Mon Jan 5 14:36:38 2026 -0500 Upgrade to spring-boot 4.0.2 --- .../camel/component/openai/OpenAIEmbeddingsMockTest.java | 2 +- .../camel/component/openai/integration/OpenAIEmbeddingsIT.java | 2 +- .../apache/camel/component/kamelet/KameletEipSplitTest.java | 2 +- .../springrabbit/DefaultListenerContainerFactory.java | 5 ++--- parent/pom.xml | 10 +++++----- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIEmbeddingsMockTest.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIEmbeddingsMockTest.java index b337388f8cc1..6d2810e5bf90 100644 --- a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIEmbeddingsMockTest.java +++ b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIEmbeddingsMockTest.java @@ -21,7 +21,7 @@ import java.util.List; 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; diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIEmbeddingsIT.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIEmbeddingsIT.java index ee8e2f69c9a9..2f7a84847db2 100644 --- a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAIEmbeddingsIT.java +++ b/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.OpenAIComponent; 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; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipSplitTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipSplitTest.java index a258014d195a..a34fac8c4774 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipSplitTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletEipSplitTest.java @@ -19,7 +19,7 @@ package org.apache.camel.component.kamelet; 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 { diff --git a/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java b/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java index 449dc9d3f682..f265117b727a 100644 --- a/components/camel-spring-parent/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java +++ b/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.config.RetryInterceptorBuilder; 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 class DefaultListenerContainerFactory implements ListenerContainerFactory } 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()); diff --git a/parent/pom.xml b/parent/pom.xml index 206b905aa8c5..b9bd609ac39d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -421,7 +421,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> @@ -507,13 +507,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>
