You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by tc...@apache.org on 2026/02/21 22:38:31 UTC
(camel) 01/28: CAMEL-22780 Update camel from JUnit 5 to Junit 6
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 0a384248be4d75a80daa67a195cd388493268e7f
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Fri Dec 12 11:43:43 2025 -0500
CAMEL-22780 Update camel from JUnit 5 to Junit 6
---
.../archetype-resources/__artifactId__-component/pom.xml | 2 +-
.../src/test/java/Abstract__name__TestSupport.java | 2 +-
.../projects-disabled/build-it/archetype.properties | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/test/java/__name__ComponentTest.java | 2 +-
.../projects-disabled/build-it/archetype.properties | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/test/java/__name__DataFormatTest.java | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/test/java/MyApplicationTest.java | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
.../java/org/apache/camel/catalog/CamelCatalogTest.java | 2 +-
catalog/camel-report-maven-plugin/pom.xml | 4 ++--
catalog/camel-route-parser/pom.xml | 2 +-
.../camel/parser/java/MyLocalAddRouteBuilderTest.java | 2 +-
.../test/java/org/apache/camel/parser/java/MyNettyTest.java | 2 +-
.../apache/camel/parser/java/MyRouteDuplicateIdTest.java | 2 +-
.../org/apache/camel/parser/java/MyRouteEmptyUriTest.java | 2 +-
.../test/java/org/apache/camel/parser/java/MyRouteTest.java | 2 +-
.../org/apache/camel/parser/java/RoasterJavaDslTest.java | 2 +-
.../camel/parser/java/RoasterJavaDslTwoRoutesTest.java | 2 +-
.../camel/parser/java/RoasterJavaPartialRouteDslTest.java | 2 +-
.../apache/camel/parser/java/RoasterJavaRestDslTest.java | 2 +-
.../org/apache/camel/parser/java/SimpleProcessorTest.java | 2 +-
.../org/apache/camel/parser/java/SplitTokenizeTest.java | 2 +-
components/camel-ai/camel-chatscript/pom.xml | 2 +-
.../org/apache/camel/component/ChatScriptComponentIT.java | 2 +-
components/camel-ai/camel-djl/pom.xml | 2 +-
.../java/org/apache/camel/component/djl/AudioLocalTest.java | 2 +-
.../apache/camel/component/djl/CvActionRecognitionTest.java | 2 +-
.../camel/component/djl/CvImageClassificationLocalTest.java | 2 +-
.../camel/component/djl/CvImageClassificationTest.java | 2 +-
.../camel/component/djl/CvImageEnhancementLocalTest.java | 2 +-
.../apache/camel/component/djl/CvImageGenerationTest.java | 2 +-
.../camel/component/djl/CvInstanceSegmentationTest.java | 2 +-
.../apache/camel/component/djl/CvObjectDetectionTest.java | 2 +-
.../apache/camel/component/djl/CvPoseEstimationTest.java | 2 +-
.../camel/component/djl/CvSemanticSegmentationTest.java | 2 +-
.../apache/camel/component/djl/NlpQuestionAnswerTest.java | 2 +-
.../camel/component/djl/NlpSentimentAnalysisTest.java | 2 +-
.../apache/camel/component/djl/NlpWordEmbeddingTest.java | 2 +-
.../camel/component/djl/TimeSeriesForecastingTest.java | 2 +-
components/camel-ai/camel-docling/pom.xml | 2 +-
.../apache/camel/component/docling/BatchProcessingTest.java | 2 +-
.../camel/component/docling/DoclingComponentTest.java | 2 +-
.../apache/camel/component/docling/DoclingProducerTest.java | 2 +-
.../camel/component/docling/DoclingServeProducerTest.java | 2 +-
.../component/docling/integration/DoclingITestSupport.java | 2 +-
.../component/docling/integration/OcrExtractionIT.java | 2 +-
components/camel-ai/camel-kserve/pom.xml | 2 +-
.../apache/camel/component/kserve/it/KServeITSupport.java | 2 +-
components/camel-ai/camel-langchain4j-agent/pom.xml | 2 +-
.../component/langchain4j/agent/BaseLangChain4jAgent.java | 2 +-
.../agent/integration/LangChain4jAgentCustomToolsIT.java | 2 +-
.../LangChain4jAgentGuardrailsIntegrationIT.java | 2 +-
.../agent/integration/LangChain4jAgentMcpToolsIT.java | 2 +-
.../agent/integration/LangChain4jAgentMixedToolsIT.java | 2 +-
.../agent/integration/LangChain4jAgentMultimodalityIT.java | 2 +-
.../agent/integration/LangChain4jAgentWithMemoryIT.java | 2 +-
.../agent/integration/LangChain4jAgentWithToolsIT.java | 2 +-
.../agent/integration/LangChain4jAgentWrappedFileIT.java | 2 +-
.../agent/integration/LangChain4jSimpleAgentIT.java | 2 +-
components/camel-ai/camel-langchain4j-chat/pom.xml | 2 +-
.../camel/component/langchain4j/chat/OllamaTestSupport.java | 2 +-
components/camel-ai/camel-langchain4j-core/pom.xml | 2 +-
.../langchain4j/core/LangChain4jConverterTest.java | 2 +-
components/camel-ai/camel-langchain4j-embeddings/pom.xml | 2 +-
.../LangChain4jEmbeddingsComponentInfinispanTargetIT.java | 2 +-
.../LangChain4jEmbeddingsComponentMilvusTargetIT.java | 2 +-
.../LangChain4jEmbeddingsComponentNeo4jTargetIT.java | 2 +-
.../LangChain4jEmbeddingsComponentPineconeTargetIT.java | 2 +-
.../LangChain4jEmbeddingsComponentQdrantTargetIT.java | 2 +-
.../embeddings/LangChain4jEmbeddingsComponentTest.java | 2 +-
.../LangChain4jEmbeddingsComponentWeaviateTargetIT.java | 2 +-
.../camel-ai/camel-langchain4j-embeddingstore/pom.xml | 2 +-
.../LangChain4jEmbeddingStoreComponentMilvusTargetIT.java | 2 +-
.../LangChain4jEmbeddingStoreComponentQdrantTargetIT.java | 2 +-
.../embeddings/LangChain4jEmbeddingStoreComponentTest.java | 2 +-
.../LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java | 2 +-
components/camel-ai/camel-langchain4j-tokenizer/pom.xml | 2 +-
.../tokenizer/LangChain4JTokenizerTestSupport.java | 2 +-
components/camel-ai/camel-langchain4j-tools/pom.xml | 4 ++--
.../langchain4j/tools/LangChain4jToolMultipleCallsTest.java | 2 +-
.../tools/LangChain4jToolMultipleGroupsTest.java | 2 +-
.../tools/LangChain4jToolMultipleMatchingGroupsTest.java | 2 +-
.../langchain4j/tools/LangChain4jToolNoToolsExistTest.java | 2 +-
.../tools/LangChain4jToolNoToolsToBeCalledTest.java | 2 +-
.../LangChain4jToolParameterValueTypeConversionTest.java | 2 +-
.../component/langchain4j/tools/LangChain4jToolTest.java | 2 +-
components/camel-ai/camel-langchain4j-web-search/pom.xml | 2 +-
.../web/search/LangChain4jGoogleWebSearchEngineIT.java | 2 +-
.../web/search/LangChain4jTavilyWebSearchEngineIT.java | 2 +-
components/camel-ai/camel-milvus/pom.xml | 2 +-
.../apache/camel/component/milvus/MilvusTestSupport.java | 2 +-
components/camel-ai/camel-neo4j/pom.xml | 2 +-
.../org/apache/camel/component/neo4j/Neo4jTestSupport.java | 2 +-
components/camel-ai/camel-openai/pom.xml | 2 +-
.../camel/component/openai/OpenAIProducerMockTest.java | 2 +-
.../component/openai/integration/OpenAITestSupport.java | 2 +-
components/camel-ai/camel-pinecone/pom.xml | 2 +-
.../pinecone/PineconeComponentConfigurationTest.java | 4 ++--
.../camel/component/pinecone/PineconeTestSupport.java | 2 +-
.../camel/component/pinecone/it/PineconeComponentIT.java | 2 +-
components/camel-ai/camel-qdrant/pom.xml | 2 +-
.../org/apache/camel/component/qdrant/QdrantCommonTest.java | 2 +-
.../apache/camel/component/qdrant/QdrantTestSupport.java | 2 +-
components/camel-ai/camel-tensorflow-serving/pom.xml | 2 +-
.../component/torchserve/it/TensorFlowServingITSupport.java | 2 +-
components/camel-ai/camel-torchserve/pom.xml | 2 +-
.../camel/component/torchserve/TorchServeTestSupport.java | 2 +-
.../camel/component/torchserve/it/TorchServeITSupport.java | 2 +-
components/camel-ai/camel-weaviate/pom.xml | 2 +-
.../weaviate/WeaviateComponentConfigurationTest.java | 4 ++--
.../camel/component/weaviate/WeaviateTestSupport.java | 2 +-
components/camel-amqp/pom.xml | 2 +-
components/camel-arangodb/pom.xml | 2 +-
components/camel-as2/camel-as2-api/pom.xml | 2 +-
components/camel-as2/camel-as2-component/pom.xml | 2 +-
.../apache/camel/component/as2/AbstractAS2ITSupport.java | 4 ++--
.../camel/component/as2/MendelsonSslEndpointManualTest.java | 2 +-
components/camel-asn1/pom.xml | 4 ++--
.../asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java | 2 +-
.../asn1/ASN1DataFormatWithStreamIteratorClassTest.java | 2 +-
.../camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java | 2 +-
.../dataformat/asn1/SpringASN1DataFormatRouteTest.java | 2 +-
components/camel-asterisk/pom.xml | 2 +-
.../apache/camel/component/asterisk/AsteriskConfigTest.java | 2 +-
.../camel/component/asterisk/AsteriskConsumerTest.java | 2 +-
.../camel/component/asterisk/AsteriskProducerTest.java | 2 +-
components/camel-atmosphere-websocket/pom.xml | 2 +-
.../websocket/WebsocketCamelRouterTestSupport.java | 2 +-
.../WebsocketCamelRouterWithInitParamTestSupport.java | 2 +-
components/camel-atom/pom.xml | 2 +-
.../camel/component/atom/AtomEntryPollingConsumerTest.java | 2 +-
.../apache/camel/component/atom/AtomHttpConsumerTest.java | 2 +-
.../camel/component/atom/AtomHttpNoCamelParametersTest.java | 2 +-
.../component/atom/AtomPollingConsumerIdleMessageTest.java | 2 +-
.../camel/component/atom/AtomPollingConsumerTest.java | 2 +-
.../camel/component/atom/AtomPollingLowDelayTest.java | 2 +-
.../camel/component/atom/AtomPollingUnthrottledTest.java | 2 +-
.../java/org/apache/camel/component/atom/AtomRouteTest.java | 2 +-
components/camel-attachments/pom.xml | 2 +-
.../org/apache/camel/attachment/AttachmentRemovalTest.java | 2 +-
.../apache/camel/attachment/BeanMethodWithExchangeTest.java | 2 +-
.../test/java/org/apache/camel/attachment/EnrichTest.java | 2 +-
.../MessageWithAttachmentRedeliveryIssueTest.java | 2 +-
.../camel/attachment/MulticastAggregationStrategyTest.java | 2 +-
.../org/apache/camel/attachment/SimpleAttachmentTest.java | 2 +-
.../test/java/org/apache/camel/attachment/WireTapTest.java | 2 +-
components/camel-avro-rpc/camel-avro-rpc-component/pom.xml | 2 +-
.../camel/component/avro/AvroConsumerTestSupport.java | 2 +-
.../camel/component/avro/AvroProducerTestSupport.java | 2 +-
.../org/apache/camel/component/avro/AvroTestSupport.java | 2 +-
components/camel-avro/pom.xml | 2 +-
.../dataformat/avro/AvroDateMarshalAndUnmarshalTest.java | 2 +-
.../avro/AvroDateRecordMarshalAndUnmarshalTest.java | 2 +-
.../dataformat/avro/AvroGenericMarshalAndUnmarshalTest.java | 2 +-
.../camel/dataformat/avro/AvroMarshalAndUnmarshalTest.java | 2 +-
components/camel-aws/camel-aws-bedrock/pom.xml | 2 +-
.../bedrock/agent/integration/BedrockAgentConsumerIT.java | 2 +-
.../bedrock/agent/integration/BedrockAgentProducerIT.java | 2 +-
.../integration/BedrockAgentRuntimeProducerIT.java | 2 +-
.../bedrock/runtime/integration/BedrockGuardrailsIT.java | 2 +-
.../aws2/bedrock/runtime/integration/BedrockProducerIT.java | 2 +-
.../runtime/integration/BedrockProducerStreamingIT.java | 2 +-
components/camel-aws/camel-aws-cloudtrail/pom.xml | 2 +-
components/camel-aws/camel-aws-config/pom.xml | 2 +-
.../AWSConfigProducerHealthCheckProfileCredsTest.java | 2 +-
.../config/AWSConfigProducerHealthCheckStaticCredsTest.java | 2 +-
.../component/aws/config/integration/AWSConfigBase.java | 2 +-
.../aws/config/integration/AWSConfigProducerManualIT.java | 2 +-
components/camel-aws/camel-aws-parameter-store/pom.xml | 2 +-
.../ParameterStoreComponentConfigurationTest.java | 2 +-
.../ParameterStoreProducerHealthCheckStaticCredsTest.java | 2 +-
.../integration/AwsParameterStoreBaseTest.java | 2 +-
.../ParameterStoreNoEnvPropertiesSourceTestIT.java | 2 +-
components/camel-aws/camel-aws-secrets-manager/pom.xml | 2 +-
.../SecretsManagerComponentConfigurationTest.java | 2 +-
.../SecretsManagerProducerHealthCheckProfileCredsTest.java | 2 +-
.../SecretsManagerProducerHealthCheckStaticCredsTest.java | 2 +-
.../integration/AwsSecretsManagerBaseTest.java | 2 +-
.../SecretsManagerNoEnvPropertiesSourceTestIT.java | 2 +-
components/camel-aws/camel-aws-security-hub/pom.xml | 2 +-
.../securityhub/SecurityHubComponentConfigurationTest.java | 2 +-
.../aws/securityhub/integration/SecurityHubManualIT.java | 2 +-
components/camel-aws/camel-aws-xray/pom.xml | 2 +-
.../camel/component/aws/xray/CamelAwsXRayTestSupport.java | 2 +-
.../component/aws/xray/SpringAwsXRaySimpleRouteTest.java | 2 +-
components/camel-aws/camel-aws2-athena/pom.xml | 2 +-
.../Athena2ProducerHealthCheckCustomProducerTest.java | 2 +-
.../athena/Athena2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../athena/Athena2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../aws2/athena/AthenaComponentClientRegistryTest.java | 2 +-
.../aws2/athena/AthenaComponentConfigurationTest.java | 2 +-
.../camel/component/aws2/athena/AthenaComponentTest.java | 2 +-
.../aws2/athena/integration/AthenaComponentManualIT.java | 2 +-
components/camel-aws/camel-aws2-comprehend/pom.xml | 2 +-
.../component/aws2/comprehend/Comprehend2ProducerTest.java | 2 +-
.../Comprehend2ProducerDefaultCredsManualIT.java | 2 +-
.../comprehend/integration/Comprehend2ProducerManualIT.java | 2 +-
components/camel-aws/camel-aws2-cw/pom.xml | 2 +-
.../component/aws2/cw/CwComponentConfigurationTest.java | 2 +-
.../component/aws2/cw/CwComponentRegistryClientTest.java | 2 +-
.../org/apache/camel/component/aws2/cw/CwComponentTest.java | 2 +-
.../camel/component/aws2/cw/integration/Aws2CwBase.java | 2 +-
components/camel-aws/camel-aws2-ddb/pom.xml | 2 +-
.../aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../component/aws2/ddb/DdbComponentConfigurationTest.java | 2 +-
.../component/aws2/ddb/DdbComponentRegistryClientTest.java | 2 +-
.../camel/component/aws2/ddb/localstack/Aws2DDBBase.java | 2 +-
.../aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java | 2 +-
.../aws2/ddbstream/DdbStreamComponentConfigurationTest.java | 2 +-
.../component/aws2/ddbstream/ShardIteratorHandlerTest.java | 2 +-
components/camel-aws/camel-aws2-ec2/pom.xml | 2 +-
.../ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../component/aws2/ec2/EC2ComponentClientRegistryTest.java | 2 +-
.../component/aws2/ec2/EC2ComponentConfigurationTest.java | 2 +-
.../camel/component/aws2/ec2/EC2ComponentSpringTest.java | 2 +-
.../apache/camel/component/aws2/ec2/EC2ProducerTest.java | 2 +-
.../camel/component/aws2/ec2/integration/Aws2EC2Base.java | 2 +-
.../aws2/ec2/integration/EC2ComponentManualIT.java | 2 +-
components/camel-aws/camel-aws2-ecs/pom.xml | 2 +-
.../component/aws2/ecs/ECS2ComponentClientRegistryTest.java | 2 +-
.../component/aws2/ecs/ECS2ComponentConfigurationTest.java | 2 +-
.../aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../camel/component/aws2/ecs/ECS2ProducerSpringTest.java | 2 +-
.../apache/camel/component/aws2/ecs/ECS2ProducerTest.java | 2 +-
.../aws2/ecs/integration/ECS2ProducerManualIT.java | 2 +-
components/camel-aws/camel-aws2-eks/pom.xml | 2 +-
.../component/aws2/eks/EKS2ComponentClientRegistryTest.java | 2 +-
.../component/aws2/eks/EKS2ComponentConfigurationTest.java | 2 +-
.../aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../camel/component/aws2/eks/EKS2ProducerSpringTest.java | 2 +-
.../apache/camel/component/aws2/eks/EKS2ProducerTest.java | 2 +-
components/camel-aws/camel-aws2-eventbridge/pom.xml | 2 +-
.../eventbridge/EventbridgeComponentConfigurationTest.java | 2 +-
.../EventbridgeProducerHealthCheckProfileCredsTest.java | 2 +-
.../EventbridgeProducerHealthCheckStaticCredsTest.java | 2 +-
.../eventbridge/integration/EventbridgePutRuleManualIT.java | 2 +-
.../integration/EventbridgePutRuleSqsManualIT.java | 2 +-
.../aws2/eventbridge/localstack/Aws2EventbridgeBase.java | 2 +-
.../aws2/eventbridge/localstack/EventbridgePutEventsIT.java | 2 +-
components/camel-aws/camel-aws2-iam/pom.xml | 2 +-
.../aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../component/aws2/iam/IAMComponentClientRegistryTest.java | 2 +-
.../component/aws2/iam/IAMComponentConfigurationTest.java | 2 +-
.../camel/component/aws2/iam/IAMProducerSpringTest.java | 2 +-
.../apache/camel/component/aws2/iam/IAMProducerTest.java | 2 +-
.../camel/component/aws2/iam/integration/Aws2IAMBase.java | 2 +-
components/camel-aws/camel-aws2-kinesis/pom.xml | 2 +-
.../firehose/KinesisFirehoseComponentConfigurationTest.java | 2 +-
.../integration/KinesisFirehoseComponentManualIT.java | 2 +-
.../kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java | 2 +-
.../kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java | 2 +-
.../aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java | 2 +-
.../aws2/kinesis/KinesisComponentConfigurationTest.java | 2 +-
.../aws2/kinesis/integration/KclKinesisConsumerIT.java | 2 +-
.../aws2/kinesis/integration/KinesisConsumerIT.java | 2 +-
.../aws2/kinesis/integration/KinesisConsumerResumeIT.java | 2 +-
.../aws2/kinesis/integration/KinesisProducerIT.java | 2 +-
components/camel-aws/camel-aws2-kms/pom.xml | 2 +-
.../component/aws2/kms/KMSComponentClientRegistryTest.java | 2 +-
.../component/aws2/kms/KMSComponentConfigurationTest.java | 2 +-
.../camel/component/aws2/kms/KMSProducerSpringTest.java | 2 +-
.../apache/camel/component/aws2/kms/KMSProducerTest.java | 2 +-
.../camel/component/aws2/kms/localstack/Aws2KmsBase.java | 2 +-
components/camel-aws/camel-aws2-lambda/pom.xml | 2 +-
.../lambda/Lambda2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../lambda/Lambda2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../aws2/lambda/LambdaComponentClientRegistryTest.java | 2 +-
.../aws2/lambda/LambdaComponentConfigurationTest.java | 2 +-
.../component/aws2/lambda/LambdaComponentSpringTest.java | 2 +-
.../aws2/lambda/LambdaProducerDefaultFunctionTest.java | 2 +-
.../camel/component/aws2/lambda/LambdaProducerTest.java | 2 +-
.../component/aws2/lambda/integration/Aws2LambdaBase.java | 2 +-
.../aws2/lambda/integration/LambdaComponentManualIT.java | 2 +-
components/camel-aws/camel-aws2-mq/pom.xml | 2 +-
.../aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../component/aws2/mq/MQComponentClientRegistryTest.java | 2 +-
.../component/aws2/mq/MQComponentConfigurationTest.java | 2 +-
.../camel/component/aws2/mq/MQProducerSpringTest.java | 2 +-
.../org/apache/camel/component/aws2/mq/MQProducerTest.java | 2 +-
components/camel-aws/camel-aws2-msk/pom.xml | 2 +-
.../aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../component/aws2/msk/MSKComponentClientRegistryTest.java | 2 +-
.../component/aws2/msk/MSKComponentConfigurationTest.java | 2 +-
.../camel/component/aws2/msk/MSKProducerSpringTest.java | 2 +-
.../apache/camel/component/aws2/msk/MSKProducerTest.java | 2 +-
components/camel-aws/camel-aws2-polly/pom.xml | 2 +-
.../camel/component/aws2/polly/Polly2ProducerTest.java | 2 +-
.../aws2/polly/integration/Polly2ProducerManualIT.java | 2 +-
.../aws2/polly/integration/Polly2SpeechToFileManualIT.java | 2 +-
components/camel-aws/camel-aws2-redshift/pom.xml | 2 +-
.../data/RedshiftData2ComponentClientRegistryTest.java | 2 +-
.../data/RedshiftData2ComponentConfigurationTest.java | 2 +-
.../aws2/redshift/data/RedshiftData2ProducerSpringTest.java | 2 +-
.../aws2/redshift/data/RedshiftData2ProducerTest.java | 2 +-
components/camel-aws/camel-aws2-rekognition/pom.xml | 2 +-
.../Rekognition2ComponentClientRegistryTest.java | 2 +-
.../rekognition/Rekognition2ComponentConfigurationTest.java | 2 +-
.../Rekognition2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../Rekognition2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../aws2/rekognition/Rekognition2ProducerSpringTest.java | 2 +-
.../aws2/rekognition/Rekognition2ProducerTest.java | 2 +-
components/camel-aws/camel-aws2-s3-vectors/pom.xml | 2 +-
.../s3vectors/integration/S3VectorsComponentManualIT.java | 2 +-
components/camel-aws/camel-aws2-s3/pom.xml | 2 +-
.../aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java | 2 +-
.../aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java | 2 +-
.../component/aws2/s3/S3ComponentConfigurationTest.java | 2 +-
.../camel/component/aws2/s3/integration/Aws2S3Base.java | 2 +-
.../component/aws2/s3/integration/S3ComponentManualIT.java | 2 +-
.../component/aws2/s3/integration/S3ConsumerManualIT.java | 2 +-
.../aws2/s3/integration/S3CopyObjectOperationManualIT.java | 2 +-
.../aws2/s3/integration/S3ObjectRangeOperationManualIT.java | 2 +-
.../component/aws2/s3/integration/S3UploadWithSSES3IT.java | 2 +-
.../component/aws2/s3/stream/AWSS3NamingStrategyTest.java | 2 +-
components/camel-aws/camel-aws2-ses/pom.xml | 2 +-
.../component/aws2/ses/SESComponentClientRegistryTest.java | 2 +-
.../aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../component/aws2/ses/SesComponentConfigurationTest.java | 2 +-
.../camel/component/aws2/ses/SesComponentSpringTest.java | 2 +-
.../apache/camel/component/aws2/ses/SesComponentTest.java | 2 +-
.../aws2/ses/integration/SesComponentManualIT.java | 2 +-
components/camel-aws/camel-aws2-sns/pom.xml | 2 +-
.../component/aws2/sns/SNSComponentClientRegistryTest.java | 2 +-
.../aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../component/aws2/sns/SnsComponentConfigurationTest.java | 2 +-
.../camel/component/aws2/sns/SnsComponentSpringTest.java | 2 +-
.../apache/camel/component/aws2/sns/SnsComponentTest.java | 2 +-
.../camel/component/aws2/sns/integration/Aws2SNSBase.java | 2 +-
.../aws2/sns/integration/SnsComponentFifoManualIT.java | 2 +-
.../aws2/sns/integration/SnsComponentManualIT.java | 2 +-
.../sns/integration/SnsTopicWithKmsEncryptionManualIT.java | 2 +-
components/camel-aws/camel-aws2-sqs/pom.xml | 2 +-
.../aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java | 2 +-
.../aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java | 2 +-
.../aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java | 2 +-
.../apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java | 2 +-
.../aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java | 2 +-
.../camel/component/aws2/sqs/SqsBatchConsumerTest.java | 2 +-
.../component/aws2/sqs/SqsComponentClientRegistryTest.java | 2 +-
.../component/aws2/sqs/SqsComponentConfigurationTest.java | 2 +-
.../camel/component/aws2/sqs/SqsComponentSpringTest.java | 2 +-
.../apache/camel/component/aws2/sqs/SqsComponentTest.java | 2 +-
.../aws2/sqs/SqsConsumerExtendMessageVisibilityTest.java | 2 +-
.../component/aws2/sqs/SqsConsumerIdleMessageTest.java | 2 +-
.../aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java | 2 +-
.../camel/component/aws2/sqs/SqsProducerBatchTest.java | 2 +-
.../component/aws2/sqs/SqsProducerDelayedQueueuTest.java | 2 +-
.../component/aws2/sqs/SqsProducerDeleteQueueTest.java | 2 +-
.../camel/component/aws2/sqs/SqsProducerDeleteTest.java | 2 +-
.../camel/component/aws2/sqs/SqsProducerListQueuesTest.java | 2 +-
.../camel/component/aws2/sqs/SqsProducerPurgeTest.java | 2 +-
.../component/aws2/sqs/integration/Aws2SQSBaseTest.java | 2 +-
components/camel-aws/camel-aws2-step-functions/pom.xml | 2 +-
.../StepFunctions2ComponentClientRegistryTest.java | 2 +-
.../StepFunctions2ComponentConfigurationTest.java | 2 +-
.../StepFunctions2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../StepFunctions2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../stepfunctions/StepFunctions2ProducerSpringTest.java | 2 +-
.../aws2/stepfunctions/StepFunctions2ProducerTest.java | 2 +-
components/camel-aws/camel-aws2-sts/pom.xml | 2 +-
.../component/aws2/sts/STS2ComponentClientRegistryTest.java | 2 +-
.../component/aws2/sts/STS2ComponentConfigurationTest.java | 2 +-
.../camel/component/aws2/sts/STS2ProducerSpringTest.java | 2 +-
.../apache/camel/component/aws2/sts/STS2ProducerTest.java | 2 +-
.../camel/component/aws2/sts/integration/Aws2StsBase.java | 2 +-
components/camel-aws/camel-aws2-textract/pom.xml | 2 +-
.../component/aws2/textract/Textract2ProducerTest.java | 2 +-
.../aws2/textract/integration/Textract2DetectTextIT.java | 2 +-
components/camel-aws/camel-aws2-timestream/pom.xml | 2 +-
.../timestream/Timestream2ComponentClientRegistryTest.java | 2 +-
.../timestream/Timestream2ComponentConfigurationTest.java | 2 +-
...Timestream2QueryProducerHealthCheckProfileCredsTest.java | 2 +-
.../Timestream2QueryProducerHealthCheckStaticCredsTest.java | 2 +-
.../query/Timestream2QueryProducerSpringTest.java | 2 +-
.../aws2/timestream/query/Timestream2QueryProducerTest.java | 2 +-
...Timestream2WriteProducerHealthCheckProfileCredsTest.java | 2 +-
.../Timestream2WriteProducerHealthCheckStaticCredsTest.java | 2 +-
.../write/Timestream2WriteProducerSpringTest.java | 2 +-
.../aws2/timestream/write/Timestream2WriteProducerTest.java | 2 +-
components/camel-aws/camel-aws2-transcribe/pom.xml | 2 +-
.../component/aws2/transcribe/Transcribe2ProducerTest.java | 2 +-
.../aws2/transcribe/integration/Aws2TranscribeBase.java | 2 +-
components/camel-aws/camel-aws2-translate/pom.xml | 2 +-
.../Translate2ProducerHealthCheckProfileCredsTest.java | 2 +-
.../Translate2ProducerHealthCheckStaticCredsTest.java | 2 +-
.../aws2/translate/Translate2ProducerSpringTest.java | 2 +-
.../component/aws2/translate/Translate2ProducerTest.java | 2 +-
.../translate/integration/Translate2ProducerManualIT.java | 2 +-
components/camel-azure/camel-azure-cosmosdb/pom.xml | 2 +-
.../component/azure/cosmosdb/CosmosDbEndpointTest.java | 2 +-
.../camel/component/azure/cosmosdb/CosmosDbTestUtils.java | 2 +-
.../cosmosdb/integration/BaseCamelCosmosDbTestSupport.java | 2 +-
components/camel-azure/camel-azure-eventgrid/pom.xml | 2 +-
.../component/azure/eventgrid/EventGridComponentTest.java | 2 +-
components/camel-azure/camel-azure-eventhubs/pom.xml | 2 +-
.../component/azure/eventhubs/EventHubsComponentTest.java | 2 +-
.../apache/camel/component/azure/eventhubs/TestUtils.java | 2 +-
.../azure/eventhubs/integration/EventHubsConsumerIT.java | 2 +-
.../integration/EventHubsProducerCustomClientIT.java | 2 +-
.../azure/eventhubs/integration/EventHubsProducerIT.java | 2 +-
.../operations/EventHubsProducerOperationsIT.java | 2 +-
components/camel-azure/camel-azure-files/pom.xml | 2 +-
.../camel/component/file/azure/FilesConfigurationTest.java | 2 +-
.../camel/component/file/azure/FilesEndpointTest.java | 2 +-
.../camel/component/file/azure/FilesOperationsTest.java | 2 +-
components/camel-azure/camel-azure-key-vault/pom.xml | 2 +-
.../azure/key/vault/KeyVaultConfigurationTest.java | 2 +-
.../integration/operations/KeyVaultOperationsTest.java | 2 +-
.../operations/KeyVaultPropertiesSourceNoEnvTestIT.java | 2 +-
components/camel-azure/camel-azure-schema-registry/pom.xml | 2 +-
components/camel-azure/camel-azure-servicebus/pom.xml | 2 +-
.../component/azure/servicebus/ServiceBusEndpointTest.java | 2 +-
components/camel-azure/camel-azure-storage-blob/pom.xml | 2 +-
.../component/azure/storage/blob/BlobComponentTest.java | 2 +-
.../storage/blob/BlobConfigurationOptionsProxyTest.java | 2 +-
.../camel/component/azure/storage/blob/BlobTestUtils.java | 2 +-
.../component/azure/storage/blob/integration/Base.java | 2 +-
.../storage/blob/integration/BlobCopyProducerManualIT.java | 2 +-
.../azure/storage/blob/operations/BlobOperationsTest.java | 2 +-
components/camel-azure/camel-azure-storage-datalake/pom.xml | 2 +-
.../storage/datalake/component/DataLakeComponentTest.java | 2 +-
.../component/azure/storage/datalake/integration/Base.java | 2 +-
.../datalake/operations/DataLakeDirectoryOperationTest.java | 2 +-
.../datalake/operations/DataLakeFileOperationTest.java | 2 +-
.../operations/DataLakeFileSystemOperationTest.java | 2 +-
components/camel-azure/camel-azure-storage-queue/pom.xml | 2 +-
.../component/azure/storage/queue/QueueComponentTest.java | 2 +-
.../storage/queue/QueueConfigurationOptionsProxyTest.java | 2 +-
.../camel/component/azure/storage/queue/QueueTestUtils.java | 2 +-
.../azure/storage/queue/integration/StorageQueueBase.java | 2 +-
.../azure/storage/queue/operations/QueueOperationsTest.java | 2 +-
.../queue/operations/integration/QueueOperationsIT.java | 2 +-
components/camel-barcode/pom.xml | 2 +-
.../dataformat/barcode/BarcodeDataFormatCamelTest.java | 2 +-
.../dataformat/barcode/BarcodeDataFormatSpringTest.java | 2 +-
.../apache/camel/dataformat/barcode/BarcodeTestBase.java | 2 +-
components/camel-base64/pom.xml | 4 ++--
.../camel/dataformat/base64/Base64DataFormatTestBase.java | 2 +-
.../base64/Base64PropertiesFunctionDecodeTest.java | 2 +-
.../base64/Base64PropertiesFunctionOptionalTest.java | 2 +-
.../dataformat/base64/Base64PropertiesFunctionTest.java | 2 +-
.../apache/camel/dataformat/base64/SimpleBase64Test.java | 2 +-
.../dataformat/base64/SpringBase64DataFormatTestBase.java | 2 +-
components/camel-bean-validator/pom.xml | 2 +-
.../bean/validator/BeanValidatorConfigurationTest.java | 2 +-
.../component/bean/validator/BeanValidatorRouteTest.java | 4 ++--
.../validator/CustomValidationProviderResolverTest.java | 2 +-
.../validator/HibernateValidationProviderResolverTest.java | 2 +-
.../bean/validator/ValidatorFactoryAutowireTest.java | 2 +-
.../bean/validator/ValidatorFactoryRegistryTest.java | 2 +-
.../component/bean/validator/ValidatorFactoryTest.java | 2 +-
components/camel-beanio/pom.xml | 2 +-
.../dataformat/beanio/BeanIODataFormatComplexTest.java | 4 ++--
...nIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java | 2 +-
.../camel/dataformat/beanio/BeanIODataFormatSimpleTest.java | 2 +-
.../BeanIOSplitterCustomBeanReaderErrorHandlerTest.java | 2 +-
.../apache/camel/dataformat/beanio/BeanIOSplitterTest.java | 2 +-
.../dataformat/beanio/BeanIOUnmarshalSingleObjectTest.java | 2 +-
.../dataformat/beanio/SpringBeanIODataFormatSimpleTest.java | 2 +-
.../org/apache/camel/dataformat/beanio/csv/CsvTest.java | 2 +-
components/camel-bindy/pom.xml | 2 +-
.../org/apache/camel/dataformat/bindy/CommonBindyTest.java | 2 +-
.../bindy/classtype/BindyCsvClassTypeAsStringTest.java | 2 +-
.../dataformat/bindy/classtype/BindyCsvClassTypeTest.java | 2 +-
.../bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java | 2 +-
.../csv/BindyComplexCsvGenerateHeaderMarshallTest.java | 2 +-
.../dataformat/bindy/csv/BindyComplexCsvMarshallTest.java | 2 +-
.../bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java | 2 +-
.../dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java | 2 +-
.../BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java | 2 +-
.../bindy/csv/BindyComplexRegexSeparatorTest.java | 2 +-
.../dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java | 2 +-
.../csv/BindyCsvFieldEndingWithSeparatorIssueTest.java | 2 +-
.../camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java | 2 +-
.../bindy/csv/BindyCsvStringDefaultValueAsNullTest.java | 2 +-
.../bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java | 2 +-
.../bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java | 2 +-
.../csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java | 2 +-
.../camel/dataformat/bindy/csv/BindyEscapedCsvTest.java | 2 +-
.../bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java | 2 +-
.../bindy/csv/BindyMarshalEndWithLineBreakTest.java | 2 +-
.../bindy/csv/BindyMarshalOneToManyWithHeadersTest.java | 2 +-
.../camel/dataformat/bindy/csv/BindyPatternLocaleTest.java | 2 +-
.../camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java | 2 +-
.../bindy/csv/BindyPojoSimpleCsvMarshallTest.java | 2 +-
.../csv/BindyRecordFieldStartingWithSeperatorCharTest.java | 2 +-
.../bindy/csv/BindySimpleCsvAutospanLineTest.java | 2 +-
.../bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java | 2 +-
.../bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java | 2 +-
.../bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java | 2 +-
...ndySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java | 2 +-
...indySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java | 2 +-
.../csv/BindySimpleCsvFunctionWithClassMethodTest.java | 2 +-
.../csv/BindySimpleCsvFunctionWithExternalMethodTest.java | 2 +-
.../bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java | 2 +-
.../bindy/csv/BindySimpleCsvIntegerMarshallTest.java | 2 +-
.../csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java | 2 +-
.../dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java | 2 +-
.../dataformat/bindy/csv/BindySimpleCsvMarshallTest.java | 2 +-
.../bindy/csv/BindySimpleCsvMarshallTrimClipTest.java | 2 +-
.../bindy/csv/BindySimpleCsvNullMarshallTest.java | 2 +-
.../bindy/csv/BindySimpleCsvOneToManyMarshallTest.java | 2 +-
.../bindy/csv/BindySimpleCsvQuotingOnlyWhenNeededTest.java | 2 +-
.../bindy/csv/BindySimpleCsvRegexAutospanLineTest.java | 2 +-
.../csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java | 2 +-
.../csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java | 2 +-
.../bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java | 4 ++--
.../csv/BindySimpleCsvUnmarshallPositionModifiedTest.java | 4 ++--
.../dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java | 4 ++--
.../bindy/csv/BindySimpleCsvUnmarshallTrimLineTest.java | 2 +-
.../csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java | 2 +-
.../csv/BindySingleQuoteStartWordCsvUnmarshallTest.java | 2 +-
.../bindy/csv/BindySingleQuotesCsvUnmarshallTest.java | 2 +-
...ingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java | 2 +-
.../camel/dataformat/bindy/csv/BindyTabSeparatorTest.java | 2 +-
.../dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java | 2 +-
.../csv2/BindyMarshalUnmarshalWithDefaultValueTest.java | 2 +-
.../bindy/csv2/BindyMarshalUnmarshalssueTest.java | 2 +-
.../dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java | 2 +-
.../dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java | 2 +-
.../bindy/fix/BindySimpleKeyValuePairFixTest.java | 2 +-
.../bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java | 2 +-
.../bindy/fix/BindySimpleKeyValuePairMarshallTest.java | 2 +-
.../bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java | 2 +-
.../fix/BindySimpleKeyValuePairUnicodeNextLineTest.java | 2 +-
...indySimpleKeyValuePairWithoutSectionMarshallDslTest.java | 2 +-
.../fixed/BindyMarshallUnmarshallWithDefaultValueTest.java | 2 +-
.../dataformat/bindy/fixed/BindyPaddingAndTrimmingTest.java | 2 +-
.../bindy/fixed/converter/BindyConverterTest.java | 2 +-
.../fixed/delimited/BindyFixedLengthDelimitedFieldTest.java | 2 +-
.../fixed/dynamic/BindyFixedLengthDynamicFieldTest.java | 2 +-
.../BindySimpleFixedLengthHeaderFooterTest.java | 2 +-
.../ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java | 2 +-
.../dataformat/bindy/fixed/implied/BindyImpliedTest.java | 2 +-
.../bindy/fixed/link/BindyRaceConditionLinkTest.java | 2 +-
.../fixed/link/BindySimpleFixedLengthWithLinkTest.java | 2 +-
.../marshall/simple/BindySimpleFixedLengthMarshallTest.java | 2 +-
.../BindySimpleFixedLengthMarshallWithClipAndTrimTest.java | 2 +-
.../simple/BindySimpleFixedLengthMarshallWithClipTest.java | 2 +-
.../BindySimpleFixedLengthMarshallWithNoClipTest.java | 4 ++--
.../bindy/fixed/multibytes/BindyCountGraphemeTest.java | 2 +-
.../bindy/fixed/multibytes/BindyMultiBytesTest.java | 2 +-
.../dataformat/bindy/fixed/number/BindyNumberTest.java | 2 +-
.../fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java | 2 +-
.../bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java | 2 +-
.../BindyFixedLengthHeaderFooterSkipHeaderTest.java | 2 +-
.../BindySimpleFixedLengthUnmarshallClassMethodTest.java | 2 +-
.../BindySimpleFixedLengthUnmarshallExternalMethodTest.java | 2 +-
.../simple/trim/BindySimpleFixedLengthUnmarshallTest.java | 2 +-
...ndySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java | 2 +-
.../BindySimpleFixedLengthUnmarshallTrimFieldTest.java | 2 +-
.../bindy/model/date/BindyDatePatternCsvUnmarshallTest.java | 2 +-
.../grouping/BindyBigDecimalGroupingUnmarshallTest.java | 2 +-
.../rounding/BindyBigDecimalRoundingUnmarshallTest.java | 2 +-
components/camel-bonita/pom.xml | 2 +-
.../camel/component/bonita/BonitaConfigurationTest.java | 2 +-
.../bonita/integration/BonitaIntegrationTestSupport.java | 2 +-
components/camel-box/camel-box-component/pom.xml | 2 +-
.../apache/camel/component/box/AbstractBoxITSupport.java | 4 ++--
components/camel-braintree/pom.xml | 2 +-
.../component/braintree/AbstractBraintreeTestSupport.java | 4 ++--
.../apache/camel/component/braintree/CustomerGatewayIT.java | 2 +-
.../apache/camel/component/braintree/DisputeGatewayIT.java | 2 +-
components/camel-caffeine/pom.xml | 4 ++--
.../cache/CaffeineCacheFromScratchProducerTest.java | 2 +-
.../cache/CaffeineCacheFromScratchStatsCounterTest.java | 2 +-
.../component/caffeine/cache/CaffeineCacheTestSupport.java | 2 +-
.../caffeine/loadcache/CaffeineLoadCacheTestSupport.java | 2 +-
.../CaffeineAggregationRepositoryOperationTest.java | 2 +-
.../aggregate/CaffeineAggregationRepositoryRoutesTest.java | 2 +-
.../idempotent/CaffeineIdempotentRepositoryTest.java | 2 +-
.../CaffeineIdempotentRepositoryWithSplitTest.java | 2 +-
components/camel-cassandraql/pom.xml | 2 +-
.../cassandra/integration/CassandraComponentProducerIT.java | 2 +-
.../integration/CassandraComponentProducerUnpreparedIT.java | 2 +-
.../aggregate/cassandra/CassandraCamelCodecTest.java | 2 +-
components/camel-cbor/pom.xml | 2 +-
.../org/apache/camel/component/cbor/CBORDataFormatTest.java | 2 +-
.../camel/component/cbor/CBORMarshalAllowJMSTypeTest.java | 2 +-
.../camel/component/cbor/CBORObjectListSplitTest.java | 4 ++--
...CBORUseDefaultMapperWithNonCBORMapperInRegistryTest.java | 2 +-
.../camel/component/cbor/SpringCBORDataFormatTest.java | 2 +-
components/camel-chunk/pom.xml | 2 +-
.../camel/component/chunk/ChunkComponentLayersTest.java | 2 +-
.../component/chunk/ChunkComponentNestedLayersTest.java | 2 +-
.../camel/component/chunk/ChunkComponentNestedTest.java | 2 +-
.../camel/component/chunk/ChunkComponentTemplateTest.java | 2 +-
.../apache/camel/component/chunk/ChunkComponentTest.java | 2 +-
.../chunk/ChunkDifferentThemeFolderAndSubfolderTest.java | 2 +-
.../ChunkDifferentThemeFolderSubfolderAndExtensionTest.java | 2 +-
.../ChunkDifferentThemeFolderSubfolderAndLayerTest.java | 2 +-
.../component/chunk/ChunkDifferentThemeFolderTest.java | 2 +-
.../org/apache/camel/component/chunk/ChunkLetterTest.java | 2 +-
.../java/org/apache/camel/component/chunk/ChunkRefTest.java | 2 +-
components/camel-clickup/pom.xml | 2 +-
.../ClickUpWebhookRegistrationAlreadyExistsTest.java | 2 +-
.../component/clickup/ClickUpWebhookRegistrationTest.java | 2 +-
.../camel/component/clickup/util/ClickUpTestSupport.java | 2 +-
components/camel-cloudevents/pom.xml | 2 +-
components/camel-cm-sms/pom.xml | 2 +-
.../apache/camel/component/cm/test/CMConfigurationTest.java | 2 +-
.../org/apache/camel/component/cm/test/CMMessageTest.java | 2 +-
.../java/org/apache/camel/component/cm/test/CMTest.java | 2 +-
.../camel/component/cm/test/CamelTestConfiguration.java | 2 +-
.../org/apache/camel/component/cm/test/SMSMessageTest.java | 2 +-
components/camel-coap/pom.xml | 2 +-
.../org/apache/camel/coap/CoAPComponentTLSTestBase.java | 2 +-
.../org/apache/camel/coap/CoAPRestComponentTestBase.java | 2 +-
.../test/java/org/apache/camel/coap/CoAPTestSupport.java | 2 +-
components/camel-cometd/pom.xml | 2 +-
.../camel/component/cometd/CometdProducerConsumerTest.java | 2 +-
.../component/cometd/MultipCometdProducerConsumerTest.java | 2 +-
.../component/cometd/SslCometdProducerConsumerTest.java | 2 +-
.../SslContextParametersCometdProducerConsumerTest.java | 2 +-
...SslContextParametersInUriCometdProducerConsumerTest.java | 2 +-
...slGlobalContextParametersCometdProducerConsumerTest.java | 2 +-
components/camel-consul/pom.xml | 4 ++--
.../org/apache/camel/component/consul/ConsulHealthIT.java | 2 +-
.../apache/camel/component/consul/ConsulTestSupport.java | 4 ++--
.../org/apache/camel/component/consul/MockAgentTest.java | 2 +-
.../org/apache/camel/component/consul/MockCatalogTest.java | 2 +-
.../consul/cloud/SpringConsulServiceCallRouteTest.java | 2 +-
components/camel-couchbase/pom.xml | 2 +-
.../camel/component/couchbase/CouchbaseComponentTest.java | 2 +-
.../couchbase/integration/CouchbaseIntegrationTestBase.java | 2 +-
components/camel-couchdb/pom.xml | 2 +-
.../camel/component/couchdb/CouchDbComponentTest.java | 2 +-
.../component/couchdb/integration/CouchDbTestSupport.java | 2 +-
components/camel-cron/pom.xml | 2 +-
.../org/apache/camel/component/cron/CronLoaderTest.java | 2 +-
.../org/apache/camel/component/cron/CronPatternsTest.java | 2 +-
components/camel-crypto-pgp/pom.xml | 2 +-
.../camel/converter/crypto/AbstractPGPDataFormatTest.java | 2 +-
components/camel-crypto/pom.xml | 2 +-
.../apache/camel/component/crypto/ECDSASignatureTest.java | 2 +-
.../org/apache/camel/component/crypto/SignatureTest.java | 2 +-
.../apache/camel/converter/crypto/CryptoDataFormatTest.java | 2 +-
components/camel-csimple-joor/pom.xml | 2 +-
.../camel/language/csimple/joor/CSimpleAttachmentsTest.java | 2 +-
.../camel/language/csimple/joor/CSimpleBase64Test.java | 2 +-
.../apache/camel/language/csimple/joor/CSimpleBeanTest.java | 2 +-
.../camel/language/csimple/joor/CSimpleDecHeaderTest.java | 2 +-
.../camel/language/csimple/joor/CSimpleIncHeaderTest.java | 2 +-
.../csimple/joor/CSimpleSetHeaderPredicateTest.java | 2 +-
.../org/apache/camel/language/csimple/joor/CSimpleTest.java | 2 +-
.../language/csimple/joor/JoorCSimpleCompilerTest.java | 2 +-
.../language/csimple/joor/OriginalSimpleOperatorTest.java | 2 +-
.../camel/language/csimple/joor/OriginalSimpleTest.java | 4 ++--
components/camel-csv/pom.xml | 2 +-
.../dataformat/csv/CsvDataFormatCustomFactoryTest.java | 2 +-
.../csv/CsvDataFormatCustomRecordConverterTest.java | 2 +-
.../dataformat/csv/CsvDataFormatResourceFactoryTest.java | 2 +-
.../csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java | 2 +-
.../dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java | 2 +-
.../apache/camel/dataformat/csv/CsvMarshalCharsetTest.java | 4 ++--
.../dataformat/csv/CsvMarshalHeaderFromCsvFormatTest.java | 2 +-
.../apache/camel/dataformat/csv/CsvMarshalHeaderTest.java | 2 +-
.../csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java | 2 +-
.../dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java | 2 +-
.../camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java | 2 +-
.../org/apache/camel/dataformat/csv/CsvMarshalTest.java | 2 +-
.../apache/camel/dataformat/csv/CsvRouteCharsetTest.java | 2 +-
.../java/org/apache/camel/dataformat/csv/CsvRouteTest.java | 4 ++--
.../dataformat/csv/CsvUnmarshalCommentMarkerSpringTest.java | 2 +-
.../camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java | 2 +-
.../dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java | 2 +-
.../camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java | 2 +-
.../dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java | 2 +-
.../camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java | 2 +-
.../apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java | 2 +-
.../dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java | 2 +-
.../camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java | 2 +-
.../org/apache/camel/dataformat/csv/CsvUnmarshalTest.java | 4 ++--
.../csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java | 2 +-
components/camel-cxf/camel-cxf-common/pom.xml | 2 +-
components/camel-cxf/camel-cxf-rest/pom.xml | 2 +-
.../cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java | 2 +-
.../cxf/jaxrs/CxfRsConsumerClientDisconnectedTest.java | 2 +-
.../component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java | 2 +-
.../camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java | 2 +-
.../apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java | 2 +-
.../cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java | 2 +-
.../cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java | 2 +-
.../component/cxf/jaxrs/CxfRsProducerStreamCacheTest.java | 2 +-
.../component/cxf/jaxrs/CxfRsResponseWithHeadersTest.java | 2 +-
.../camel/component/cxf/jaxrs/CxfRsStreamCacheTest.java | 2 +-
.../simplebinding/CxfRsConsumerSimpleBindingImplTest.java | 2 +-
.../jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java | 2 +-
components/camel-cxf/camel-cxf-soap/pom.xml | 2 +-
.../camel/component/cxf/converter/CachedCxfPayloadTest.java | 2 +-
.../component/cxf/converter/CxfPayloadConverterTest.java | 2 +-
.../camel/component/cxf/holder/CxfHolderConsumerTest.java | 2 +-
.../jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java | 2 +-
.../cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java | 2 +-
.../cxf/jaxws/CxfConsumerClientDisconnectedTest.java | 2 +-
.../cxf/jaxws/CxfConsumerContinuationTimeoutTest.java | 2 +-
.../camel/component/cxf/jaxws/CxfConsumerMessageTest.java | 2 +-
.../component/cxf/jaxws/CxfConsumerPayloadFaultTest.java | 2 +-
.../cxf/jaxws/CxfConsumerPayloadXPathClientServerTest.java | 4 ++--
.../component/cxf/jaxws/CxfConsumerPayloadXPathTest.java | 2 +-
.../camel/component/cxf/jaxws/CxfConsumerProviderTest.java | 2 +-
.../camel/component/cxf/jaxws/CxfConsumerResponseTest.java | 2 +-
.../component/cxf/jaxws/CxfConsumerStreamCacheTest.java | 2 +-
.../apache/camel/component/cxf/jaxws/CxfConsumerTest.java | 2 +-
.../component/cxf/jaxws/CxfCustomizedExceptionTest.java | 2 +-
.../cxf/jaxws/CxfJavaOnlyCamelContextAwareTest.java | 2 +-
.../component/cxf/jaxws/CxfJavaOnlyPayloadModeTest.java | 2 +-
.../camel/component/cxf/jaxws/CxfMixedModeRouterTest.java | 2 +-
.../cxf/jaxws/CxfMultipleConsumersSupportTest.java | 2 +-
.../camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java | 2 +-
.../cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java | 2 +-
.../component/cxf/jaxws/CxfProducerProtocalHeaderTest.java | 2 +-
.../camel/component/cxf/jaxws/CxfProducerRouterTest.java | 2 +-
.../camel/component/cxf/jaxws/CxfProducerSessionTest.java | 2 +-
.../component/cxf/jaxws/CxfProducerSoapActionTest.java | 2 +-
.../cxf/jaxws/CxfProducerSynchronousFalseTest.java | 2 +-
.../component/cxf/jaxws/CxfProducerSynchronousTest.java | 2 +-
.../camel/component/cxf/jaxws/CxfSchemaValidationTest.java | 2 +-
.../camel/component/cxf/jaxws/CxfSimpleRouterTest.java | 2 +-
.../cxf/jaxws/JaxWsWebFaultAnnotationToFaultTest.java | 2 +-
.../camel/component/cxf/util/SplitterWithXqureyTest.java | 2 +-
components/camel-cxf/camel-cxf-spring-rest/pom.xml | 2 +-
.../component/cxf/jaxrs/CxfOperationExceptionTest.java | 2 +-
.../component/cxf/jaxrs/CxfRsAsyncProducerSessionTest.java | 2 +-
.../camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java | 2 +-
.../apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java | 2 +-
.../component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java | 2 +-
.../cxf/jaxrs/CxfRsProducerAddressOverrideTest.java | 2 +-
.../cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.java | 2 +-
.../cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java | 2 +-
.../camel/component/cxf/jaxrs/CxfRsProducerSessionTest.java | 2 +-
.../apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java | 2 +-
.../apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java | 2 +-
.../camel/component/cxf/jaxrs/CxfRsSpringConsumerTest.java | 2 +-
.../camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java | 2 +-
.../component/cxf/jaxrs/CxfRsSslAsyncProducerTest.java | 2 +-
.../camel/component/cxf/jaxrs/CxfRsSslProducerTest.java | 2 +-
.../simplebinding/CxfRsConsumerSimpleBindingImplTest.java | 2 +-
.../jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java | 2 +-
components/camel-cxf/camel-cxf-spring-soap/pom.xml | 2 +-
.../camel/component/cxf/AbstractCXFGreeterRouterTest.java | 2 +-
.../camel/component/cxf/AbstractCxfWsdlFirstTest.java | 2 +-
.../org/apache/camel/component/cxf/CXFWsdlOnlyTest.java | 2 +-
.../camel/component/cxf/CxfComponentEnableMtomTest.java | 2 +-
.../cxf/CxfConsumerPayloadFaultCauseEnabledTest.java | 2 +-
.../apache/camel/component/cxf/CxfDispatchTestSupport.java | 2 +-
.../camel/component/cxf/CxfMessageHeaderTimeoutTest.java | 2 +-
.../org/apache/camel/component/cxf/CxfMulticastTest.java | 2 +-
.../org/apache/camel/component/cxf/CxfNonWrapperTest.java | 2 +-
.../org/apache/camel/component/cxf/CxfOneWayRouteTest.java | 2 +-
.../cxf/CxfPayLoadMessageXmlBindingRouterTest.java | 2 +-
.../camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java | 2 +-
.../component/cxf/CxfPayLoadSoapHeaderTestAbstract.java | 2 +-
.../cxf/CxfPayloadConsumerNamespaceOnEnvelopeTest.java | 2 +-
.../cxf/CxfPayloadProducerNamespaceOnEnvelopeTest.java | 2 +-
.../component/cxf/CxfPayloadRouterContentLengthTest.java | 2 +-
.../camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java | 2 +-
.../apache/camel/component/cxf/CxfRecipientListTest.java | 2 +-
.../component/cxf/CxfRecipientListWithUrlParamsTest.java | 2 +-
.../camel/component/cxf/CxfSoapMessageProviderTest.java | 2 +-
.../component/cxf/CxfSpringCustomizedExceptionTest.java | 2 +-
.../org/apache/camel/component/cxf/CxfSpringRouterTest.java | 2 +-
.../java/org/apache/camel/component/cxf/CxfTimeoutTest.java | 2 +-
.../component/cxf/converter/PayLoadConvertToPOJOTest.java | 2 +-
.../camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java | 2 +-
.../camel/component/cxf/mtom/CxfMtomConsumerTest.java | 2 +-
.../camel/component/cxf/multipart/CXFMultiPartTest.java | 2 +-
.../org/apache/camel/component/cxf/noparam/NoParamTest.java | 2 +-
.../cxf/spring/FileToCxfMessageDataFormatTest.java | 4 ++--
.../org/apache/camel/component/cxf/ssl/SslGlobalTest.java | 2 +-
.../java/org/apache/camel/component/cxf/ssl/SslTest.java | 2 +-
.../component/cxf/util/CxfEndpointUtilsWithSpringTest.java | 2 +-
.../java/org/apache/camel/component/cxf/wsdl/OrderTest.java | 2 +-
.../component/cxf/wssecurity/camel/WSSecurityRouteTest.java | 2 +-
components/camel-cxf/camel-cxf-spring-transport/pom.xml | 2 +-
.../component/cxf/transport/CamelTransportTestSupport.java | 2 +-
.../component/cxf/transport/JaxWSCamelTestSupport.java | 2 +-
components/camel-cxf/camel-cxf-transport/pom.xml | 2 +-
.../component/cxf/transport/CamelTransportTestSupport.java | 2 +-
.../component/cxf/transport/JaxWSCamelTestSupport.java | 2 +-
components/camel-cyberark-vault/pom.xml | 2 +-
.../vault/integration/CyberArkVaultMultipleSecretsIT.java | 2 +-
.../cyberark/vault/integration/CyberArkVaultProducerIT.java | 2 +-
.../vault/integration/CyberArkVaultPropertiesSourceIT.java | 2 +-
components/camel-dapr/pom.xml | 2 +-
.../org/apache/camel/component/dapr/DaprComponentTest.java | 2 +-
.../component/dapr/DaprConfigurationOptionsProxyTest.java | 2 +-
.../dapr/consumer/DaprConfigurationConsumerTest.java | 2 +-
.../component/dapr/consumer/DaprPubSubConsumerTest.java | 2 +-
.../component/dapr/operations/DaprConfigurationTest.java | 2 +-
.../component/dapr/operations/DaprInvokeBindingTest.java | 2 +-
.../component/dapr/operations/DaprInvokeServiceTest.java | 2 +-
.../camel/component/dapr/operations/DaprLockTest.java | 2 +-
.../camel/component/dapr/operations/DaprPubSubTest.java | 2 +-
.../camel/component/dapr/operations/DaprSecretTest.java | 2 +-
.../camel/component/dapr/operations/DaprStateTest.java | 2 +-
.../camel/component/dapr/operations/DaprWorkflowTest.java | 2 +-
components/camel-datasonnet/pom.xml | 2 +-
.../language/datasonnet/CamelDatasonnetJavaDslTest.java | 2 +-
.../camel/language/datasonnet/CamelDatasonnetTest.java | 2 +-
.../camel/language/datasonnet/DatasonnetAnnotationTest.java | 2 +-
.../camel/language/datasonnet/ExpressionsInJavaTest.java | 2 +-
.../apache/camel/language/datasonnet/PropertiesTest.java | 2 +-
.../camel-debezium-common-component/pom.xml | 2 +-
.../camel/component/debezium/DebeziumComponentTest.java | 2 +-
.../camel/component/debezium/DebeziumConsumerTest.java | 2 +-
.../camel-debezium-maven-plugin/pom.xml | 2 +-
components/camel-debezium/camel-debezium-db2/pom.xml | 2 +-
components/camel-debezium/camel-debezium-mongodb/pom.xml | 2 +-
components/camel-debezium/camel-debezium-mysql/pom.xml | 2 +-
components/camel-debezium/camel-debezium-oracle/pom.xml | 2 +-
components/camel-debezium/camel-debezium-postgres/pom.xml | 2 +-
components/camel-debezium/camel-debezium-sqlserver/pom.xml | 2 +-
components/camel-dfdl/pom.xml | 7 ++++++-
.../org/apache/camel/component/dfdl/DfdlComponentTest.java | 2 +-
.../apache/camel/dataformat/dfdl/DfdlDataFormatTest.java | 2 +-
.../camel/component/dhis2/AbstractDhis2TestSupport.java | 2 +-
components/camel-dhis2/pom.xml | 2 +-
components/camel-digitalocean/pom.xml | 2 +-
.../component/digitalocean/DigitalOceanComponentTest.java | 4 ++--
.../digitalocean/integration/DigitalOceanComponentIT.java | 2 +-
.../digitalocean/integration/DigitalOceanTestSupport.java | 4 ++--
components/camel-disruptor/pom.xml | 2 +-
.../component/disruptor/BasicDisruptorComponentTest.java | 2 +-
.../disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java | 2 +-
.../camel/component/disruptor/DisruptorAsyncRouteTest.java | 2 +-
.../component/disruptor/DisruptorBlockWhenFullTest.java | 2 +-
.../camel/component/disruptor/DisruptorBufferingTest.java | 2 +-
.../component/disruptor/DisruptorComplexInOutTest.java | 2 +-
.../disruptor/DisruptorComponentReferenceEndpointTest.java | 2 +-
.../disruptor/DisruptorConcurrentConsumersNPEIssueTest.java | 2 +-
.../disruptor/DisruptorConcurrentConsumersTest.java | 2 +-
.../camel/component/disruptor/DisruptorConcurrentTest.java | 2 +-
.../camel/component/disruptor/DisruptorConfigureTest.java | 2 +-
.../disruptor/DisruptorConsumerSuspendResumeTest.java | 2 +-
.../camel/component/disruptor/DisruptorFromRouteIdTest.java | 2 +-
.../component/disruptor/DisruptorInOnlyChainedTest.java | 2 +-
.../camel/component/disruptor/DisruptorInOnlyTest.java | 2 +-
.../component/disruptor/DisruptorInOutBigChainedTest.java | 2 +-
.../component/disruptor/DisruptorInOutChainedTest.java | 2 +-
.../disruptor/DisruptorInOutChainedTimeoutTest.java | 4 ++--
.../DisruptorInOutChainedWithOnCompletionTest.java | 2 +-
.../camel/component/disruptor/DisruptorInOutTest.java | 2 +-
.../DisruptorInOutWithErrorDeadLetterChannelTest.java | 2 +-
.../component/disruptor/DisruptorInOutWithErrorTest.java | 4 ++--
.../component/disruptor/DisruptorMultipleConsumersTest.java | 2 +-
.../camel/component/disruptor/DisruptorNoConsumerTest.java | 4 ++--
.../DisruptorReconfigureWithBlockingProducerTest.java | 2 +-
.../disruptor/DisruptorRemoveRouteThenAddAgainTest.java | 2 +-
.../camel/component/disruptor/DisruptorRingBufferTest.java | 2 +-
.../disruptor/DisruptorShouldNotUseSameThreadTest.java | 2 +-
.../component/disruptor/DisruptorTimeoutDisabledTest.java | 2 +-
.../camel/component/disruptor/DisruptorTimeoutTest.java | 4 ++--
.../camel/component/disruptor/DisruptorUnitOfWorkTest.java | 2 +-
.../disruptor/DisruptorWaitClaimStrategyComponentTest.java | 2 +-
.../disruptor/DisruptorWaitForTaskAsPropertyTest.java | 2 +-
.../DisruptorWaitForTaskCompleteOnCompletionTest.java | 4 ++--
.../disruptor/DisruptorWaitForTaskCompleteTest.java | 2 +-
.../disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java | 2 +-
.../DisruptorWaitForTaskNeverOnCompletionTest.java | 2 +-
.../component/disruptor/DisruptorWaitForTaskNeverTest.java | 2 +-
.../FileDisruptorShutdownCompleteAllTasksTest.java | 4 ++--
.../disruptor/MulticastDisruptorComponentTest.java | 2 +-
.../camel/component/disruptor/vm/AbstractVmTestSupport.java | 2 +-
.../vm/DisruptorVmComponentReferenceEndpointTest.java | 2 +-
.../disruptor/vm/DisruptorVmInOnlyChainedTest.java | 2 +-
.../component/disruptor/vm/DisruptorVmInOutChainedTest.java | 2 +-
.../disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java | 2 +-
.../disruptor/vm/DisruptorVmInOutWithErrorTest.java | 2 +-
.../disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java | 2 +-
.../component/disruptor/vm/DisruptorVmTimeoutIssueTest.java | 2 +-
.../disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java | 4 ++--
components/camel-dns/pom.xml | 2 +-
.../camel/component/dns/DnsDigEndpointSpringTest.java | 2 +-
.../org/apache/camel/component/dns/DnsDigEndpointTest.java | 2 +-
.../apache/camel/component/dns/DnsIpEndpointSpringTest.java | 2 +-
.../org/apache/camel/component/dns/DnsIpEndpointTest.java | 2 +-
.../apache/camel/component/dns/DnsIpHeaderTransferTest.java | 2 +-
.../camel/component/dns/DnsLookupEndpointSpringTest.java | 2 +-
.../apache/camel/component/dns/DnsLookupEndpointTest.java | 2 +-
.../camel/component/dns/WikipediaEndpointSpringTest.java | 2 +-
.../apache/camel/component/dns/WikipediaEndpointTest.java | 2 +-
components/camel-docker/pom.xml | 2 +-
.../component/docker/consumer/DockerEventsConsumerTest.java | 2 +-
.../component/docker/consumer/DockerStatsConsumerTest.java | 2 +-
.../component/docker/headers/BaseDockerHeaderTest.java | 2 +-
.../camel/component/docker/it/DockerITTestSupport.java | 4 ++--
components/camel-drill/pom.xml | 2 +-
.../java/org/apache/camel/component/drill/EndpointTest.java | 2 +-
.../java/org/apache/camel/component/drill/ProducerTest.java | 2 +-
components/camel-dropbox/pom.xml | 2 +-
.../apache/camel/component/dropbox/DropboxConsumerTest.java | 2 +-
.../component/dropbox/integration/DropboxTestSupport.java | 4 ++--
components/camel-dynamic-router/pom.xml | 2 +-
.../dynamicrouter/integration/DynamicRouterJmxIT.java | 4 ++--
.../integration/DynamicRouterMultipleRecipientModeIT.java | 2 +-
.../DynamicRouterSingleRouteTwoParticipantsIT.java | 2 +-
.../dynamicrouter/integration/DynamicRouterTwoRoutesIT.java | 2 +-
components/camel-ehcache/pom.xml | 4 ++--
.../component/ehcache/EhcacheCacheConfigurationTest.java | 2 +-
.../ehcache/EhcacheComponentConfigurationTest.java | 2 +-
.../camel/component/ehcache/EhcacheConfigurationTest.java | 2 +-
.../component/ehcache/EhcacheSpringConfigurationTest.java | 2 +-
.../apache/camel/component/ehcache/EhcacheTestSupport.java | 2 +-
components/camel-elasticsearch-rest-client/pom.xml | 2 +-
.../ElasticSearchRestClientComponentConfigurationTest.java | 2 +-
.../integration/ElasticsearchRestClientITSupport.java | 2 +-
components/camel-elasticsearch/pom.xml | 2 +-
.../camel/component/es/integration/ElasticsearchBulkIT.java | 2 +-
.../es/integration/ElasticsearchClusterIndexIT.java | 2 +-
.../component/es/integration/ElasticsearchTestSupport.java | 4 ++--
components/camel-elytron/pom.xml | 4 ++--
.../org/apache/camel/component/elytron/BaseElytronTest.java | 2 +-
.../camel/component/elytron/ElytronBearerTokenTest.java | 2 +-
components/camel-exec/pom.xml | 2 +-
.../apache/camel/component/exec/DefaultExecBindingTest.java | 2 +-
.../org/apache/camel/component/exec/ExecEndpointTest.java | 2 +-
.../component/exec/ExecJavaProcessRecipientListTest.java | 2 +-
.../apache/camel/component/exec/ExecJavaProcessTest.java | 2 +-
.../org/apache/camel/component/exec/ExecOutFileTest.java | 2 +-
.../org/apache/camel/component/exec/ExecProducerTest.java | 2 +-
.../org/apache/camel/component/exec/ExecScriptTest.java | 2 +-
.../component/exec/impl/ExecDocumentationExamplesTest.java | 4 ++--
components/camel-fastjson/pom.xml | 2 +-
.../camel/component/fastjson/FastjsonMarshalTest.java | 2 +-
components/camel-fhir/camel-fhir-component/pom.xml | 4 ++--
.../camel/component/fhir/AbstractFhirTestSupport.java | 2 +-
.../component/fhir/dataformat/FhirJsonDataFormatTest.java | 2 +-
.../fhir/dataformat/FhirJsonDataformatErrorHandlerTest.java | 2 +-
.../component/fhir/dataformat/FhirXmlDataFormatTest.java | 2 +-
.../fhir/dataformat/FhirXmlDataformatErrorHandlerTest.java | 2 +-
.../dataformat/spring/FhirDataformatConfigSpringTest.java | 2 +-
.../spring/FhirDataformatDefaultConfigSpringTest.java | 2 +-
.../dataformat/spring/FhirJsonDataFormatSpringTest.java | 2 +-
.../spring/FhirJsonDataformatErrorHandlerSpringTest.java | 2 +-
.../fhir/dataformat/spring/FhirXmlDataFormatSpringTest.java | 2 +-
.../spring/FhirXmlDataformatErrorHandlerSpringTest.java | 2 +-
components/camel-file-watch/pom.xml | 2 +-
.../component/file/watch/FileWatchComponentTestBase.java | 4 ++--
.../camel/component/file/watch/SpringFileWatcherTest.java | 2 +-
components/camel-flatpack/pom.xml | 2 +-
.../org/apache/camel/component/flatpack/CharsetTest.java | 2 +-
.../camel/component/flatpack/DelimitedAllowLongTest.java | 2 +-
.../component/flatpack/DelimitedAllowShortAndLongTest.java | 2 +-
.../camel/component/flatpack/DelimitedAllowShortTest.java | 2 +-
.../component/flatpack/DelimitedErrorWithUnmarshalTest.java | 2 +-
.../org/apache/camel/component/flatpack/DelimitedTest.java | 2 +-
.../component/flatpack/DelimitedWithNoDescriptorTest.java | 2 +-
.../component/flatpack/DelimitedWithUnmarshalTest.java | 2 +-
.../camel/component/flatpack/FixedLengthAllowLongTest.java | 2 +-
.../flatpack/FixedLengthAllowShortAndLongTest.java | 2 +-
.../camel/component/flatpack/FixedLengthAllowShortTest.java | 2 +-
.../apache/camel/component/flatpack/FixedLengthTest.java | 2 +-
.../component/flatpack/FixedLengthWithUnmarshalTest.java | 2 +-
.../component/flatpack/FlatpackDataSetListIteratorTest.java | 2 +-
.../component/flatpack/FlatpackDelimitedDataFormatTest.java | 2 +-
.../flatpack/FlatpackFixedLengthDataFormatTest.java | 2 +-
...atpackFixedLengthWithHeaderAndTrailerDataFormatTest.java | 2 +-
.../camel/component/flatpack/HeaderAndTrailerTest.java | 2 +-
.../camel/component/flatpack/InvalidFixedLengthTest.java | 2 +-
.../apache/camel/component/flatpack/NoSplitRowsTest.java | 2 +-
.../apache/camel/component/flatpack/StreamedSplitTest.java | 2 +-
.../apache/camel/component/flatpack/XMLNoSplitRowsTest.java | 2 +-
.../apache/camel/component/flatpack/XMLSplitRowsTest.java | 2 +-
components/camel-flink/pom.xml | 2 +-
.../camel/component/flink/DataStreamBatchProcessingIT.java | 2 +-
.../camel/component/flink/DataStreamConfigurationIT.java | 2 +-
.../apache/camel/component/flink/DataStreamEdgeCasesIT.java | 2 +-
.../camel/component/flink/DataStreamProducerTest.java | 2 +-
.../org/apache/camel/component/flink/FlinkProducerTest.java | 2 +-
components/camel-flowable/pom.xml | 2 +-
.../camel/component/flowable/CamelFlowableTestCase.java | 2 +-
components/camel-fop/pom.xml | 2 +-
.../org/apache/camel/component/fop/FopComponentTest.java | 4 ++--
.../org/apache/camel/component/fop/FopEndpointTest.java | 2 +-
components/camel-fory/pom.xml | 2 +-
.../test/java/org/apache/camel/component/fory/ForyTest.java | 2 +-
components/camel-freemarker/pom.xml | 2 +-
.../component/freemarker/FreemarkerAttachmentsTest.java | 2 +-
.../freemarker/FreemarkerBodyAsDomainObjectTest.java | 2 +-
.../component/freemarker/FreemarkerConcurrentTest.java | 4 ++--
.../component/freemarker/FreemarkerContentCacheTest.java | 2 +-
.../camel/component/freemarker/FreemarkerLetterTest.java | 2 +-
.../component/freemarker/FreemarkerOverrideHeaderTest.java | 2 +-
.../camel/component/freemarker/FreemarkerRefTest.java | 2 +-
.../camel/component/freemarker/FreemarkerSetHeaderTest.java | 2 +-
.../freemarker/FreemarkerTemplateInHeaderTest.java | 4 ++--
.../apache/camel/component/freemarker/FreemarkerTest.java | 2 +-
.../freemarker/FreemarkerValuesInPropertiesTest.java | 2 +-
components/camel-ftp/pom.xml | 2 +-
.../camel/component/file/remote/BaseServerTestSupport.java | 2 +-
.../component/file/remote/FromFtpClientSoTimeoutTest.java | 2 +-
.../component/file/remote/FromFtpToBinarySampleTest.java | 2 +-
.../camel/component/file/remote/FtpIllegalOptionsTest.java | 2 +-
.../camel/component/file/remote/FtpSoTimeoutTest.java | 2 +-
...teEndPointRemoteFilePollingConsumerPollStrategyTest.java | 2 +-
.../camel/component/file/remote/UriConfigurationTest.java | 4 ++--
.../file/remote/integration/FileToFtpTempFileNameIT.java | 2 +-
.../file/remote/integration/FromFileToFtpDeleteIT.java | 6 +++---
.../integration/FromFtpConsumerTemplateRollbackIT.java | 2 +-
.../remote/integration/FromFtpDirectoryToBinaryFilesIT.java | 2 +-
.../integration/FromFtpExclusiveReadNoneStrategyIT.java | 4 ++--
.../file/remote/integration/FromFtpKeepLastModifiedIT.java | 2 +-
.../component/file/remote/integration/FromFtpNoFilesIT.java | 4 ++--
.../integration/FromFtpSetNamesWithMultiDirectoriesIT.java | 2 +-
.../file/remote/integration/FromFtpToAsciiFileIT.java | 2 +-
.../integration/FromFtpToAsciiFileNoBodyConversionIT.java | 2 +-
.../file/remote/integration/FromFtpToBinaryFileIT.java | 2 +-
.../file/remote/integration/FromFtpToBinaryFilesIT.java | 2 +-
.../remote/integration/FromFtpToFileNoFileNameHeaderIT.java | 2 +-
.../file/remote/integration/FtpBrowsableEndpointIT.java | 6 +++---
.../file/remote/integration/FtpChangedReadLockIT.java | 4 ++--
.../remote/integration/FtpChangedRootDirReadLockIT.java | 4 ++--
.../remote/integration/FtpChangedZeroLengthReadLockIT.java | 4 ++--
.../file/remote/integration/FtpConsumerAutoCreateIT.java | 2 +-
.../FtpConsumerLocalWorkDirectoryAsAbsolutePathIT.java | 6 +++---
.../integration/FtpConsumerLocalWorkDirectoryDirectIT.java | 6 +++---
.../remote/integration/FtpConsumerLocalWorkDirectoryIT.java | 6 +++---
.../FtpConsumerLocalWorkDirectoryWorkOnPayloadIT.java | 2 +-
.../remote/integration/FtpConsumerMoveExpressionIT.java | 2 +-
.../integration/FtpConsumerMultipleDirectoriesIT.java | 2 +-
.../FtpConsumerPostProcessingOnDisconnectIT.java | 2 +-
.../remote/integration/FtpConsumerRelativeFileNameIT.java | 2 +-
.../remote/integration/FtpConsumerResumeDownloadIT.java | 8 ++++----
.../FtpConsumerThrowExceptionOnLoginFailedIT.java | 2 +-
.../file/remote/integration/FtpProducerAllowNullBodyIT.java | 4 ++--
.../file/remote/integration/FtpProducerDoneFileNameIT.java | 2 +-
.../file/remote/integration/FtpProducerExpressionIT.java | 2 +-
.../file/remote/integration/FtpProducerFileExistFailIT.java | 2 +-
.../integration/FtpProducerJailStartingDirectoryIT.java | 2 +-
.../file/remote/integration/FtpProducerMoveExistingIT.java | 8 ++++----
.../remote/integration/FtpProducerRootFileExistFailIT.java | 4 ++--
.../remote/integration/FtpProducerTempFileExistIssueIT.java | 2 +-
.../remote/integration/FtpProducerToDMoveExistingIT.java | 2 +-
.../file/remote/integration/FtpReadLockNotStartedIT.java | 2 +-
.../integration/FtpSimpleConsumeStreamingStepwiseIT.java | 2 +-
.../integration/RemoteFileProduceOverruleOnlyOnceIT.java | 2 +-
.../integration/SftpConsumerLocalWorkDirectoryIT.java | 6 +++---
.../file/remote/manual/FtpConsumerCamelManualTest.java | 4 ++--
.../remote/manual/FtpConsumerCamelRecursiveManualTest.java | 4 ++--
.../FtpConsumerCamelRecursiveToAbsoluteManualTest.java | 2 +-
.../manual/FtpConsumerNotStepwiseCamelManualTest.java | 4 ++--
.../FtpConsumerNotStepwiseCamelRecursiveManualTest.java | 4 ++--
...nsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java | 2 +-
.../file/remote/manual/FtpConsumerScottManualTest.java | 4 ++--
.../remote/manual/FtpConsumerScottRecursiveManualTest.java | 4 ++--
.../file/remote/sftp/integration/SftpChangedReadLockIT.java | 4 ++--
.../remote/sftp/integration/SftpProducerMoveExistingIT.java | 8 ++++----
components/camel-geocoder/pom.xml | 2 +-
.../camel/component/geocoder/GeoCoderApiKeyTestBase.java | 2 +-
.../component/geocoder/GeoCoderNominatimAddressTest.java | 2 +-
.../camel/component/geocoder/GeoCoderNominatimTest.java | 2 +-
components/camel-git/pom.xml | 2 +-
.../java/org/apache/camel/component/git/GitTestSupport.java | 4 ++--
components/camel-github/pom.xml | 2 +-
.../camel/component/github/GitHubComponentTestBase.java | 2 +-
components/camel-google/camel-google-bigquery/pom.xml | 2 +-
.../google/bigquery/integration/BigQueryITSupport.java | 4 ++--
.../component/google/bigquery/unit/BaseBigQueryTest.java | 2 +-
.../bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java | 2 +-
.../unit/sql/GoogleBigQuerySQLProducerBaseTest.java | 2 +-
components/camel-google/camel-google-calendar/pom.xml | 2 +-
.../google/calendar/AbstractGoogleCalendarTestSupport.java | 4 ++--
.../stream/AbstractGoogleCalendarStreamTestSupport.java | 4 ++--
components/camel-google/camel-google-drive/pom.xml | 2 +-
.../google/drive/AbstractGoogleDriveTestSupport.java | 4 ++--
.../camel/component/google/drive/FileConverterIT.java | 2 +-
.../google/drive/GoogleDriveFilesConverterTest.java | 4 ++--
components/camel-google/camel-google-functions/pom.xml | 2 +-
.../google/functions/integration/GoogleCloudIT.java | 2 +-
.../google/functions/unit/GoogleCloudFunctionsBaseTest.java | 2 +-
.../unit/GoogleCloudFunctionsConfigurationTest.java | 2 +-
components/camel-google/camel-google-mail/pom.xml | 2 +-
.../google/mail/AbstractGoogleMailTestSupport.java | 4 ++--
.../mail/stream/AbstractGoogleMailStreamTestSupport.java | 4 ++--
components/camel-google/camel-google-pubsub-lite/pom.xml | 2 +-
.../google/pubsublite/GooglePubsubLiteComponentTest.java | 2 +-
.../google/pubsublite/GooglePubsubLiteConsumerTest.java | 2 +-
.../google/pubsublite/GooglePubsubLiteProducerTest.java | 2 +-
components/camel-google/camel-google-pubsub/pom.xml | 2 +-
.../camel/component/google/pubsub/PubsubTestSupport.java | 4 ++--
components/camel-google/camel-google-secret-manager/pom.xml | 2 +-
.../secret/manager/integration/GoogleSecretManagerIT.java | 2 +-
.../GoogleSecretManagerPropertiesNoEnvSourceTestIT.java | 2 +-
.../manager/unit/GoogleSecretManagerConfigurationTest.java | 2 +-
components/camel-google/camel-google-sheets/pom.xml | 2 +-
.../google/sheets/AbstractGoogleSheetsTestSupport.java | 2 +-
.../component/google/sheets/SheetsConfigurationTest.java | 2 +-
components/camel-google/camel-google-storage/pom.xml | 2 +-
.../component/google/storage/integration/ComplexIT.java | 2 +-
.../google/storage/unit/GoogleCloudStorageBaseTest.java | 2 +-
.../unit/GoogleCloudStorageComponentConfigurationTest.java | 2 +-
components/camel-google/camel-google-vertexai/pom.xml | 2 +-
.../vertexai/GoogleVertexAIComponentConfigurationTest.java | 2 +-
.../google/vertexai/integration/GoogleVertexAIIT.java | 2 +-
.../vertexai/integration/GoogleVertexAIRawPredictIT.java | 2 +-
.../integration/GoogleVertexAIWithSystemPropertiesIT.java | 2 +-
components/camel-grape/pom.xml | 2 +-
components/camel-graphql/pom.xml | 2 +-
.../camel/component/graphql/GraphqlComponentTest.java | 2 +-
components/camel-grok/pom.xml | 2 +-
.../apache/camel/component/grok/GrokFileUnmarshalTest.java | 2 +-
.../org/apache/camel/component/grok/GrokMarshalTest.java | 4 ++--
.../camel/component/grok/GrokOptionalOptionsTest.java | 4 ++--
.../org/apache/camel/component/grok/GrokPatternsTest.java | 2 +-
.../org/apache/camel/component/grok/GrokUnmarshalTest.java | 2 +-
.../camel/component/grok/SpringGrokDataFormatTest.java | 2 +-
components/camel-groovy-xml/pom.xml | 2 +-
.../apache/camel/groovy/xml/GroovyXmlDataFormatTest.java | 2 +-
components/camel-groovy/pom.xml | 2 +-
.../apache/camel/language/groovy/GroovyExpressionTest.java | 6 +++---
.../camel/language/groovy/GroovyInvokeMethodTest.java | 2 +-
.../apache/camel/language/groovy/GroovyLanguageTest.java | 2 +-
.../org/apache/camel/language/groovy/GroovyListMapTest.java | 2 +-
.../apache/camel/language/groovy/GroovyResourceTest.java | 2 +-
.../camel/language/groovy/GroovyScriptingLanguageTest.java | 2 +-
.../camel/language/groovy/GroovySetFixedHeaderTest.java | 2 +-
.../apache/camel/language/groovy/GroovySetHeaderTest.java | 2 +-
.../camel/language/groovy/GroovyShellFactoryTest.java | 4 ++--
.../camel/language/groovy/LanguageGroovyRouteTest.java | 2 +-
.../camel/processor/groovy/DefaultGroovyCompilerTest.java | 2 +-
.../camel/processor/groovy/GroovyCompilerRouteTest.java | 2 +-
.../org/apache/camel/processor/groovy/GroovyFilterTest.java | 2 +-
.../org/apache/camel/processor/groovy/GroovyLogEipTest.java | 2 +-
.../groovy/GroovySetHeaderConcurrentIssueTest.java | 2 +-
.../camel/processor/groovy/GroovySetHeaderIssueTest.java | 2 +-
.../apache/camel/processor/groovy/GroovySumFilterTest.java | 2 +-
.../camel/processor/groovy/InlinedGroovyScriptTest.java | 2 +-
components/camel-grpc/pom.xml | 2 +-
.../camel/component/grpc/GrpcConsumerAggregationTest.java | 2 +-
.../camel/component/grpc/GrpcConsumerConcurrentTest.java | 2 +-
.../camel/component/grpc/GrpcConsumerConfigurationTest.java | 2 +-
.../camel/component/grpc/GrpcConsumerExceptionTest.java | 2 +-
.../camel/component/grpc/GrpcConsumerPropagationTest.java | 2 +-
.../camel/component/grpc/GrpcConsumerSecurityTest.java | 2 +-
.../component/grpc/GrpcConsumerServerInterceptorTest.java | 2 +-
.../component/grpc/GrpcProducerClientInterceptorTest.java | 2 +-
.../camel/component/grpc/GrpcProducerConfigurationTest.java | 2 +-
.../camel/component/grpc/GrpcProducerSecurityTest.java | 2 +-
.../camel/component/grpc/GrpcProducerStreamingTest.java | 4 ++--
.../apache/camel/component/grpc/GrpcProducerSyncTest.java | 2 +-
.../camel/component/grpc/GrpcProxyAsyncAsyncTest.java | 2 +-
.../apache/camel/component/grpc/GrpcProxyAsyncSyncTest.java | 2 +-
.../apache/camel/component/grpc/GrpcProxySyncAsyncTest.java | 2 +-
.../component/grpc/RouteControlledStreamObserverTest.java | 2 +-
components/camel-gson/pom.xml | 2 +-
.../org/apache/camel/component/gson/GsonConcurrentTest.java | 4 ++--
.../camel/component/gson/GsonFieldNamePolicyTest.java | 2 +-
.../camel/component/gson/GsonMarshalExclusionTest.java | 2 +-
.../apache/camel/component/gson/GsonMarshalListTest.java | 2 +-
.../org/apache/camel/component/gson/GsonMarshalTest.java | 2 +-
.../component/gson/GsonUnmarshalTypeFromHeaderTest.java | 2 +-
.../camel/component/gson/SpringGsonFieldNamePolicyTest.java | 2 +-
.../camel/component/gson/SpringGsonJsonDataFormatTest.java | 2 +-
.../gson/SpringGsonUnmarshalTypeFromHeaderTest.java | 2 +-
components/camel-guava-eventbus/pom.xml | 2 +-
.../guava/eventbus/GuavaEventBusComponentTest.java | 2 +-
.../eventbus/GuavaEventBusConsumerConfigurationTest.java | 4 ++--
.../component/guava/eventbus/GuavaEventBusConsumerTest.java | 2 +-
.../eventbus/GuavaEventBusConsumingDeadEventsTest.java | 2 +-
.../component/guava/eventbus/GuavaEventBusProducerTest.java | 2 +-
components/camel-hashicorp-vault/pom.xml | 2 +-
.../HashicorpVaultPropertiesSourceNoEnvTestIT.java | 2 +-
.../vault/integration/operations/HashicorpVaultBase.java | 2 +-
components/camel-hazelcast/pom.xml | 2 +-
.../hazelcast/HazelcastCamelSpringTestSupport.java | 2 +-
.../component/hazelcast/HazelcastCamelTestSupport.java | 2 +-
.../component/hazelcast/HazelcastListProducerTest.java | 2 +-
.../hazelcast/HazelcastReplicatedmapConsumerTest.java | 2 +-
.../hazelcast/HazelcastSedaConcurrentConsumersTest.java | 2 +-
.../component/hazelcast/HazelcastSedaConfigurationTest.java | 4 ++--
.../camel/component/hazelcast/HazelcastSedaFIFOTest.java | 2 +-
.../camel/component/hazelcast/HazelcastSedaInOnlyTest.java | 2 +-
.../camel/component/hazelcast/HazelcastSedaInOutTest.java | 2 +-
.../component/hazelcast/HazelcastSedaSpringSupportTest.java | 2 +-
.../hazelcast/HazelcastSedaTransferExchangeTest.java | 2 +-
.../camel/component/hazelcast/HazelcastSetProducerTest.java | 2 +-
.../HazelcastAggregationRepositoryCamelTestSupport.java | 2 +-
.../HazelcastAggregationRepositoryConstructorsTest.java | 2 +-
.../HazelcastAggregationRepositoryOperationsTest.java | 2 +-
.../hazelcast/HazelcastIdempotentRepositoryTest.java | 2 +-
components/camel-headersmap/pom.xml | 2 +-
.../camel/component/headersmap/CamelFastHeadersMapTest.java | 4 ++--
components/camel-hl7/pom.xml | 2 +-
.../org/apache/camel/component/hl7/AckExpressionTest.java | 2 +-
.../org/apache/camel/component/hl7/ConvertLineFeedTest.java | 2 +-
.../org/apache/camel/component/hl7/HL7DataFormatTest.java | 2 +-
.../java/org/apache/camel/component/hl7/HL7TestSupport.java | 2 +-
.../org/apache/camel/component/hl7/HL7ValidateTest.java | 4 ++--
.../apache/camel/component/hl7/HL7XmlDataFormatTest.java | 2 +-
.../apache/camel/component/hl7/MessageValidatorTest.java | 2 +-
.../apache/camel/component/hl7/TerserExpressionTest.java | 2 +-
components/camel-http-base/pom.xml | 2 +-
components/camel-http-common/pom.xml | 2 +-
.../apache/camel/http/common/DefaultHttpBindingTest.java | 2 +-
.../camel/http/common/HttpHeaderFilterStrategyTest.java | 2 +-
.../apache/camel/http/common/cookie/CookieHandlerTest.java | 2 +-
components/camel-http/pom.xml | 2 +-
.../camel/component/http/HttpClientConfigurerTest.java | 2 +-
.../camel/component/http/HttpCredentialsHelperTest.java | 2 +-
.../camel/component/http/HttpCustomComponentNameTest.java | 2 +-
.../camel/component/http/HttpDefaultPortNumberTest.java | 2 +-
.../http/HttpEndpointOptionsNotChangeComponentTest.java | 4 ++--
.../apache/camel/component/http/HttpEndpointURLTest.java | 2 +-
.../component/http/HttpNoConnectionRedeliveryTest.java | 2 +-
.../apache/camel/component/http/HttpNoConnectionTest.java | 2 +-
.../camel/component/http/HttpPollingConsumerTest.java | 2 +-
.../camel/component/http/HttpProducerSessionTest.java | 2 +-
.../camel/component/http/HttpReferenceParameterTest.java | 2 +-
.../apache/camel/component/http/HttpSNIHostNameTest.java | 2 +-
.../apache/camel/component/http/HttpServerTestSupport.java | 2 +-
.../component/http/HttpThrowExceptionOnFailureTest.java | 2 +-
.../http/HttpUseSystemPropertiesPropagationTest.java | 2 +-
components/camel-huawei/camel-huaweicloud-dms/pom.xml | 2 +-
.../huaweicloud/dms/CreateInstanceJsonFunctionalTest.java | 2 +-
.../component/huaweicloud/dms/CreateInstanceJsonTest.java | 2 +-
.../component/huaweicloud/dms/CreateInstanceKafka1Test.java | 2 +-
.../component/huaweicloud/dms/CreateInstanceKafka2Test.java | 2 +-
.../huaweicloud/dms/CreateInstanceKafkaFunctional1Test.java | 2 +-
.../huaweicloud/dms/CreateInstanceKafkaFunctional2Test.java | 2 +-
.../huaweicloud/dms/CreateInstancePojoFunctionalTest.java | 2 +-
.../component/huaweicloud/dms/CreateInstancePojoTest.java | 2 +-
.../component/huaweicloud/dms/CreateInstanceRmq1Test.java | 2 +-
.../component/huaweicloud/dms/CreateInstanceRmq2Test.java | 2 +-
.../huaweicloud/dms/CreateInstanceRmqFunctional1Test.java | 2 +-
.../huaweicloud/dms/CreateInstanceRmqFunctional2Test.java | 2 +-
.../huaweicloud/dms/DeleteInstanceFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/dms/DeleteInstanceTest.java | 2 +-
.../huaweicloud/dms/ListInstancesFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/dms/ListInstancesTest.java | 2 +-
.../huaweicloud/dms/QueryInstanceFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/dms/QueryInstanceTest.java | 2 +-
.../huaweicloud/dms/UpdateInstanceJsonFunctionalTest.java | 2 +-
.../component/huaweicloud/dms/UpdateInstanceJsonTest.java | 2 +-
.../huaweicloud/dms/UpdateInstancePojoFunctionalTest.java | 2 +-
.../component/huaweicloud/dms/UpdateInstancePojoTest.java | 2 +-
components/camel-huawei/camel-huaweicloud-frs/pom.xml | 2 +-
.../huaweicloud/frs/FaceRecognitionInvalidParamsTest.java | 2 +-
.../camel/component/huaweicloud/frs/TestConfiguration.java | 2 +-
.../mock/FaceDetectionWithImageBae64AndMockClientTest.java | 2 +-
.../mock/FaceDetectionWithImageFileAndMockClientTest.java | 2 +-
.../mock/FaceDetectionWithImageUrlAndMockClientTest.java | 2 +-
.../FaceVerificationWithImageBae64AndMockClientTest.java | 2 +-
.../FaceVerificationWithImageFileAndMockClientTest.java | 2 +-
.../mock/FaceVerificationWithImageUrlAndMockClientTest.java | 2 +-
.../mock/LiveDetectionWithVideoBae64AndMockClientTest.java | 2 +-
.../mock/LiveDetectionWithVideoFileAndMockClientTest.java | 2 +-
.../mock/LiveDetectionWithVideoUrlAndMockClientTest.java | 2 +-
.../frs/real/FaceDetectionWithImageBae64Test.java | 2 +-
.../frs/real/FaceDetectionWithImageFileTest.java | 2 +-
.../huaweicloud/frs/real/FaceDetectionWithImageUrlTest.java | 2 +-
.../frs/real/FaceVerificationWithImageBae64Test.java | 2 +-
.../frs/real/FaceVerificationWithImageFileTest.java | 2 +-
.../frs/real/FaceVerificationWithImageUrlTest.java | 2 +-
.../frs/real/LiveDetectionWithVideoBae64Test.java | 2 +-
.../frs/real/LiveDetectionWithVideoFileTest.java | 2 +-
.../huaweicloud/frs/real/LiveDetectionWithVideoUrlTest.java | 2 +-
.../camel-huawei/camel-huaweicloud-functiongraph/pom.xml | 2 +-
.../apache/camel/InvokeFunctionCombinedFunctionalTest.java | 2 +-
.../java/org/apache/camel/InvokeFunctionCombinedTest.java | 2 +-
.../apache/camel/InvokeFunctionEndpointFunctionalTest.java | 2 +-
.../java/org/apache/camel/InvokeFunctionEndpointTest.java | 2 +-
.../apache/camel/InvokeFunctionExchangeFunctionalTest.java | 2 +-
.../java/org/apache/camel/InvokeFunctionExchangeTest.java | 2 +-
.../java/org/apache/camel/InvokeFunctionFunctionalTest.java | 2 +-
.../camel/InvokeFunctionServiceKeyFunctionalTest.java | 2 +-
.../java/org/apache/camel/InvokeFunctionServiceKeyTest.java | 2 +-
.../src/test/java/org/apache/camel/InvokeFunctionTest.java | 2 +-
.../src/test/java/org/apache/camel/TestConfiguration.java | 2 +-
components/camel-huawei/camel-huaweicloud-iam/pom.xml | 2 +-
.../huaweicloud/iam/GetGroupUsersFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/iam/GetGroupUsersTest.java | 2 +-
.../component/huaweicloud/iam/GetUserFunctionalTest.java | 2 +-
.../apache/camel/component/huaweicloud/iam/GetUserTest.java | 2 +-
.../component/huaweicloud/iam/ListGroupsFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/iam/ListGroupsTest.java | 2 +-
.../component/huaweicloud/iam/ListUsersFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/iam/ListUsersTest.java | 2 +-
.../huaweicloud/iam/UpdateGroupFunctionalTest.java | 2 +-
.../huaweicloud/iam/UpdateGroupJsonFunctionalTest.java | 2 +-
.../component/huaweicloud/iam/UpdateGroupJsonTest.java | 2 +-
.../camel/component/huaweicloud/iam/UpdateGroupTest.java | 2 +-
.../component/huaweicloud/iam/UpdateUserFunctionalTest.java | 2 +-
.../huaweicloud/iam/UpdateUserJsonFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/iam/UpdateUserJsonTest.java | 2 +-
.../camel/component/huaweicloud/iam/UpdateUserTest.java | 2 +-
.../camel-huawei/camel-huaweicloud-imagerecognition/pom.xml | 2 +-
.../image/CelebrityRecognitionWithImagUrlTest.java | 2 +-
...lebrityRecognitionWithImageContentAndMockClientTest.java | 2 +-
.../image/CelebrityRecognitionWithImageContentTest.java | 2 +-
.../CelebrityRecognitionWithImageUrlAndMockClientTest.java | 2 +-
.../TagRecognitionWithImageContentAndMockClientTest.java | 2 +-
.../image/TagRecognitionWithImageContentTest.java | 2 +-
.../image/TagRecognitionWithImageUrlAndMockClientTest.java | 2 +-
.../huaweicloud/image/TagRecognitionWithImageUrlTest.java | 2 +-
.../component/huaweicloud/image/TestConfiguration.java | 2 +-
components/camel-huawei/camel-huaweicloud-obs/pom.xml | 2 +-
.../huaweicloud/obs/BucketMetadataFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/obs/BucketMetadataTest.java | 2 +-
.../huaweicloud/obs/CheckBucketFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/obs/CheckBucketTest.java | 2 +-
.../huaweicloud/obs/CreateBucketFunctionalTest.java | 2 +-
.../huaweicloud/obs/CreateBucketJsonFunctionalTest.java | 2 +-
.../component/huaweicloud/obs/CreateBucketJsonTest.java | 2 +-
.../huaweicloud/obs/CreateBucketPojoFunctionalTest.java | 2 +-
.../component/huaweicloud/obs/CreateBucketPojoTest.java | 2 +-
.../camel/component/huaweicloud/obs/CreateBucketTest.java | 2 +-
.../huaweicloud/obs/DeleteBucketFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/obs/DeleteBucketTest.java | 2 +-
.../huaweicloud/obs/DownloadDeleteFunctionalTest.java | 2 +-
.../component/huaweicloud/obs/DownloadFunctionalTest.java | 2 +-
.../huaweicloud/obs/DownloadMoveExistsFunctionalTest.java | 2 +-
.../huaweicloud/obs/DownloadMoveFunctionalTest.java | 2 +-
.../huaweicloud/obs/DownloadSingleFunctionalTest.java | 2 +-
.../component/huaweicloud/obs/GetObjectFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/obs/GetObjectTest.java | 2 +-
.../huaweicloud/obs/ListBucketsFunctionalTest.java | 2 +-
.../camel/component/huaweicloud/obs/ListBucketsTest.java | 2 +-
.../huaweicloud/obs/ListObjectsFunctionalTest.java | 2 +-
.../huaweicloud/obs/ListObjectsJsonFunctionalTest.java | 2 +-
.../component/huaweicloud/obs/ListObjectsJsonTest.java | 2 +-
.../camel/component/huaweicloud/obs/ListObjectsMaxTest.java | 2 +-
.../huaweicloud/obs/ListObjectsPojoFunctionalTest.java | 2 +-
.../component/huaweicloud/obs/ListObjectsPojoTest.java | 2 +-
.../camel/component/huaweicloud/obs/ListObjectsTest.java | 2 +-
.../huaweicloud/obs/PutObjectFileFunctionalTest.java | 2 +-
.../huaweicloud/obs/PutObjectStringFunctionalTest.java | 2 +-
.../component/huaweicloud/obs/PutObjectStringTest.java | 2 +-
.../camel/component/huaweicloud/obs/PutObjectTest.java | 2 +-
components/camel-huawei/camel-huaweicloud-smn/pom.xml | 2 +-
.../smn/PublishTemplatedMessageFunctionalTest.java | 2 +-
.../huaweicloud/smn/PublishTemplatedMessageTest.java | 2 +-
...ishTemplatedMessageWithCustomEndpointFunctionalTest.java | 2 +-
.../smn/PublishTemplatedMessageWithCustomEndpointTest.java | 2 +-
.../huaweicloud/smn/PublishTextMessageFunctionalTest.java | 2 +-
.../component/huaweicloud/smn/PublishTextMessageTest.java | 2 +-
.../PublishTextMessageWithCustomEndpointFunctionalTest.java | 2 +-
.../smn/PublishTextMessageWithCustomEndpointTest.java | 2 +-
.../camel/component/huaweicloud/smn/TestConfiguration.java | 2 +-
components/camel-ibm/camel-ibm-cos/pom.xml | 2 +-
.../apache/camel/component/ibm/cos/IBMCOSComponentTest.java | 2 +-
.../component/ibm/cos/integration/IBMCOSTestSupport.java | 2 +-
components/camel-ibm/camel-ibm-secrets-manager/pom.xml | 2 +-
.../operations/IBMSecretsManagerCreateKVSecretIT.java | 2 +-
.../operations/IBMSecretsManagerCreateSecretIT.java | 2 +-
.../operations/IBMSecretsManagerListSecretsIT.java | 2 +-
.../IBMSecretsManagerNoEnvPropertiesSourceTestIT.java | 2 +-
components/camel-ibm/camel-ibm-watson-discovery/pom.xml | 2 +-
.../ibm/watson/discovery/WatsonDiscoveryComponentTest.java | 2 +-
.../discovery/integration/WatsonDiscoveryTestSupport.java | 2 +-
components/camel-ibm/camel-ibm-watson-language/pom.xml | 2 +-
.../ibm/watson/language/WatsonLanguageComponentTest.java | 2 +-
.../language/integration/WatsonLanguageTestSupport.java | 2 +-
.../camel-ibm/camel-ibm-watson-speech-to-text/pom.xml | 2 +-
.../ibm/watson/stt/WatsonSpeechToTextComponentTest.java | 2 +-
.../stt/integration/WatsonSpeechToTextTestSupport.java | 2 +-
.../camel-ibm/camel-ibm-watson-text-to-speech/pom.xml | 2 +-
.../ibm/watson/tts/WatsonTextToSpeechComponentTest.java | 2 +-
.../tts/integration/WatsonTextToSpeechTestSupport.java | 2 +-
components/camel-ibm/camel-ibm-watsonx-ai/pom.xml | 2 +-
.../ibm/watsonx/ai/integration/WatsonxAiTestSupport.java | 2 +-
components/camel-ical/pom.xml | 2 +-
.../org/apache/camel/component/ical/ICalDataFormatTest.java | 2 +-
components/camel-iec60870/pom.xml | 2 +-
.../org/apache/camel/component/iec60870/ConnectionTest.java | 2 +-
components/camel-ignite/pom.xml | 2 +-
.../apache/camel/component/ignite/AbstractIgniteTest.java | 2 +-
components/camel-infinispan/camel-infinispan-common/pom.xml | 2 +-
.../camel/component/infinispan/InfinispanTestSupport.java | 2 +-
.../camel-infinispan/camel-infinispan-embedded/pom.xml | 4 ++--
.../embedded/InfinispanEmbeddedClusteredTestSupport.java | 2 +-
...ngInfinispanEmbeddedIdempotentRepositoryTestSupport.java | 2 +-
components/camel-infinispan/camel-infinispan/pom.xml | 4 ++--
...ringInfinispanRemoteIdempotentRepositoryTestSupport.java | 2 +-
components/camel-influxdb/pom.xml | 2 +-
.../camel/component/influxdb/AbstractInfluxDbTest.java | 2 +-
components/camel-influxdb2/pom.xml | 2 +-
.../camel/component/influxdb2/AbstractInfluxDbTest.java | 2 +-
components/camel-irc/pom.xml | 2 +-
.../apache/camel/component/irc/IrcConfigurationTest.java | 2 +-
.../camel/component/irc/it/IrcIntegrationITSupport.java | 4 ++--
components/camel-ironmq/pom.xml | 2 +-
.../apache/camel/component/ironmq/FromQueueToQueueTest.java | 2 +-
.../camel/component/ironmq/IronMQBatchConsumerTest.java | 2 +-
.../component/ironmq/IronMQBatchDeleteConsumerTest.java | 2 +-
.../camel/component/ironmq/IronMQBatchProducerTest.java | 4 ++--
.../component/ironmq/IronMQComponentConfigurationTest.java | 2 +-
.../camel/component/ironmq/IronMQComponentSpringTest.java | 2 +-
.../apache/camel/component/ironmq/IronMQComponentTest.java | 2 +-
.../camel/component/ironmq/IronMQPreserveHeadersTest.java | 2 +-
.../integrationtest/ConcurrentConsumerLoadManualTest.java | 2 +-
.../ironmq/integrationtest/FileCopyManualTest.java | 6 +++---
.../ironmq/integrationtest/IronMQComponentManualTest.java | 2 +-
.../component/ironmq/integrationtest/IronMQFIFOTest.java | 2 +-
.../integrationtest/IronMQRackspaceComponentManualTest.java | 2 +-
.../camel/component/ironmq/integrationtest/LoadTest.java | 2 +-
.../integrationtest/Queue2QueueExampleManualTest.java | 2 +-
components/camel-iso8583/pom.xml | 2 +-
.../dataformat/iso8583/Iso8583DataFormatGroovyTest.java | 2 +-
.../dataformat/iso8583/Iso8583DataFormatSimpleTest.java | 2 +-
.../camel/dataformat/iso8583/Iso8583DataFormatTest.java | 2 +-
components/camel-jackson-avro/pom.xml | 2 +-
.../jackson/avro/JacksonAvroLookupResolverTest.java | 2 +-
.../avro/JacksonAvroMarshalUnmarshalJsonNodeTest.java | 2 +-
.../avro/JacksonAvroMarshalUnmarshalPojoListTest.java | 2 +-
.../jackson/avro/JacksonAvroMarshalUnmarshalPojoTest.java | 2 +-
components/camel-jackson-protobuf/pom.xml | 2 +-
.../jackson/protobuf/JacksonProtobufLookupResolverTest.java | 2 +-
.../JacksonProtobufMarshalUnmarshalJsonNodeTest.java | 2 +-
.../protobuf/JacksonProtobufMarshalUnmarshalPojoTest.java | 2 +-
components/camel-jackson/pom.xml | 2 +-
.../camel/component/jackson/JacksonConcurrentTest.java | 4 ++--
.../apache/camel/component/jackson/JacksonFeaturesTest.java | 2 +-
.../camel/component/jackson/JacksonIncludeDefaultTest.java | 2 +-
.../camel/component/jackson/JacksonIncludeNotNulllTest.java | 2 +-
.../camel/component/jackson/JacksonJAXBAnnotationTest.java | 2 +-
.../component/jackson/JacksonMarshalAllowJMSTypeTest.java | 2 +-
.../jackson/JacksonMarshalContentTypeHeaderTest.java | 2 +-
.../component/jackson/JacksonMarshalDateTimezoneTest.java | 2 +-
.../jackson/JacksonMarshalMultibyteCharactersTest.java | 2 +-
.../component/jackson/JacksonMarshalNamingStrategyTest.java | 2 +-
.../apache/camel/component/jackson/JacksonMarshalTest.java | 2 +-
.../component/jackson/JacksonMarshalUnmarshalArrayTest.java | 2 +-
.../component/jackson/JacksonMarshalUnmarshalListTest.java | 2 +-
.../jackson/JacksonMarshalUnmarshalPojoArrayTest.java | 2 +-
.../JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java | 2 +-
.../jackson/JacksonMarshalUnmarshalTypeHeaderTest.java | 2 +-
.../camel/component/jackson/JacksonMarshalViewTest.java | 2 +-
.../apache/camel/component/jackson/JacksonModuleTest.java | 2 +-
.../jackson/JacksonNotUseDefaultObjectMapperTest.java | 2 +-
.../camel/component/jackson/JacksonObjectListSplitTest.java | 4 ++--
.../component/jackson/JacksonObjectMapperRegistryTest.java | 2 +-
.../component/jackson/SpringJacksonAllowNullBodyTest.java | 2 +-
.../component/jackson/SpringJacksonEnableFeatureTest.java | 2 +-
.../SpringJacksonJsonDataFormatNamingStrategyTest.java | 2 +-
.../component/jackson/SpringJacksonJsonDataFormatTest.java | 2 +-
.../jackson/SpringJacksonMarshalUnmarshalListTest.java | 2 +-
.../jackson/SpringJacksonObjectMapperRegistryTest.java | 2 +-
.../jackson/converter/JacksonConversionsBufferTest.java | 2 +-
.../jackson/converter/JacksonConversionsPojoTest.java | 2 +-
.../jackson/converter/JacksonConversionsSimpleTest.java | 2 +-
.../component/jackson/converter/JacksonConversionsTest.java | 2 +-
.../jackson/converter/JacksonJSonNodeConverterTest.java | 2 +-
components/camel-jacksonxml/pom.xml | 2 +-
.../camel/component/jacksonxml/JacksonConcurrentTest.java | 4 ++--
.../component/jacksonxml/JacksonConversionsSimpleTest.java | 2 +-
.../camel/component/jacksonxml/JacksonConversionsTest.java | 2 +-
.../jacksonxml/JacksonEmptyElementsAsNullTest.java | 2 +-
.../component/jacksonxml/JacksonIncludeDefaultTest.java | 2 +-
.../component/jacksonxml/JacksonIncludeNotNulllTest.java | 2 +-
.../component/jacksonxml/JacksonJAXBAnnotationTest.java | 2 +-
.../jacksonxml/JacksonMarshalAllowJMSTypeTest.java | 2 +-
.../jacksonxml/JacksonMarshalContentTypeHeaderTest.java | 2 +-
.../jacksonxml/JacksonMarshalDateTimezoneTest.java | 2 +-
.../camel/component/jacksonxml/JacksonMarshalTest.java | 2 +-
.../jacksonxml/JacksonMarshalUnmarshalListTest.java | 2 +-
.../JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java | 2 +-
.../jacksonxml/JacksonMarshalUnmarshalTypeHeaderTest.java | 2 +-
.../camel/component/jacksonxml/JacksonMarshalViewTest.java | 2 +-
.../camel/component/jacksonxml/JacksonModuleTest.java | 2 +-
.../component/jacksonxml/JacksonObjectListSplitTest.java | 4 ++--
.../jacksonxml/SpringJacksonEnableFeatureTest.java | 2 +-
.../jacksonxml/SpringJacksonMarshalUnmarshalListTest.java | 2 +-
.../jacksonxml/SpringJacksonXmlDataFormatTest.java | 2 +-
components/camel-jandex/pom.xml | 2 +-
components/camel-jasypt/pom.xml | 2 +-
.../apache/camel/component/jasypt/JasyptPropertiesTest.java | 2 +-
.../jasypt/SpringJasyptBridgePropertiesAutowireTest.java | 2 +-
.../component/jasypt/SpringJasyptBridgePropertiesTest.java | 2 +-
.../camel/component/jasypt/SpringJasyptProperties2Test.java | 2 +-
.../camel/component/jasypt/SpringJasyptPropertiesTest.java | 2 +-
components/camel-javascript/pom.xml | 2 +-
.../org/apache/camel/language/js/JavaScriptChoiceTest.java | 2 +-
.../java/org/apache/camel/language/js/JavaScriptTest.java | 2 +-
components/camel-jaxb/pom.xml | 4 ++--
.../jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java | 2 +-
.../jaxb/JAXBElementFallbackTypeConverterTest.java | 2 +-
.../jaxb/JaxbDataFormatMultipleNamespacesTest.java | 2 +-
.../converter/jaxb/JaxbDataFormatPartClassHeaderTest.java | 2 +-
.../camel/converter/jaxb/JaxbDataFormatPartClassTest.java | 2 +-
.../jaxb/JaxbDataFormatSchemaValidationSpringTest.java | 4 ++--
.../converter/jaxb/JaxbDataFormatSchemaValidationTest.java | 4 ++--
...JaxbDataFormatSchemaValidationWithObjectFactoryTest.java | 4 ++--
.../org/apache/camel/example/DataFormatConcurrentTest.java | 2 +-
.../org/apache/camel/example/DataFormatDataSetTest.java | 2 +-
.../test/java/org/apache/camel/example/DataFormatTest.java | 2 +-
.../example/ExplicitEncodingAndXMLCharFilteringTest.java | 4 ++--
.../org/apache/camel/example/ExplicitFileEncodingTest.java | 4 ++--
.../test/java/org/apache/camel/example/JAXBConvertTest.java | 2 +-
.../apache/camel/example/JaxbConcurrentDataFormatTest.java | 4 ++--
.../java/org/apache/camel/example/JaxbErrorLogTest.java | 2 +-
.../org/apache/camel/example/RouteWithErrorHandlerTest.java | 2 +-
.../apache/camel/example/SpringDataFormatPartialTest.java | 2 +-
.../java/org/apache/camel/example/SpringDataFormatTest.java | 2 +-
.../camel/example/SpringDataFormatWithEncodingTest.java | 2 +-
.../apache/camel/example/SpringLoadRouteFromXmlTest.java | 2 +-
.../test/java/org/apache/camel/example/UnmarshalTest.java | 2 +-
.../apache/camel/jaxb/CamelJaxbFallbackConverterTest.java | 2 +-
.../apache/camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java | 2 +-
.../src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java | 2 +-
.../apache/camel/jaxb/DirectBeanToBeanPersonTypeTest.java | 2 +-
.../FallbackTypeConverterObjectFactoryDisabledTest.java | 2 +-
.../jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java | 2 +-
.../jaxb/FallbackTypeConverterShouldThrowExceptionTest.java | 2 +-
.../org/apache/camel/jaxb/FallbackTypeConverterTest.java | 2 +-
.../java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java | 2 +-
.../camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java | 4 ++--
.../camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java | 2 +-
.../camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java | 2 +-
.../camel/jaxb/TimerBeanToBeanNotificationTypeTest.java | 2 +-
components/camel-jcache/pom.xml | 4 ++--
.../camel/component/jcache/JCacheComponentTestSupport.java | 2 +-
.../camel/component/jcache/policy/JCachePolicyTestBase.java | 2 +-
.../component/jcache/policy/SpringJCachePolicyTest.java | 2 +-
.../aggregate/JCacheAggregationRepositoryTestSupport.java | 2 +-
.../idempotent/JCacheIdempotentRepositoryTest.java | 2 +-
components/camel-jcr/pom.xml | 2 +-
.../org/apache/camel/component/jcr/JcrAuthTestBase.java | 4 ++--
.../jcr/JcrRouteDifferentWorkspaceTestSupport.java | 4 ++--
.../org/apache/camel/component/jcr/JcrRouteTestSupport.java | 4 ++--
components/camel-jdbc/pom.xml | 2 +-
.../camel/component/jdbc/AbstractJdbcTestSupport.java | 2 +-
.../camel/component/jdbc/JdbcParameterizedQueryTest.java | 2 +-
.../JdbcProducerOutputTypeSelectListOutputClassTest.java | 2 +-
.../jdbc/JdbcProducerOutputTypeSelectListTest.java | 2 +-
.../JdbcProducerOutputTypeSelectOneOutputClassTest.java | 2 +-
.../component/jdbc/JdbcProducerOutputTypeSelectOneTest.java | 2 +-
.../JdbcProducerOutputTypeStreamListOutputClassTest.java | 2 +-
.../jdbc/JdbcProducerOutputTypeStreamListTest.java | 2 +-
.../camel/component/jdbc/JdbcSpringAnotherRouteTest.java | 2 +-
components/camel-jetty-common/pom.xml | 2 +-
components/camel-jetty/pom.xml | 2 +-
.../org/apache/camel/component/jetty/BaseJettyTest.java | 2 +-
.../component/jetty/ConvertPayloadToInputStreamTest.java | 2 +-
.../org/apache/camel/component/jetty/HttpBasicAuthTest.java | 2 +-
.../apache/camel/component/jetty/HttpClientRouteTest.java | 2 +-
.../apache/camel/component/jetty/HttpEndpointURLTest.java | 2 +-
.../jetty/HttpOperationsFailedExceptionUriTest.java | 2 +-
.../camel/component/jetty/HttpPollingConsumerTest.java | 2 +-
.../camel/component/jetty/HttpProducerConcurrentTest.java | 2 +-
.../component/jetty/HttpProducerOkStatusCodeRangeTest.java | 2 +-
.../camel/component/jetty/HttpProducerSOTimeoutTest.java | 2 +-
.../camel/component/jetty/HttpRedirectNoLocationTest.java | 2 +-
.../org/apache/camel/component/jetty/HttpRedirectTest.java | 2 +-
.../component/jetty/HttpStreamCacheFileStopIssueTest.java | 4 ++--
.../camel/component/jetty/HttpStreamCacheFileTest.java | 2 +-
.../org/apache/camel/component/jetty/HttpToFileTest.java | 4 ++--
.../org/apache/camel/component/jetty/HttpsRouteTest.java | 2 +-
.../component/jetty/JettyBridgeHostHeaderIssueTest.java | 2 +-
.../component/jetty/JettyComponentSpringConfiguredTest.java | 2 +-
.../camel/component/jetty/JettyFailoverRoundRobinTest.java | 2 +-
.../component/jetty/JettyHttpHeadersCompatibilityTest.java | 2 +-
.../component/jetty/JettyResponseBodyWhenErrorTest.java | 2 +-
.../jetty/JettyRouteWithUnknownSocketPropertiesTest.java | 2 +-
.../jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java | 2 +-
.../camel/component/jetty/JettySuspendResumeTest.java | 2 +-
.../org/apache/camel/component/jetty/JettySuspendTest.java | 2 +-
.../component/jetty/JettySuspendWhileInProgressTest.java | 2 +-
.../camel/component/jetty/JettyValidatorStreamTest.java | 2 +-
.../JettyValidatorStreamWithStreamCachingEnabledTest.java | 2 +-
.../apache/camel/component/jetty/JettyValidatorTest.java | 2 +-
.../camel/component/jetty/JettyXsltHttpTemplateTest.java | 2 +-
.../org/apache/camel/component/jetty/JettyXsltTest.java | 2 +-
.../apache/camel/component/jetty/MainHttpsRouteTest.java | 2 +-
.../camel/component/jetty/MultiThreadedHttpGetTest.java | 2 +-
.../camel/component/jetty/SpringFailoverRoundRobinTest.java | 2 +-
.../apache/camel/component/jetty/SpringHttpsRouteTest.java | 2 +-
.../jetty/SpringJettyNoConnectionRedeliveryTest.java | 2 +-
.../camel/component/jetty/SpringJettyNoConnectionTest.java | 4 ++--
.../jetty/async/JettyAsyncContinuationTimeoutTest.java | 2 +-
.../camel/component/jetty/file/JettyFileConsumerTest.java | 2 +-
.../camel/component/jetty/file/JettyHttpFileCacheTest.java | 6 +++---
.../camel/component/jetty/javabody/HttpJavaBodyTest.java | 2 +-
.../camel/component/jetty/proxy/HttpClientProxyTest.java | 2 +-
.../jetty/proxy/HttpClientProxyTransferExceptionTest.java | 2 +-
.../component/jetty/rest/RestHttpsClientAuthRouteTest.java | 2 +-
.../camel/component/jetty/rest/RestJettyAcceptTest.java | 2 +-
.../camel/component/jetty/rest/RestJettyBasicAuthTest.java | 4 ++--
.../RestJettyClientResponseValidationResponseCodeTest.java | 2 +-
.../component/jetty/rest/RestJettyContentTypeTest.java | 2 +-
...tJettyInvalidContentTypeClientRequestValidationTest.java | 2 +-
.../RestJettyInvalidJSonClientRequestValidationTest.java | 2 +-
.../RestJettyInvalidJSonClientResponseValidationTest.java | 2 +-
.../component/jetty/rest/RestJettyMethodNotAllowedTest.java | 2 +-
.../camel/component/jetty/rest/RestJettyRedirectTest.java | 2 +-
.../component/jetty/rest/RestJettyRequiredBodyTest.java | 2 +-
.../jetty/rest/RestJettyRequiredHttpHeaderTest.java | 2 +-
.../jetty/rest/RestJettyRequiredQueryParameterTest.java | 2 +-
.../rest/producer/JettyRestProducerInvalidApiDocTest.java | 4 ++--
components/camel-jfr/pom.xml | 2 +-
components/camel-jgroups-raft/pom.xml | 2 +-
.../component/jgroups/raft/JGroupsRaftAbstractTest.java | 2 +-
.../jgroups/raft/JGroupsRaftComponentConfiguredTest.java | 2 +-
.../jgroups/raft/JGroupsRaftComponentDefaultTest.java | 2 +-
.../component/jgroups/raft/JGroupsRaftEndpointTest.java | 2 +-
components/camel-jgroups/pom.xml | 2 +-
.../camel/component/jgroups/JGroupsComponentTest.java | 2 +-
.../jgroups/JGroupsComponentWithChannelPropertiesTest.java | 2 +-
.../apache/camel/component/jgroups/JGroupsConsumerTest.java | 2 +-
.../apache/camel/component/jgroups/JGroupsEndpointTest.java | 2 +-
.../apache/camel/component/jgroups/JGroupsProducerTest.java | 2 +-
.../camel/component/jgroups/JGroupsSharedChannelTest.java | 2 +-
components/camel-jira/pom.xml | 2 +-
.../component/jira/JiraComponentConfigurationTest.java | 2 +-
.../component/jira/consumer/NewCommentsConsumerTest.java | 2 +-
.../component/jira/consumer/NewIssuesConsumerTest.java | 2 +-
.../component/jira/consumer/WatchUpdatesConsumerTest.java | 2 +-
.../component/jira/producer/AddCommentProducerTest.java | 2 +-
.../component/jira/producer/AddIssueLinkProducerTest.java | 6 +++---
.../camel/component/jira/producer/AddIssueProducerTest.java | 2 +-
.../component/jira/producer/AddWorkLogProducerTest.java | 6 +++---
.../jira/producer/AttachFileProducerFromFileRouteTest.java | 2 +-
.../jira/producer/AttachFileProducerInputStreamTest.java | 2 +-
.../component/jira/producer/AttachFileProducerTest.java | 2 +-
.../component/jira/producer/DeleteIssueProducerTest.java | 2 +-
.../component/jira/producer/FetchCommentsProducerTest.java | 6 +++---
.../component/jira/producer/FetchIssueProducerTest.java | 6 +++---
.../jira/producer/TransitionIssueProducerTest.java | 2 +-
.../component/jira/producer/UpdateIssueProducerTest.java | 2 +-
.../camel/component/jira/producer/WatcherProducerTest.java | 2 +-
components/camel-jms/pom.xml | 2 +-
.../camel/component/jms/AbstractPersistentJMSTest.java | 2 +-
.../camel/component/jms/ConsumeJmsBytesMessageTest.java | 2 +-
.../camel/component/jms/ConsumeJmsMapMessageTest.java | 2 +-
.../camel/component/jms/ConsumeJmsObjectMessageTest.java | 2 +-
.../camel/component/jms/FromTextToBytesMessageTest.java | 2 +-
.../apache/camel/component/jms/JmsAllowNullBodyTest.java | 2 +-
.../camel/component/jms/JmsAsyncStartStopListenerTest.java | 2 +-
.../apache/camel/component/jms/JmsComponentIbmMQTest.java | 2 +-
.../org/apache/camel/component/jms/JmsComponentTest.java | 2 +-
.../camel/component/jms/JmsDefaultTaskExecutorTypeTest.java | 2 +-
.../camel/component/jms/JmsEndpointConfigurationTest.java | 2 +-
.../component/jms/JmsFormatDateHeadersToIso8601Test.java | 2 +-
.../component/jms/JmsInOutFixedReplyQueueTimeoutTest.java | 2 +-
.../component/jms/JmsInOutIndividualRequestTimeoutTest.java | 2 +-
.../camel/component/jms/JmsProducerConcurrentTest.java | 2 +-
.../component/jms/JmsProducerConcurrentWithReplyTest.java | 2 +-
.../component/jms/JmsRequestReplyExclusiveReplyToTest.java | 2 +-
.../jms/JmsRequestReplyTempQueueMultipleConsumersTest.java | 4 ++--
.../jms/JmsRequestReplyTemporaryCacheNoneTest.java | 2 +-
.../camel/component/jms/JmsRouteUsingJMSXGroupTest.java | 2 +-
.../jms/JmsRouteWithCustomListenerContainerTest.java | 2 +-
.../jms/JmsStreamMessageTypeNoStreamCachingTest.java | 4 ++--
.../camel/component/jms/JmsStreamMessageTypeTest.java | 4 ++--
.../camel/component/jms/JmsTestConnectionOnStartupTest.java | 4 ++--
.../camel/component/jms/RestartBrokerBeforeCommitIT.java | 2 +-
.../apache/camel/component/jms/async/AsyncJmsInOutTest.java | 2 +-
.../jms/integration/FileRouteJmsKeepLastModifiedIT.java | 2 +-
.../component/jms/integration/FileRouteJmsPreMoveIT.java | 2 +-
.../camel/component/jms/integration/FileRouteToJmsIT.java | 2 +-
.../component/jms/integration/FileRouteToJmsToFileIT.java | 2 +-
.../component/jms/integration/JmsLoadBalanceFailOverIT.java | 2 +-
.../camel/component/jms/integration/JmsRouteToFileIT.java | 2 +-
.../camel/component/jms/integration/JmsXMLRouteIT.java | 2 +-
.../integration/activemq/ActiveMQOriginalDestinationIT.java | 2 +-
.../integration/activemq/TwoEmbeddedActiveMQBrokersIT.java | 2 +-
.../jms/integration/consumers/TwoConsumerOnSameQueueIT.java | 2 +-
.../component/jms/integration/issues/AdviceWithIssueIT.java | 2 +-
.../component/jms/integration/issues/BeanExceptionIT.java | 2 +-
.../DynamicRoutersWithJMSMessageLostHeadersIssueIT.java | 2 +-
.../jms/integration/issues/JmsTypeConverterIssueIT.java | 2 +-
.../jms/integration/mqseries/MQSeriesHeaderIT.java | 2 +-
.../jms/integration/spring/AbstractSpringJMSITSupport.java | 2 +-
.../jms/integration/spring/JmsConsumerShutdownIT.java | 2 +-
.../jms/integration/spring/tx/AbstractTransactionIT.java | 2 +-
.../spring/tx/JMSTransactionThrottlingRoutePolicyIT.java | 2 +-
.../spring/tx/JmsTXForceShutdownIssueManualIT.java | 2 +-
.../jms/integration/spring/tx/JmsToJmsTransactedIT.java | 2 +-
.../spring/tx/JmsToJmsTransactedMarkRollbackIT.java | 2 +-
.../spring/tx/security/JmsToJmsTransactedSecurityIT.java | 2 +-
...sactedDeadLetterChannelHandlerRollbackOnExceptionIT.java | 2 +-
.../tx/JmsTransactedOnExceptionRollbackOnExceptionIT.java | 2 +-
.../jms/issues/JmsConcurrentConsumerInOnlyTest.java | 2 +-
...JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java | 2 +-
.../camel/component/jms/issues/JmsMutateMessageTest.java | 2 +-
.../jms/issues/JmsMutateRemoveHeaderMessageTest.java | 2 +-
.../jms/issues/JmsReplyToComponentEndlessLoopTest.java | 2 +-
.../camel/component/jms/issues/JmsReplyToIbmMQTest.java | 2 +-
...JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java | 2 +-
.../camel/component/jms/tx/TransactedOnCompletionTest.java | 2 +-
components/camel-jmx/pom.xml | 2 +-
...melJmxConsumerObserveAttributeMatchStringDifferTest.java | 2 +-
.../CamelJmxConsumerObserveAttributeMatchStringTest.java | 2 +-
.../component/jmx/CamelJmxConsumerObserveAttributeTest.java | 2 +-
.../apache/camel/component/jmx/CamelJmxConsumerTest.java | 2 +-
components/camel-jolt/pom.xml | 2 +-
.../org/apache/camel/component/jolt/JoltDefaultrTest.java | 2 +-
.../apache/camel/component/jolt/JoltFirstSampleTest.java | 2 +-
.../java/org/apache/camel/component/jolt/JoltRefTest.java | 2 +-
.../org/apache/camel/component/jolt/JoltRemovrTest.java | 2 +-
components/camel-jooq/pom.xml | 4 ++--
.../java/org/apache/camel/component/jooq/BaseJooqTest.java | 4 ++--
components/camel-joor/pom.xml | 2 +-
.../java/org/apache/camel/language/java/JavaBeanTest.java | 2 +-
.../org/apache/camel/language/java/JavaLanguageTest.java | 2 +-
.../org/apache/camel/language/java/JavaTransformTest.java | 2 +-
.../camel/language/joor/JoorBeanInjectTransformTest.java | 2 +-
.../apache/camel/language/joor/JoorBeanInjectVarTest.java | 2 +-
.../java/org/apache/camel/language/joor/JoorBeanTest.java | 2 +-
.../apache/camel/language/joor/JoorCompileErrorTest.java | 2 +-
.../org/apache/camel/language/joor/JoorCustomAliasTest.java | 2 +-
.../apache/camel/language/joor/JoorCustomImportsTest.java | 2 +-
.../org/apache/camel/language/joor/JoorLanguageTest.java | 2 +-
.../camel/language/joor/JoorOptionalPredicateTest.java | 2 +-
.../apache/camel/language/joor/JoorPreCompileFalseTest.java | 2 +-
.../org/apache/camel/language/joor/JoorPredicateTest.java | 2 +-
.../camel/language/joor/JoorScriptingLanguageTest.java | 2 +-
.../apache/camel/language/joor/JoorStreamPredicateTest.java | 2 +-
.../camel/language/joor/JoorTransformResourceTest.java | 2 +-
.../org/apache/camel/language/joor/JoorTransformTest.java | 2 +-
components/camel-jpa/pom.xml | 4 ++--
components/camel-jpa/src/main/docs/jpa-component.adoc | 4 ++--
.../camel/component/jpa/AbstractJpaMethodSupport.java | 2 +-
.../org/apache/camel/component/jpa/JpaComponentTest.java | 2 +-
.../org/apache/camel/component/jpa/JpaEndpointTest.java | 2 +-
.../org/apache/camel/component/jpa/JpaUsePersistTest.java | 2 +-
.../org/apache/camel/component/jpa/QueryBuilderTest.java | 2 +-
.../org/apache/camel/processor/jpa/AbstractJpaTest.java | 4 ++--
.../camel/processor/jpa/FileConsumerJpaIdempotentTest.java | 2 +-
.../org/apache/camel/processor/jpa/JpaFlushOnSendTest.java | 2 +-
.../camel/processor/jpa/JpaProducerConcurrentTest.java | 2 +-
.../apache/camel/processor/jpa/JpaProducerNoBodyTest.java | 2 +-
.../camel/processor/jpa/MultipleJpaRouteEndpointTest.java | 2 +-
components/camel-jq/pom.xml | 2 +-
.../test/java/org/apache/camel/language/jq/JqBeanTest.java | 2 +-
.../java/org/apache/camel/language/jq/JqTestSupport.java | 2 +-
components/camel-jsch/pom.xml | 2 +-
.../apache/camel/component/scp/ScpServerTestSupport.java | 6 +++---
components/camel-jslt/pom.xml | 2 +-
.../java/org/apache/camel/component/jslt/JsltBasicTest.java | 2 +-
.../jslt/JsltBigDecimalCustomObjectMapperTest.java | 2 +-
.../org/apache/camel/component/jslt/JsltBigDecimalTest.java | 2 +-
.../org/apache/camel/component/jslt/JsltFileSourceTest.java | 2 +-
.../org/apache/camel/component/jslt/JsltFunctionsTest.java | 2 +-
.../apache/camel/component/jslt/JsltObjectFilterTest.java | 2 +-
.../java/org/apache/camel/component/jslt/JsltQueryTest.java | 2 +-
.../java/org/apache/camel/component/jslt/JsltRefTest.java | 2 +-
.../camel/component/jslt/JsltSafeSerializationTest.java | 2 +-
.../camel/component/jslt/JsltTemplateFromHeaderTest.java | 2 +-
.../org/apache/camel/component/jslt/JsltVariablesTest.java | 2 +-
components/camel-json-patch/pom.xml | 2 +-
.../camel/component/jsonpatch/JsonPatchComponentTest.java | 2 +-
.../apache/camel/component/jsonpatch/JsonPatchRefTest.java | 2 +-
components/camel-json-validator/pom.xml | 2 +-
.../component/jsonvalidator/FileValidatorRouteTest.java | 4 ++--
.../camel/component/jsonvalidator/LocalRefSchemaTest.java | 2 +-
.../jsonvalidator/ValidatorDeserializationFeaturesTest.java | 2 +-
.../component/jsonvalidator/ValidatorInputStreamTest.java | 2 +-
.../camel/component/jsonvalidator/ValidatorRouteTest.java | 2 +-
components/camel-jsonapi/pom.xml | 4 ++--
.../camel/component/jsonapi/JsonApiDataFormatTest.java | 2 +-
components/camel-jsonata/pom.xml | 2 +-
.../camel/component/jsonata/JsonataArrayInputTest.java | 2 +-
.../camel/component/jsonata/JsonataFirstSampleTest.java | 2 +-
.../camel/component/jsonata/JsonataFrameBindingTest.java | 2 +-
.../camel/component/jsonata/JsonataJacksonOutputTest.java | 2 +-
.../org/apache/camel/component/jsonata/JsonataRefTest.java | 2 +-
.../component/jsonata/JsonataTemplateFromHeaderTest.java | 2 +-
components/camel-jsonb/pom.xml | 2 +-
.../camel/component/jsonb/JsonbAttributeOrderTest.java | 2 +-
.../org/apache/camel/component/jsonb/JsonbMarshalTest.java | 2 +-
.../org/apache/camel/component/jsonb/JsonbSkipNullTest.java | 2 +-
.../component/jsonb/SpringJsonbJsonDataFormatTest.java | 2 +-
components/camel-jsonpath/pom.xml | 2 +-
.../camel/jsonpath/JsonPathBeanStreamCachingTest.java | 2 +-
.../camel/jsonpath/JsonPathBeanSuppressExceptionsTest.java | 2 +-
.../java/org/apache/camel/jsonpath/JsonPathBeanTest.java | 2 +-
.../java/org/apache/camel/jsonpath/JsonPathCBRTest.java | 2 +-
.../java/org/apache/camel/jsonpath/JsonPathCharsetTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathChoicePrimitiveTest.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathChoiceReaderTest.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathCustomMapperTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathExchangePropertyTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathExpressionPojoTest.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathHeaderNameTest.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathLanguageTest.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathLeafNullTest.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathMapTransformTest.java | 4 ++--
.../org/apache/camel/jsonpath/JsonPathMockMatchesTest.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathNullHeaderTest.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathPlatformHttpTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathPojoTransformTest.java | 2 +-
.../camel/jsonpath/JsonPathPredicateJsonSmartTest.java | 2 +-
.../camel/jsonpath/JsonPathSimpleInitBlockFunctionTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathSimpleInitBlockTest.java | 2 +-
.../camel/jsonpath/JsonPathSimpleSetVariableTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathSimpleTransformTest.java | 2 +-
.../camel/jsonpath/JsonPathSimpleTransformTwoTest.java | 2 +-
.../java/org/apache/camel/jsonpath/JsonPathSourceTest.java | 2 +-
.../camel/jsonpath/JsonPathSplitMultipleListTest.java | 2 +-
.../camel/jsonpath/JsonPathSplitSingleListOptionTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathSplitSingleListTest.java | 2 +-
.../java/org/apache/camel/jsonpath/JsonPathSplitTest.java | 2 +-
.../camel/jsonpath/JsonPathSplitWriteAsStringMapTest.java | 2 +-
.../JsonPathSplitWriteAsStringResultTypeStringTest.java | 2 +-
.../camel/jsonpath/JsonPathSplitWriteAsStringTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathStreamCachingCBRTest.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathSuppressTest.java | 2 +-
.../camel/jsonpath/JsonPathTransformHeaderNameTest.java | 2 +-
.../camel/jsonpath/JsonPathTransformONielEscapedTest.java | 2 +-
.../jsonpath/JsonPathTransformONielPlaceholderTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathTransformONielTest.java | 2 +-
.../camel/jsonpath/JsonPathTransformResultTypeTest.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathTransformTest.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathVariableTest.java | 2 +-
.../apache/camel/jsonpath/JsonPathWithSimpleCBRTest.java | 2 +-
.../org/apache/camel/jsonpath/SpringJsonPathCBRTest.java | 2 +-
.../jsonpath/SpringJsonPathCustomReadMapperBeanTest.java | 2 +-
.../jsonpath/SpringJsonPathSplitWriteAsStringTest.java | 2 +-
.../apache/camel/jsonpath/SpringJsonPathSuppressTest.java | 2 +-
.../jsonpath/SpringJsonPathTransformHeaderNameTest.java | 2 +-
.../jsonpath/SpringJsonPathTransformResultTypeTest.java | 2 +-
.../apache/camel/jsonpath/SpringJsonPathTransformTest.java | 2 +-
.../easypredicate/EasyJsonPathWithRootSimpleCBRTest.java | 2 +-
.../easypredicate/EasyJsonPathWithSimpleCBRTest.java | 2 +-
components/camel-jt400/pom.xml | 2 +-
.../component/jt400/Jt400DataQueueConsumerManualTest.java | 2 +-
.../component/jt400/Jt400MultipleConsumersRouteTest.java | 2 +-
.../org/apache/camel/component/jt400/Jt400PgmRouteTest.java | 2 +-
.../org/apache/camel/component/jt400/Jt400RouteTest.java | 2 +-
.../camel/component/jt400/Jt400SecureTestSupport.java | 2 +-
.../org/apache/camel/component/jt400/Jt400TestSupport.java | 2 +-
components/camel-jte/pom.xml | 2 +-
.../org/apache/camel/component/jte/JteDataModelTest.java | 2 +-
.../java/org/apache/camel/component/jte/JteRefTest.java | 2 +-
.../camel/component/jte/JteTemplateFromHeaderTest.java | 2 +-
.../test/java/org/apache/camel/component/jte/JteTest.java | 2 +-
components/camel-kafka/pom.xml | 6 +++---
...kaProducerMultipleMessagesInTransactionWithLoopTest.java | 2 +-
...aProducerMultipleMessagesInTransactionWithSplitTest.java | 2 +-
components/camel-kamelet/pom.xml | 2 +-
.../camel/component/kamelet/KameletAggregateTest.java | 2 +-
.../apache/camel/component/kamelet/KameletBasicTest.java | 2 +-
.../kamelet/KameletBeanWithParametrizedConstructorTest.java | 2 +-
.../component/kamelet/KameletConcurrencyIssueTest.java | 2 +-
.../camel/component/kamelet/KameletConsumeOnlyTest.java | 2 +-
.../component/kamelet/KameletConsumerUoWIssueTest.java | 2 +-
.../camel/component/kamelet/KameletDiscoveryTest.java | 2 +-
.../component/kamelet/KameletEipAggregateGroovyTest.java | 2 +-
.../component/kamelet/KameletEipAggregateJoorTest.java | 2 +-
.../camel/component/kamelet/KameletEipAggregateTest.java | 2 +-
.../camel/component/kamelet/KameletEipFilterTest.java | 2 +-
.../camel/component/kamelet/KameletEipMulticastTest.java | 2 +-
.../camel/component/kamelet/KameletEipNoChildrenTest.java | 2 +-
.../org/apache/camel/component/kamelet/KameletEipTest.java | 2 +-
.../apache/camel/component/kamelet/KameletEnrichTest.java | 2 +-
.../org/apache/camel/component/kamelet/KameletEnvTest.java | 2 +-
.../component/kamelet/KameletGlobalPropertiesTest.java | 2 +-
.../apache/camel/component/kamelet/KameletHttpSinkTest.java | 2 +-
.../component/kamelet/KameletLocalBeanClassFourTest.java | 2 +-
.../camel/component/kamelet/KameletLocalBeanClassTest.java | 2 +-
.../component/kamelet/KameletLocalBeanClassThreeTest.java | 2 +-
.../component/kamelet/KameletLocalBeanClassTwoTest.java | 2 +-
.../component/kamelet/KameletLocalBeanConfigureTest.java | 2 +-
.../kamelet/KameletLocalBeanGroovyExternalTest.java | 2 +-
.../camel/component/kamelet/KameletLocalBeanGroovyTest.java | 2 +-
.../component/kamelet/KameletLocalBeanInitDestroyTest.java | 2 +-
.../camel/component/kamelet/KameletLocalBeanIoCTest.java | 2 +-
.../component/kamelet/KameletLocalBeanJoorExternalTest.java | 2 +-
.../component/kamelet/KameletLocalBeanLanguageTest.java | 2 +-
.../component/kamelet/KameletLocalBeanSupplierTest.java | 2 +-
.../camel/component/kamelet/KameletLocalBeanTest.java | 2 +-
.../camel/component/kamelet/KameletLocalBeanTypeTest.java | 2 +-
.../apache/camel/component/kamelet/KameletLocationTest.java | 2 +-
.../KameletNoErrorHandlerGlobalRouteConfigurationTest.java | 2 +-
.../camel/component/kamelet/KameletNoErrorHandlerTest.java | 2 +-
.../camel/component/kamelet/KameletPollEnrichTest.java | 2 +-
.../kamelet/KameletPropagateVariableAsResultTestTest.java | 2 +-
.../camel/component/kamelet/KameletRecipientListTest.java | 2 +-
.../camel/component/kamelet/KameletRouteDumpTest.java | 2 +-
.../camel/component/kamelet/KameletRouteSingleTest.java | 2 +-
.../apache/camel/component/kamelet/KameletRouteTest.java | 2 +-
.../camel/component/kamelet/KameletShutdownToDTest.java | 2 +-
.../component/kamelet/KameletSinkDeadLetterChannelTest.java | 2 +-
.../kamelet/KameletSourceBridgeErrorHandlerTest.java | 2 +-
.../kamelet/KameletSourceDeadLetterChannelTest.java | 2 +-
.../org/apache/camel/component/kamelet/KameletToDTest.java | 2 +-
.../apache/camel/component/kamelet/KameletTryCatchTest.java | 2 +-
.../apache/camel/component/kamelet/KameletUoWIssueTest.java | 2 +-
.../camel/component/kamelet/KameletVariableReceiveTest.java | 2 +-
.../apache/camel/component/kamelet/KameletWireTapTest.java | 2 +-
.../component/kamelet/ManagedKameletRouteDisabledTest.java | 2 +-
.../component/kamelet/ManagedKameletRouteEnabledTest.java | 2 +-
.../camel/component/kamelet/TemplatedRouteKameletTest.java | 2 +-
components/camel-keycloak/pom.xml | 2 +-
.../camel/component/keycloak/KeycloakComponentTest.java | 2 +-
.../apache/camel/component/keycloak/KeycloakConsumerIT.java | 2 +-
.../camel/component/keycloak/KeycloakConsumerTest.java | 2 +-
.../apache/camel/component/keycloak/KeycloakProducerIT.java | 4 ++--
.../camel/component/keycloak/KeycloakProducerTest.java | 2 +-
.../camel/component/keycloak/KeycloakTestInfraIT.java | 4 ++--
.../component/keycloak/security/KeycloakSecurityIT.java | 2 +-
.../keycloak/security/KeycloakSecurityPolicyTest.java | 2 +-
.../keycloak/security/KeycloakSecurityTestInfraIT.java | 2 +-
.../keycloak/security/KeycloakTokenBindingSecurityIT.java | 2 +-
.../keycloak/security/KeycloakTokenIntrospectionIT.java | 2 +-
components/camel-knative/camel-knative-api/pom.xml | 2 +-
components/camel-knative/camel-knative-component/pom.xml | 2 +-
components/camel-knative/camel-knative-http/pom.xml | 2 +-
components/camel-kubernetes/pom.xml | 2 +-
.../camel/component/kubernetes/KubernetesTestSupport.java | 2 +-
.../kubernetes/cloud/ServiceCallClientRouteManualTest.java | 2 +-
.../cloud/ServiceCallEnvironmentRouteManualTest.java | 2 +-
.../cloud/SpringServiceCallClientRouteManualTest.java | 2 +-
.../cloud/SpringServiceCallDnsRouteManualTest.java | 2 +-
.../cloud/SpringServiceCallEnvironmentRouteManualTest.java | 2 +-
.../kubernetes/cluster/KubernetesClusterServiceTest.java | 2 +-
.../kubernetes/producer/KubernetesEndpointTest.java | 2 +-
.../component/kubernetes/properties/SecretReloadTest.java | 2 +-
components/camel-kudu/pom.xml | 2 +-
.../org/apache/camel/component/kudu/AbstractKuduTest.java | 2 +-
.../component/kudu/KuduComponentConfigurationTest.java | 2 +-
components/camel-ldap/pom.xml | 2 +-
.../directory/server/core/integ5/DirectoryExtension.java | 8 ++++----
components/camel-ldif/pom.xml | 2 +-
.../org/apache/camel/component/ldif/LdifTestSupport.java | 2 +-
.../directory/server/core/integ5/DirectoryExtension.java | 8 ++++----
components/camel-leveldb/pom.xml | 2 +-
.../LevelDBAggregateConcurrentDifferentGroupsTest.java | 4 ++--
.../leveldb/LevelDBAggregateConcurrentSameGroupTest.java | 4 ++--
.../leveldb/LevelDBAggregateDiscardOnTimeoutTest.java | 4 ++--
.../leveldb/LevelDBAggregateForceCompletionHeaderTest.java | 4 ++--
.../leveldb/LevelDBAggregateLoadAndRecoverTest.java | 4 ++--
.../leveldb/LevelDBAggregateLoadConcurrentTest.java | 4 ++--
.../camel/component/leveldb/LevelDBAggregateLoadTest.java | 4 ++--
.../LevelDBAggregateNotLostRemovedWhenConfirmedTest.java | 4 ++--
.../component/leveldb/LevelDBAggregateNotLostTest.java | 4 ++--
.../LevelDBAggregateRecoverDeadLetterChannelFailedTest.java | 4 ++--
.../LevelDBAggregateRecoverDeadLetterChannelTest.java | 4 ++--
.../component/leveldb/LevelDBAggregateRecoverTest.java | 4 ++--
.../LevelDBAggregateRecoverWithRedeliveryPolicyTest.java | 4 ++--
.../leveldb/LevelDBAggregateRecoverWithSedaTest.java | 4 ++--
.../leveldb/LevelDBAggregateSerializedHeadersTest.java | 4 ++--
.../camel/component/leveldb/LevelDBAggregateTest.java | 6 +++---
.../LevelDBAggregateTimeoutCompletionRestartTest.java | 4 ++--
.../leveldb/LevelDBAggregationRepositoryAlotDataTest.java | 4 ++--
.../LevelDBAggregationRepositoryLoadExistingTest.java | 4 ++--
.../LevelDBAggregationRepositoryMultipleRepoTest.java | 4 ++--
.../LevelDBAggregationRepositoryRecoverExistingTest.java | 4 ++--
.../component/leveldb/LevelDBAggregationRepositoryTest.java | 4 ++--
.../component/leveldb/LevelDBBigPayloadManualTest.java | 4 ++--
.../apache/camel/component/leveldb/LevelDBBinaryTest.java | 6 +++---
.../component/leveldb/LevelDBCustomSerializationTest.java | 4 ++--
.../component/leveldb/LevelDBExchangeSerializationTest.java | 4 ++--
.../camel/component/leveldb/LevelDBGetNotFoundTest.java | 4 ++--
.../apache/camel/component/leveldb/LevelDBSetupTest.java | 4 ++--
...velDBSpringAggregateRecoverWithRedeliveryPolicyTest.java | 4 ++--
.../camel/component/leveldb/LevelDBSpringAggregateTest.java | 4 ++--
.../apache/camel/component/leveldb/LevelDBTestSupport.java | 8 ++++----
components/camel-lra/pom.xml | 2 +-
.../apache/camel/service/lra/AbstractLRATestSupport.java | 2 +-
.../java/org/apache/camel/service/lra/LRAClientTest.java | 2 +-
.../org/apache/camel/service/lra/LRAManualInMemoryTest.java | 2 +-
.../apache/camel/service/lra/LRASagaCoordinatorTest.java | 2 +-
.../org/apache/camel/service/lra/LRASagaServiceTest.java | 2 +-
components/camel-lucene/pom.xml | 2 +-
.../component/lucene/LuceneIndexAndQueryProducerIT.java | 2 +-
.../camel/processor/lucene/LuceneQueryProcessorIT.java | 2 +-
components/camel-lumberjack/pom.xml | 2 +-
.../lumberjack/LumberjackComponentGlobalSSLTest.java | 2 +-
.../component/lumberjack/LumberjackComponentSSLTest.java | 2 +-
.../camel/component/lumberjack/LumberjackComponentTest.java | 2 +-
.../component/lumberjack/LumberjackDisconnectionTest.java | 4 ++--
.../camel/component/lumberjack/LumberjackMultiThreadIT.java | 2 +-
components/camel-lzf/pom.xml | 4 ++--
.../org/apache/camel/dataformat/lzf/LZFDataFormatTest.java | 2 +-
components/camel-mail/pom.xml | 2 +-
.../camel/component/mail/AdditionalMailPropertiesTest.java | 2 +-
.../org/apache/camel/component/mail/AuthenticatorTest.java | 2 +-
.../camel/component/mail/DetermineContentTypeIssueTest.java | 2 +-
.../apache/camel/component/mail/FromFileSendMailTest.java | 2 +-
.../camel/component/mail/InvalidConfigurationTest.java | 2 +-
.../component/mail/MailAttachmentDuplicateNamesTest.java | 2 +-
.../camel/component/mail/MailAttachmentNamesTest.java | 2 +-
.../camel/component/mail/MailAttachmentPollEnrichTest.java | 2 +-
.../camel/component/mail/MailAttachmentRedeliveryTest.java | 2 +-
.../org/apache/camel/component/mail/MailAttachmentTest.java | 2 +-
.../component/mail/MailAttachmentsUmlautIssueTest.java | 2 +-
.../apache/camel/component/mail/MailBatchConsumerTest.java | 4 ++--
.../camel/component/mail/MailCollectionHeaderTest.java | 4 ++--
.../camel/component/mail/MailCommitOnCompletionTest.java | 2 +-
.../camel/component/mail/MailComponentRecipientSetTest.java | 2 +-
.../org/apache/camel/component/mail/MailComponentTest.java | 4 ++--
.../camel/component/mail/MailConsumerIdleMessageTest.java | 2 +-
.../component/mail/MailConsumerUnsupportedCharsetTest.java | 2 +-
.../camel/component/mail/MailContentTypeResolverTest.java | 2 +-
.../apache/camel/component/mail/MailContentTypeTest.java | 2 +-
.../org/apache/camel/component/mail/MailConvertersTest.java | 4 ++--
.../org/apache/camel/component/mail/MailCopyToTest.java | 2 +-
.../camel/component/mail/MailCustomContentTypeTest.java | 2 +-
.../camel/component/mail/MailCustomMailSenderTest.java | 2 +-
.../component/mail/MailDefaultDelayForMailConsumeTest.java | 2 +-
.../org/apache/camel/component/mail/MailDisconnectTest.java | 2 +-
.../component/mail/MailDoNotDeleteIfProcessFailsTest.java | 2 +-
.../org/apache/camel/component/mail/MailEndpointTest.java | 2 +-
.../apache/camel/component/mail/MailEndpointTlsTest.java | 2 +-
.../org/apache/camel/component/mail/MailFetchSizeTest.java | 2 +-
.../apache/camel/component/mail/MailFetchSizeZeroTest.java | 2 +-
.../MailHeaderOverrulePreConfigurationRecipientsTest.java | 2 +-
.../apache/camel/component/mail/MailHtmlAttachmentTest.java | 2 +-
.../mail/MailIdempotentRepositoryDuplicateTest.java | 2 +-
.../camel/component/mail/MailIdempotentRepositoryTest.java | 2 +-
.../camel/component/mail/MailMaxMessagesPerPollTest.java | 2 +-
.../org/apache/camel/component/mail/MailMessageTest.java | 4 ++--
.../camel/component/mail/MailMimeDecodeHeadersTest.java | 2 +-
.../org/apache/camel/component/mail/MailMoveToTest.java | 2 +-
.../camel/component/mail/MailMultipleRecipientsTest.java | 2 +-
.../mail/MailMultipleRecipientsUsingHeadersTest.java | 2 +-
.../component/mail/MailNameAndEmailInRecipientTest.java | 2 +-
.../apache/camel/component/mail/MailNoRecipientsTest.java | 4 ++--
.../camel/component/mail/MailPollEnrichNoMailTest.java | 2 +-
.../org/apache/camel/component/mail/MailPollEnrichTest.java | 2 +-
.../camel/component/mail/MailPostProcessActionTest.java | 2 +-
.../component/mail/MailProcessOnlyUnseenMessagesTest.java | 2 +-
.../camel/component/mail/MailProducerConcurrentTest.java | 4 ++--
.../org/apache/camel/component/mail/MailProducerTest.java | 2 +-
.../component/mail/MailProducerUnsupportedCharsetTest.java | 4 ++--
.../camel/component/mail/MailRecipientsPipeIssueTest.java | 2 +-
.../org/apache/camel/component/mail/MailRecipientsTest.java | 2 +-
.../org/apache/camel/component/mail/MailReplyToTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailRouteTest.java | 2 +-
.../org/apache/camel/component/mail/MailSearchTermTest.java | 2 +-
.../mail/MailSearchTermUriConfigLast24HoursTest.java | 2 +-
.../camel/component/mail/MailSearchTermUriConfigTest.java | 2 +-
.../component/mail/MailShutdownCompleteAllTasksTest.java | 2 +-
.../mail/MailShutdownCompleteCurrentTaskOnlyTest.java | 2 +-
.../org/apache/camel/component/mail/MailSortTermTest.java | 2 +-
.../apache/camel/component/mail/MailSortTermThreeTest.java | 2 +-
.../apache/camel/component/mail/MailSortTermTwoTest.java | 2 +-
.../org/apache/camel/component/mail/MailSorterTest.java | 2 +-
.../camel/component/mail/MailSplitAttachmentsTest.java | 2 +-
.../org/apache/camel/component/mail/MailSubjectTest.java | 2 +-
.../camel/component/mail/MailToMultipleEndpointsTest.java | 2 +-
.../camel/component/mail/MailUsernameWithAtSignTest.java | 2 +-
.../camel/component/mail/MailUsingCustomSessionTest.java | 2 +-
.../apache/camel/component/mail/MailUsingHeadersTest.java | 2 +-
.../camel/component/mail/MailUsingOwnComponentTest.java | 2 +-
.../apache/camel/component/mail/MimeMessageConsumeTest.java | 2 +-
.../camel/component/mail/MimeMultipartAlternativeTest.java | 2 +-
.../mail/MimeMultipartAlternativeWithContentTypeTest.java | 2 +-
.../MimeMultipartAlternativeWithLongerFilenameTest.java | 2 +-
.../component/mail/MultipleDestinationConsumeTest.java | 2 +-
.../camel/component/mail/NestedMimeMessageConsumeTest.java | 2 +-
.../org/apache/camel/component/mail/RawMailMessageTest.java | 2 +-
.../component/mail/SpringMailSplitAttachmentsTest.java | 2 +-
.../mail/security/SslContextParametersMailRouteTest.java | 2 +-
.../mime/multipart/MimeMultipartDataFormatTest.java | 2 +-
components/camel-mapstruct/pom.xml | 2 +-
.../camel/component/mapstruct/CamelVehicleToCarTest.java | 2 +-
.../apache/camel/component/mapstruct/CarToVehicleTest.java | 2 +-
.../component/mapstruct/ComponentVehicleToCarTest.java | 2 +-
components/camel-master/pom.xml | 2 +-
.../camel/component/master/EndpointUriEncodingTest.java | 2 +-
components/camel-mdc/pom.xml | 2 +-
.../test/java/org/apache/camel/mdc/MDCAllHeadersTest.java | 2 +-
.../java/org/apache/camel/mdc/MDCAllPropertiesTest.java | 2 +-
.../src/test/java/org/apache/camel/mdc/MDCAsyncTest.java | 2 +-
.../test/java/org/apache/camel/mdc/MDCAsyncWiretapTest.java | 2 +-
.../src/test/java/org/apache/camel/mdc/MDCDefaultTest.java | 2 +-
.../apache/camel/mdc/MDCInterceptToEndpointBeanTest.java | 2 +-
.../java/org/apache/camel/mdc/MDCSelectedHeadersTest.java | 2 +-
.../org/apache/camel/mdc/MDCSelectedPropertiesTest.java | 2 +-
components/camel-metrics/pom.xml | 4 ++--
.../apache/camel/component/metrics/CounterRouteTest.java | 4 ++--
.../apache/camel/component/metrics/HistogramRouteTest.java | 4 ++--
.../org/apache/camel/component/metrics/MeterRouteTest.java | 4 ++--
.../camel/component/metrics/MetricComponentSpringTest.java | 4 ++--
.../camel/component/metrics/MetricsComponentRouteTest.java | 2 +-
.../org/apache/camel/component/metrics/TimerRouteTest.java | 4 ++--
.../ExceptionRouteMetricsMessageHistoryTest.java | 2 +-
.../metrics/messagehistory/ManagedMessageHistoryTest.java | 2 +-
.../metrics/messagehistory/MetricsMessageHistoryTest.java | 2 +-
.../messagehistory/SpringMetricsMessageHistoryTest.java | 2 +-
.../metrics/routepolicy/ManagedMetricsRoutePolicyTest.java | 2 +-
.../MetricsRoutePolicyMulticastSubRouteTest.java | 2 +-
.../metrics/routepolicy/MetricsRoutePolicySubRouteTest.java | 2 +-
.../metrics/routepolicy/MetricsRoutePolicyTest.java | 2 +-
components/camel-micrometer-observability/pom.xml | 2 +-
...MicrometerObservabilityTracerPropagationTestSupport.java | 2 +-
.../MicrometerObservabilityTracerTestSupport.java | 2 +-
components/camel-micrometer/pom.xml | 4 ++--
.../apache/camel/component/micrometer/CounterRouteTest.java | 4 ++--
.../component/micrometer/DistributionSummaryRouteTest.java | 4 ++--
.../component/micrometer/MicrometerComponentRouteTest.java | 2 +-
.../micrometer/TimerRouteBackwardsCompatibleTagTest.java | 4 ++--
.../apache/camel/component/micrometer/TimerRouteTest.java | 4 ++--
.../eventnotifier/AbstractMicrometerEventNotifierTest.java | 2 +-
.../ExceptionRouteMicrometerMessageHistoryTest.java | 2 +-
.../messagehistory/ManagedMessageHistoryTest.java | 2 +-
.../messagehistory/MicrometerMessageHistoryTest.java | 2 +-
.../messagehistory/SpringMicrometerMessageHistoryTest.java | 2 +-
.../routepolicy/AbstractMicrometerRoutePolicyTest.java | 2 +-
.../routepolicy/SharedMicrometerRoutePolicyTest.java | 2 +-
.../camel-microprofile/camel-microprofile-config/pom.xml | 2 +-
.../config/CamelMicroProfilePropertiesSourceTest.java | 2 +-
.../camel-microprofile-fault-tolerance/pom.xml | 2 +-
.../FaultToleranceInheritErrorHandlerTest.java | 2 +-
.../faulttolerance/FaultToleranceManagementTest.java | 2 +-
.../FaultToleranceRefConfigurationNoReflectionTest.java | 2 +-
.../faulttolerance/FaultToleranceRefConfigurationTest.java | 2 +-
.../FaultToleranceRouteBulkheadFallbackTest.java | 2 +-
.../faulttolerance/FaultToleranceRouteBulkheadOkTest.java | 2 +-
.../faulttolerance/FaultToleranceRouteFallbackTest.java | 2 +-
.../FaultToleranceRouteFallbackViaNetworkTest.java | 4 ++--
.../faulttolerance/FaultToleranceRouteOkTest.java | 2 +-
.../faulttolerance/FaultToleranceRouteRejectedTest.java | 4 ++--
.../faulttolerance/FaultToleranceTimeoutTest.java | 4 ++--
.../faulttolerance/FaultToleranceTimeoutThreadPoolTest.java | 4 ++--
.../FaultToleranceTimeoutWithFallbackTest.java | 2 +-
.../SpringFaultToleranceRouteFallbackTest.java | 2 +-
.../faulttolerance/SpringFaultToleranceRouteOkTest.java | 2 +-
.../camel-microprofile/camel-microprofile-health/pom.xml | 2 +-
.../health/CamelMicroProfileHealthTestSupport.java | 2 +-
components/camel-milo/pom.xml | 2 +-
.../apache/camel/component/milo/AbstractMiloServerTest.java | 2 +-
.../camel/component/milo/converter/ConverterTest.java | 2 +-
.../apache/camel/component/milo/server/ServerLocalTest.java | 2 +-
.../milo/server/ServerSetSecurityPoliciesTest.java | 2 +-
components/camel-mina/pom.xml | 2 +-
.../java/org/apache/camel/component/mina/BaseMinaTest.java | 2 +-
.../org/apache/camel/component/mina/MinaComponentTest.java | 2 +-
.../component/mina/MinaComponentWithConfigurationTest.java | 2 +-
.../org/apache/camel/component/mina/MinaEncodingTest.java | 2 +-
.../component/mina/MinaInOutWithForcedNoResponseTest.java | 2 +-
.../camel/component/mina/MinaNoResponseFromServerTest.java | 2 +-
.../camel/component/mina/MinaReverseProtocolHandler.java | 2 +-
.../camel/component/mina/MinaSpringMinaEndpointTest.java | 2 +-
.../camel/component/mina/MinaSpringMinaEndpointUDPTest.java | 2 +-
.../camel/component/mina/MinaSpringMultipleUDPTest.java | 2 +-
components/camel-minio/pom.xml | 2 +-
.../component/minio/MinioComponentConfigurationTest.java | 2 +-
.../org/apache/camel/component/minio/MinioTestUtils.java | 2 +-
.../minio/integration/MinioIntegrationTestSupport.java | 2 +-
components/camel-mllp/pom.xml | 2 +-
.../apache/camel/MllpTcpServerConsumerLenientBindTest.java | 6 +++---
.../java/org/apache/camel/component/mllp/LogPhiTest.java | 2 +-
.../org/apache/camel/component/mllp/MllpEndpointTest.java | 2 +-
.../mllp/MllpGlobalAndExplicitSSLContextParametersTest.java | 2 +-
.../camel/component/mllp/MllpIdleTimeoutStrategyTest.java | 2 +-
.../component/mllp/MllpMaxConcurrentConsumersTest.java | 2 +-
.../mllp/MllpMutualTlsConnectionAndHeaderBase.java | 2 +-
.../mllp/MllpProducerConsumerLoopbackInOnlyTest.java | 2 +-
.../component/mllp/MllpProducerConsumerLoopbackTest.java | 2 +-
.../camel/component/mllp/MllpSSLContextParametersTest.java | 2 +-
.../mllp/MllpTcpClientProducerConnectionErrorTest.java | 2 +-
.../MllpTcpClientProducerIdleConnectionTimeoutTest.java | 2 +-
.../camel/component/mllp/MllpTcpServerCharsetTest.java | 2 +-
...nsumerAutoAcknowledgementWithBridgeErrorHandlerTest.java | 2 +-
...merAutoAcknowledgementWithoutBridgeErrorHandlerTest.java | 2 +-
.../mllp/MllpTcpServerConsumerBindTimeoutTest.java | 2 +-
.../component/mllp/MllpTcpServerConsumerConnectionTest.java | 4 ++--
...umerManualAcknowledgementWithBridgeErrorHandlerTest.java | 2 +-
...rManualAcknowledgementWithoutBridgeErrorHandlerTest.java | 2 +-
.../mllp/MllpTcpServerConsumerMessageHeadersTest.java | 2 +-
.../mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java | 2 +-
.../mllp/MllpTcpServerConsumerTransactionTest.java | 2 +-
.../TcpClientProducerEndOfDataAndValidationTestSupport.java | 2 +-
.../mllp/TcpServerConsumerAcknowledgementTestSupport.java | 2 +-
.../TcpServerConsumerEndOfDataAndValidationTestSupport.java | 2 +-
components/camel-mock/src/main/docs/mock-component.adoc | 4 ++--
components/camel-mongodb-gridfs/pom.xml | 2 +-
.../gridfs/integration/AbstractMongoDbITSupport.java | 2 +-
components/camel-mongodb/pom.xml | 4 ++--
.../camel/component/mongodb/MongoDbEndpointClientTest.java | 2 +-
.../camel/component/mongodb/MongoDbEndpointHostsTest.java | 2 +-
.../mongodb/integration/MongoDbAggregateOperationIT.java | 2 +-
.../mongodb/integration/MongoDbFindOperationIT.java | 4 ++--
.../component/mongodb/integration/MongoDbOperationsIT.java | 2 +-
.../component/mongodb/integration/MongoDbOutputTypeIT.java | 2 +-
components/camel-mustache/pom.xml | 2 +-
.../camel/component/mustache/MustacheComponentTest.java | 2 +-
.../apache/camel/component/mustache/MustacheLetterTest.java | 2 +-
.../apache/camel/component/mustache/MustacheRefTest.java | 2 +-
components/camel-mvel/pom.xml | 2 +-
.../org/apache/camel/language/mvel/MvelComponentTest.java | 2 +-
.../java/org/apache/camel/language/mvel/MvelFilterTest.java | 2 +-
.../java/org/apache/camel/language/mvel/MvelRefTest.java | 2 +-
.../org/apache/camel/language/mvel/MvelResourceTest.java | 2 +-
.../camel/language/mvel/MvelScriptingLanguageTest.java | 2 +-
.../test/java/org/apache/camel/language/mvel/MvelTest.java | 2 +-
components/camel-mybatis/pom.xml | 2 +-
.../apache/camel/component/mybatis/MyBatisQueueTest.java | 2 +-
.../apache/camel/component/mybatis/MyBatisTestSupport.java | 2 +-
.../component/mybatis/MyBatisUnknownStatementTypeTest.java | 4 ++--
.../component/mybatis/bean/MyBatisBeanWrongMethodTest.java | 2 +-
components/camel-nats/pom.xml | 2 +-
.../apache/camel/component/nats/NatsConsumerStopTest.java | 2 +-
.../camel/component/nats/integration/NatsAuthITSupport.java | 2 +-
.../component/nats/integration/NatsAuthTokenITSupport.java | 2 +-
.../camel/component/nats/integration/NatsITSupport.java | 2 +-
.../nats/integration/NatsProducerReplyToTimeoutIT.java | 2 +-
.../component/nats/integration/NatsTLSAuthITSupport.java | 2 +-
components/camel-netty-http/pom.xml | 2 +-
.../camel/component/netty/http/BaseNettyTestSupport.java | 2 +-
.../component/netty/http/NettyCamelWebsiteManualTest.java | 2 +-
.../camel/component/netty/http/NettyHttp500ErrorTest.java | 2 +-
.../http/NettyHttp500ErrorThrowExceptionOnServerTest.java | 2 +-
.../netty/http/NettyHttpBasicAuthConstraintMapperTest.java | 2 +-
.../NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java | 2 +-
.../camel/component/netty/http/NettyHttpBasicAuthTest.java | 2 +-
.../netty/http/NettyHttpComponentWithConfigurationTest.java | 2 +-
.../http/NettyHttpConvertPayloadToInputStreamTest.java | 2 +-
.../netty/http/NettyHttpEndpointUriAssemblerTest.java | 2 +-
.../netty/http/NettyHttpEndpointUriFactoryTest.java | 2 +-
.../netty/http/NettyHttpGetWithInvalidMessageTest.java | 2 +-
.../component/netty/http/NettyHttpOkStatusCodeTest.java | 2 +-
.../netty/http/NettyHttpProducerConcurrentTest.java | 2 +-
.../component/netty/http/NettyHttpProducerHeadersTest.java | 2 +-
.../netty/http/NettyHttpProducerProxyModeTest.java | 2 +-
.../netty/http/NettyHttpRedirectNoLocationTest.java | 2 +-
.../camel/component/netty/http/NettyHttpRedirectTest.java | 2 +-
.../component/netty/http/NettyHttpRequestTimeoutTest.java | 2 +-
.../apache/camel/component/netty/http/NettyHttpSSLTest.java | 2 +-
.../http/NettyHttpSimpleBasicAuthConstraintMapperTest.java | 2 +-
.../component/netty/http/NettyHttpSimpleBasicAuthTest.java | 2 +-
.../netty/http/NettyHttpStreamCacheFileResponseTest.java | 4 ++--
.../component/netty/http/NettyHttpSuspendResume503Test.java | 2 +-
.../netty/http/NettyHttpTransferExceptionTest.java | 2 +-
.../netty/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java | 2 +-
.../netty/http/NettyHttpTwoRoutesStopOneRouteTest.java | 2 +-
.../component/netty/http/SpringNettyHttpBasicAuthTest.java | 2 +-
.../camel/component/netty/http/SpringNettyHttpSSLTest.java | 2 +-
.../netty/http/cloud/NettyHttpServiceCallRouteTest.java | 2 +-
.../netty/http/rest/RestNettyMethodNotAllowedTest.java | 2 +-
components/camel-netty/pom.xml | 2 +-
.../org/apache/camel/component/netty/BaseNettyTest.java | 2 +-
.../camel/component/netty/MultipleCodecsSpringTest.java | 2 +-
.../netty/NettyComponentWithConfigurationTest.java | 2 +-
.../apache/camel/component/netty/NettyConverterTest.java | 2 +-
.../camel/component/netty/NettyEndpointUriFactoryTest.java | 2 +-
.../apache/camel/component/netty/NettyProducerHangTest.java | 4 ++--
.../apache/camel/component/netty/NettyRedeliveryTest.java | 2 +-
.../component/netty/NettyRequestTimeoutIssueManualTest.java | 2 +-
.../camel/component/netty/NettyRequestTimeoutTest.java | 2 +-
.../netty/SpringNettyUseSharedWorkerThreadPoolTest.java | 2 +-
components/camel-nitrite/pom.xml | 2 +-
.../apache/camel/component/nitrite/AbstractNitriteTest.java | 4 ++--
components/camel-oaipmh/pom.xml | 2 +-
.../camel/oaipmh/OAIPMHComponentConsumerHTTPSTest.java | 2 +-
.../oaipmh/OAIPMHComponentConsumerParticularCaseTest.java | 2 +-
.../apache/camel/oaipmh/OAIPMHComponentConsumerTest.java | 2 +-
.../camel/oaipmh/OAIPMHComponentProducerGetRecordTest.java | 2 +-
.../oaipmh/OAIPMHComponentProducerOnlyFirstLoopTest.java | 2 +-
.../camel/oaipmh/OAIPMHComponentProducerOnlyFirstTest.java | 2 +-
.../apache/camel/oaipmh/OAIPMHComponentProducerTest.java | 2 +-
.../org/apache/camel/oaipmh/OAIPMHComponentSpringTest.java | 2 +-
components/camel-oauth/pom.xml | 2 +-
components/camel-observation/pom.xml | 2 +-
.../observation/CamelMicrometerObservationTestSupport.java | 2 +-
components/camel-ocsf/pom.xml | 2 +-
.../apache/camel/dataformat/ocsf/OcsfDataFormatTest.java | 2 +-
.../apache/camel/dataformat/ocsf/OcsfEventExampleTest.java | 2 +-
components/camel-ognl/pom.xml | 2 +-
.../apache/camel/language/ognl/OgnlInvokeMethodTest.java | 2 +-
.../org/apache/camel/language/ognl/OgnlResourceTest.java | 2 +-
.../camel/language/ognl/OgnlScriptingLanguageTest.java | 2 +-
.../test/java/org/apache/camel/language/ognl/OgnlTest.java | 2 +-
.../org/apache/camel/language/ognl/patterns/FilterTest.java | 2 +-
components/camel-olingo2/camel-olingo2-api/pom.xml | 2 +-
components/camel-olingo2/camel-olingo2-component/pom.xml | 2 +-
.../camel/component/olingo2/AbstractOlingo2TestSupport.java | 4 ++--
components/camel-olingo4/camel-olingo4-api/pom.xml | 2 +-
components/camel-olingo4/camel-olingo4-component/pom.xml | 2 +-
.../camel/component/olingo4/AbstractOlingo4TestSupport.java | 2 +-
.../component/olingo4/Olingo4ComponentConsumerTest.java | 2 +-
.../component/olingo4/Olingo4ComponentProducerTest.java | 4 ++--
components/camel-once/pom.xml | 2 +-
.../component/once/OnceBodyAndExchangePropertyTest.java | 2 +-
.../camel/component/once/OnceBodyAndHeaderFileTest.java | 2 +-
.../apache/camel/component/once/OnceBodyAndHeaderTest.java | 2 +-
.../camel/component/once/OnceBodyAndVariableFileTest.java | 2 +-
.../camel/component/once/OnceBodyAndVariableTest.java | 2 +-
.../org/apache/camel/component/once/OnceBodyFileTest.java | 2 +-
.../org/apache/camel/component/once/OnceGroovyFileTest.java | 2 +-
.../apache/camel/component/once/OnceSimpleDisabledTest.java | 2 +-
.../org/apache/camel/component/once/OnceSimpleFileTest.java | 2 +-
.../org/apache/camel/component/once/OnceSimpleTest.java | 2 +-
.../test/java/org/apache/camel/component/once/OnceTest.java | 2 +-
components/camel-openapi-java/pom.xml | 2 +-
.../java/org/apache/camel/openapi/ComplexTypesTest.java | 2 +-
.../RestOpenApiModelApiSecurityRequirementsTest.java | 2 +-
.../camel/openapi/RestOpenApiReaderApiDocsOverrideTest.java | 2 +-
.../apache/camel/openapi/RestOpenApiReaderApiDocsTest.java | 2 +-
.../camel/openapi/RestOpenApiReaderContextPathTest.java | 2 +-
.../camel/openapi/RestOpenApiReaderDayOfWeekTest.java | 2 +-
.../apache/camel/openapi/RestOpenApiReaderDisabledTest.java | 2 +-
.../openapi/RestOpenApiReaderEnableVendorExtensionTest.java | 2 +-
.../openapi/RestOpenApiReaderFileResponseModelTest.java | 2 +-
.../openapi/RestOpenApiReaderModelApiSecurityTest.java | 2 +-
.../camel/openapi/RestOpenApiReaderModelBookOrderTest.java | 2 +-
.../apache/camel/openapi/RestOpenApiReaderModelTest.java | 2 +-
.../openapi/RestOpenApiReaderPropertyPlaceholderTest.java | 2 +-
.../org/apache/camel/openapi/RestOpenApiReaderTest.java | 2 +-
.../camel/openapi/RestOpenApiV3SecuritySchemesTest.java | 2 +-
.../java/org/apache/camel/openapi/RestOpenApiV3XOfTest.java | 2 +-
...ingRestOpenApiReaderModelApiSecurityPlaceholderTest.java | 2 +-
.../SpringRestOpenApiReaderModelApiSecurityTest.java | 2 +-
.../apache/camel/openapi/producer/RestOpenApiGetTest.java | 2 +-
.../camel/openapi/producer/RestOpenApiGetUriParamTest.java | 2 +-
components/camel-openapi-validator/pom.xml | 2 +-
.../client/OpenApiRestClientRequestValidatorTest.java | 2 +-
.../client/OpenApiRestClientResponseValidatorTest.java | 2 +-
components/camel-opensearch/pom.xml | 2 +-
.../component/opensearch/integration/OpensearchBulkIT.java | 2 +-
.../opensearch/integration/OpensearchClusterIndexIT.java | 2 +-
components/camel-openstack/pom.xml | 2 +-
.../openstack/it/OpenstackWiremockTestSupport.java | 2 +-
components/camel-opentelemetry-metrics/pom.xml | 2 +-
.../metrics/AbstractOpenTelemetryTestSupport.java | 2 +-
.../camel/opentelemetry/metrics/CounterRouteTest.java | 2 +-
.../opentelemetry/metrics/DistributionSummaryRouteTest.java | 2 +-
.../metrics/OpenTelemetryComponentRouteTest.java | 2 +-
.../apache/camel/opentelemetry/metrics/TimerRouteTest.java | 2 +-
.../metrics/integration/CounterRouteAutoConfigIT.java | 2 +-
.../metrics/integration/TimerRouteAutoConfigIT.java | 2 +-
.../eventnotifier/ExchangeEventNotifierAutoConfigIT.java | 2 +-
.../messagehistory/ManagedMessageHistoryAutoConfigIT.java | 2 +-
components/camel-opentelemetry/pom.xml | 2 +-
.../camel/opentelemetry/CamelOpenTelemetryTestSupport.java | 2 +-
.../opentelemetry/OpenTelemetryPropagateContextTest.java | 2 +-
.../OpenTelemetryTracingStrategyPropagateContextTest.java | 2 +-
components/camel-opentelemetry2/pom.xml | 2 +-
.../opentelemetry2/OpenTelemetryTracerTestSupport.java | 2 +-
components/camel-optaplanner/pom.xml | 2 +-
.../optaplanner/OptaPlannerAsyncConfigFileTest.java | 2 +-
.../component/optaplanner/OptaPlannerProblemChangeTest.java | 2 +-
.../optaplanner/OptaPlannerSyncConfigFileTest.java | 2 +-
.../optaplanner/OptaplannerSolverManagerAsyncTest.java | 2 +-
.../optaplanner/OptaplannerSolverManagerSyncTest.java | 2 +-
components/camel-paho-mqtt5/pom.xml | 2 +-
.../paho/mqtt5/PahoMqtt5ReconnectAfterFailureIT.java | 2 +-
.../component/paho/mqtt5/PahoMqtt5SendDynamicAwareTest.java | 2 +-
.../paho/mqtt5/integration/PahoMqtt5ITSupport.java | 2 +-
components/camel-paho/pom.xml | 2 +-
components/camel-parquet-avro/pom.xml | 2 +-
.../dataformat/parquet/avro/ParquetAvroDataFormatTest.java | 2 +-
.../avro/ParquetAvroDataFormatUnmarshalFromFileTest.java | 2 +-
.../avro/ParquetAvroDataFormatUnmarshalLazyLoadTest.java | 2 +-
.../avro/ParquetAvroDataFormatWithoutUnmarshalTypeTest.java | 2 +-
.../avro/ParquetAvroMarshalCompressionCodecTest.java | 2 +-
components/camel-pdf/pom.xml | 2 +-
.../java/org/apache/camel/component/pdf/PdfAppendTest.java | 2 +-
.../org/apache/camel/component/pdf/PdfConverterTest.java | 2 +-
.../org/apache/camel/component/pdf/PdfCreationTest.java | 2 +-
.../java/org/apache/camel/component/pdf/PdfMergeTest.java | 2 +-
.../apache/camel/component/pdf/PdfTextExtractionTest.java | 2 +-
components/camel-pg-replication-slot/pom.xml | 2 +-
.../slot/integration/PgReplicationITSupport.java | 2 +-
components/camel-pgevent/pom.xml | 2 +-
.../apache/camel/pgevent/integration/PgEventITSupport.java | 2 +-
components/camel-platform-http-main/pom.xml | 2 +-
components/camel-platform-http-vertx/pom.xml | 2 +-
.../http/vertx/VertxPlatformHttpBufferConverterTest.java | 2 +-
components/camel-platform-http/pom.xml | 2 +-
components/camel-plc4x/pom.xml | 2 +-
.../apache/camel/component/plc4x/Plc4XComponentTagTest.java | 2 +-
.../apache/camel/component/plc4x/Plc4XComponentTest.java | 2 +-
components/camel-pqc/pom.xml | 2 +-
.../component/pqc/AwsSecretsManagerKeyLifecycleIT.java | 2 +-
.../camel/component/pqc/HashicorpVaultKeyLifecycleIT.java | 2 +-
.../pqc/PQCBIKEGenerateEncapsulationAESNoAutowiredTest.java | 2 +-
.../component/pqc/PQCBIKEGenerateEncapsulationAESTest.java | 2 +-
.../pqc/PQCCMCEGenerateEncapsulationAESNoAutowiredTest.java | 2 +-
.../component/pqc/PQCCMCEGenerateEncapsulationAESTest.java | 2 +-
.../camel/component/pqc/PQCEndToEndIntegrationTest.java | 2 +-
.../PQCFRODOGenerateEncapsulationAESNoAutowiredTest.java | 2 +-
.../component/pqc/PQCFRODOGenerateEncapsulationAESTest.java | 2 +-
.../pqc/PQCHQCGenerateEncapsulationAESNoAutowiredTest.java | 2 +-
.../component/pqc/PQCHQCGenerateEncapsulationAESTest.java | 2 +-
.../PQCKYBERGenerateEncapsulationAESNoAutowiredTest.java | 2 +-
.../component/pqc/PQCKYBERGenerateEncapsulationAESTest.java | 2 +-
.../camel/component/pqc/PQCKeyLifecycleIntegrationTest.java | 2 +-
.../PQCMLKEMGenerateEncapsulationAESNoAutowiredTest.java | 2 +-
.../component/pqc/PQCMLKEMGenerateEncapsulationAESTest.java | 2 +-
...GenerateEncapsulationCryptoRoundTripAESAsHeaderTest.java | 2 +-
...PQCMLKEMGenerateEncapsulationCryptoRoundTripAESTest.java | 2 +-
...QCMLKEMGenerateEncapsulationCryptoRoundTripAriaTest.java | 2 +-
...CMLKEMGenerateEncapsulationCryptoRoundTripCAST5Test.java | 2 +-
...CMLKEMGenerateEncapsulationCryptoRoundTripCAST6Test.java | 2 +-
...MGenerateEncapsulationCryptoRoundTripCHACHA7539Test.java | 2 +-
...KEMGenerateEncapsulationCryptoRoundTripCamelliaTest.java | 2 +-
...MLKEMGenerateEncapsulationCryptoRoundTripDESedeTest.java | 2 +-
...KEMGenerateEncapsulationCryptoRoundTripDSTU7624Test.java | 2 +-
...EMGenerateEncapsulationCryptoRoundTripGOST28147Test.java | 2 +-
...CMLKEMGenerateEncapsulationCryptoRoundTripGRAINTest.java | 2 +-
...PQCMLKEMGenerateEncapsulationCryptoRoundTripRC2Test.java | 2 +-
...PQCMLKEMGenerateEncapsulationCryptoRoundTripRC5Test.java | 2 +-
...PQCMLKEMGenerateEncapsulationCryptoRoundTripSM4Test.java | 2 +-
.../component/pqc/PQCMLKEMGenerateEncapsulationRC5Test.java | 2 +-
.../pqc/PQCNTRUGenerateEncapsulationAESNoAutowiredTest.java | 2 +-
.../component/pqc/PQCNTRUGenerateEncapsulationAESTest.java | 2 +-
.../pqc/PQCNTRULPRGenerateEncapsulationAESTest.java | 2 +-
.../PQCSABERGenerateEncapsulationAESNoAutowiredTest.java | 2 +-
.../component/pqc/PQCSABERGenerateEncapsulationAESTest.java | 2 +-
.../pqc/PQCSNTRUPrimeGenerateEncapsulationAESTest.java | 2 +-
.../camel/component/pqc/PQCSignatureDILITHIUMTest.java | 2 +-
.../component/pqc/PQCSignatureFalconNoAutowiredTest.java | 2 +-
.../pqc/PQCSignatureFalconNoSignerAutowiredTest.java | 2 +-
.../apache/camel/component/pqc/PQCSignatureFalconTest.java | 2 +-
.../org/apache/camel/component/pqc/PQCSignatureHSSTest.java | 2 +-
.../camel/component/pqc/PQCSignatureLMSNoAutowiredTest.java | 2 +-
.../org/apache/camel/component/pqc/PQCSignatureLMSTest.java | 2 +-
.../component/pqc/PQCSignatureMAYONoAutowiredTest.java | 2 +-
.../apache/camel/component/pqc/PQCSignatureMAYOTest.java | 2 +-
.../component/pqc/PQCSignatureMLDSANoAutowiredTest.java | 2 +-
.../component/pqc/PQCSignatureNoAutowiredSignatureTest.java | 2 +-
.../camel/component/pqc/PQCSignatureOnlyKeyStoreTest.java | 2 +-
.../component/pqc/PQCSignaturePicnicNoAutowiredTest.java | 2 +-
.../apache/camel/component/pqc/PQCSignaturePicnicTest.java | 2 +-
.../camel/component/pqc/PQCSignatureSLHDSAKeystoreTest.java | 2 +-
.../component/pqc/PQCSignatureSLHDSANoAutowiredTest.java | 2 +-
.../apache/camel/component/pqc/PQCSignatureSLHDSATest.java | 2 +-
.../component/pqc/PQCSignatureSNOVANoAutowiredTest.java | 2 +-
.../apache/camel/component/pqc/PQCSignatureSNOVATest.java | 2 +-
.../pqc/PQCSignatureSPHINCSPLUSNoAutowiredTest.java | 2 +-
.../camel/component/pqc/PQCSignatureSPHINCSPLUSTest.java | 2 +-
.../org/apache/camel/component/pqc/PQCSignatureTest.java | 2 +-
.../camel/component/pqc/PQCSignatureWithKeyStoreTest.java | 2 +-
.../pqc/PQCSignatureWrongKeyPairSignatureTest.java | 2 +-
.../apache/camel/component/pqc/PQCSignatureXMSSMTTest.java | 2 +-
.../component/pqc/PQCSignatureXMSSNoAutowiredTest.java | 2 +-
.../apache/camel/component/pqc/PQCSignatureXMSSTest.java | 2 +-
.../component/pqc/dataformat/PQCDataFormatHeaderTest.java | 2 +-
.../pqc/dataformat/PQCDataFormatIntegrationTest.java | 2 +-
.../pqc/dataformat/PQCDataFormatMultipleAlgorithmsTest.java | 2 +-
.../camel/component/pqc/dataformat/PQCDataFormatTest.java | 2 +-
components/camel-printer/pom.xml | 2 +-
.../apache/camel/component/printer/PrinterPrintTest.java | 2 +-
components/camel-protobuf/pom.xml | 2 +-
.../protobuf/ProtobufMarshalAndUnmarshalJsonTest.java | 2 +-
.../protobuf/ProtobufMarshalAndUnmarshalMapTest.java | 2 +-
.../protobuf/ProtobufMarshalAndUnmarshalSpringTest.java | 2 +-
.../protobuf/ProtobufMarshalAndUnmarshalTest.java | 2 +-
components/camel-pubnub/pom.xml | 2 +-
.../camel/component/pubnub/PubNubConfigurationTest.java | 2 +-
.../apache/camel/component/pubnub/PubNubOperationsTest.java | 2 +-
.../org/apache/camel/component/pubnub/PubNubTestBase.java | 2 +-
components/camel-pulsar/pom.xml | 2 +-
.../apache/camel/component/pulsar/PulsarComponentTest.java | 2 +-
.../apache/camel/component/pulsar/PulsarEndpointTest.java | 4 ++--
.../pulsar/integration/PulsarConsumerInAsynchronousIT.java | 2 +-
.../camel/component/pulsar/integration/PulsarITSupport.java | 2 +-
components/camel-python/pom.xml | 2 +-
.../org/apache/camel/language/python/PythonChoiceTest.java | 2 +-
.../camel/language/python/PythonScriptingLanguageTest.java | 2 +-
.../java/org/apache/camel/language/python/PythonTest.java | 2 +-
components/camel-quartz/pom.xml | 2 +-
.../org/apache/camel/component/quartz/BaseQuartzTest.java | 2 +-
.../camel/component/quartz/DelegateEndpointQuartzTest.java | 2 +-
.../apache/camel/component/quartz/QuartzCronRouteTest.java | 2 +-
.../camel/component/quartz/QuartzCronTriggerRouteTest.java | 2 +-
.../camel/component/quartz/QuartzEndpointConfigureTest.java | 2 +-
.../SpringQuartzConsumerTwoAppsClusteredFailoverTest.java | 2 +-
.../SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java | 2 +-
.../camel/component/quartz/SpringQuartzCronRouteTest.java | 2 +-
...ingQuartzPersistentStoreRestartAppChangeOptionsTest.java | 2 +-
.../quartz/SpringQuartzPersistentStoreRestartAppTest.java | 2 +-
.../quartz/SpringQuartzPersistentStoreRestartRouteTest.java | 2 +-
.../component/quartz/SpringQuartzPersistentStoreTest.java | 2 +-
.../quartz/FileConsumerQuartzSchedulerRestartTest.java | 4 ++--
.../quartz/FileConsumerQuartzSchedulerTest.java | 4 ++--
.../routepolicy/quartz/MultiplePoliciesOnRouteTest.java | 4 ++--
.../org/apache/camel/routepolicy/quartz/NoBuilderTest.java | 2 +-
.../quartz/RouteAutoStopFalseCronScheduledPolicyTest.java | 2 +-
.../quartz/SimpleScheduledCombinedRoutePolicyTest.java | 2 +-
.../quartz/SpringCronScheduledRoutePolicyTest.java | 2 +-
.../quartz/SpringMultiplePoliciesOnRouteTest.java | 4 ++--
.../quartz/SpringQuartzTwoAppsClusteredFailoverTest.java | 2 +-
.../quartz/SpringSimpleScheduledRoutePolicyTest.java | 2 +-
components/camel-quickfix/pom.xml | 2 +-
.../camel/component/quickfixj/QuickfixjConvertersTest.java | 2 +-
.../camel/component/quickfixj/QuickfixjSpringTest.java | 2 +-
components/camel-reactive-executor-tomcat/pom.xml | 2 +-
.../test/java/org/apache/camel/reactive/SimpleMockTest.java | 2 +-
components/camel-reactive-executor-vertx/pom.xml | 2 +-
.../apache/camel/reactive/SimpleMockLookupVertxTest.java | 2 +-
.../test/java/org/apache/camel/reactive/SimpleMockTest.java | 2 +-
components/camel-reactive-streams/pom.xml | 2 +-
.../camel/component/reactive/streams/BaseReactiveTest.java | 2 +-
.../camel/component/reactive/streams/BeanCallTest.java | 2 +-
components/camel-reactor/pom.xml | 2 +-
.../reactor/engine/ReactorStreamsServiceTestSupport.java | 2 +-
components/camel-redis/pom.xml | 2 +-
.../processor/aggregate/integration/AggregateRedisIT.java | 2 +-
components/camel-resilience4j-micrometer/pom.xml | 2 +-
.../component/resilience4j/micrometer/MicrometerTest.java | 2 +-
components/camel-resilience4j/pom.xml | 2 +-
.../resilience4j/ResilienceExistingCircuitBreakerTest.java | 2 +-
.../resilience4j/ResilienceIgnoreExceptionTest.java | 2 +-
.../resilience4j/ResilienceInheritErrorHandlerTest.java | 2 +-
.../component/resilience4j/ResilienceManagementTest.java | 2 +-
.../component/resilience4j/ResiliencePooledRouteOkTest.java | 2 +-
.../resilience4j/ResilienceRecordExceptionTest.java | 2 +-
.../resilience4j/ResilienceRecordIgnoreExceptionTest.java | 2 +-
.../resilience4j/ResilienceRouteBulkheadFallbackTest.java | 2 +-
.../resilience4j/ResilienceRouteBulkheadOkTest.java | 2 +-
.../component/resilience4j/ResilienceRouteFallbackTest.java | 2 +-
.../resilience4j/ResilienceRouteFallbackViaNetworkTest.java | 4 ++--
.../camel/component/resilience4j/ResilienceRouteOkTest.java | 2 +-
.../component/resilience4j/ResilienceRouteRejectedTest.java | 2 +-
.../camel/component/resilience4j/ResilienceTimeoutTest.java | 4 ++--
.../resilience4j/ResilienceTimeoutThreadPoolTest.java | 4 ++--
.../resilience4j/ResilienceTimeoutWithFallbackTest.java | 2 +-
.../resilience4j/SpringResilienceRouteFallbackTest.java | 2 +-
.../component/resilience4j/SpringResilienceRouteOkTest.java | 2 +-
components/camel-resourceresolver-github/pom.xml | 2 +-
.../org/apache/camel/github/GistResourceResolverTest.java | 2 +-
.../org/apache/camel/github/GitHubResourceResolverTest.java | 2 +-
components/camel-rest-openapi/pom.xml | 2 +-
.../rest/openapi/RestOpenApiRequestValidationTest.java | 2 +-
components/camel-robotframework/pom.xml | 2 +-
.../RobotFrameworkCamelConfigurationTest.java | 2 +-
.../robotframework/RobotFrameworkCamelUtilsTest.java | 2 +-
.../robotframework/RobotFrameworkComponentTest.java | 2 +-
components/camel-rocketmq/pom.xml | 2 +-
.../camel/component/rocketmq/RocketMQTestSupport.java | 2 +-
components/camel-rss/pom.xml | 2 +-
.../camel/component/rss/RssEntryPollingConsumerTest.java | 2 +-
.../rss/RssEntryPollingConsumerWithFilterTest.java | 2 +-
.../org/apache/camel/component/rss/RssEntrySortTest.java | 2 +-
.../java/org/apache/camel/component/rss/RssFilterTest.java | 2 +-
.../camel/component/rss/RssHttpNoCamelParametersTest.java | 2 +-
.../camel/component/rss/RssMultipleEndpointsIssueTest.java | 2 +-
.../apache/camel/component/rss/RssPollingConsumerTest.java | 2 +-
.../rss/RssPollingConsumerWithFeedHeaderDisabledTest.java | 2 +-
.../apache/camel/component/rss/RssUriEncodingIssueTest.java | 2 +-
.../org/apache/camel/dataformat/rss/RssDataFormatTest.java | 2 +-
components/camel-rxjava/pom.xml | 2 +-
.../rxjava/engine/RxJavaStreamsServiceTestSupport.java | 2 +-
.../camel-salesforce/camel-salesforce-component/pom.xml | 2 +-
.../component/salesforce/AbstractSalesforceTestBase.java | 2 +-
.../apache/camel/component/salesforce/ApprovalManualIT.java | 8 ++++----
.../component/salesforce/CompositeApiBatchManualIT.java | 8 ++++----
.../salesforce/CompositeApiCollectionsManualIT.java | 8 ++++----
.../camel/component/salesforce/CompositeApiManualIT.java | 8 ++++----
.../component/salesforce/CompositeApiTreeManualIT.java | 8 ++++----
.../camel/component/salesforce/HttpProxyManualIT.java | 8 ++++----
.../apache/camel/component/salesforce/RawPayloadTest.java | 8 ++++----
.../apache/camel/component/salesforce/RecentManualIT.java | 2 +-
.../salesforce/SalesforceClientCredentialsFlowManualIT.java | 2 +-
.../salesforce/SalesforceJwtBearerTokenFlowTest.java | 2 +-
.../camel-salesforce/camel-salesforce-maven-plugin/pom.xml | 2 +-
.../apache/camel/maven/CamelSalesforceMojoOutputTest.java | 8 ++++----
components/camel-sap-netweaver/pom.xml | 4 ++--
.../component/sap/netweaver/NetWeaverFlightDataTest.java | 2 +-
.../sap/netweaver/NetWeaverFlightDataVelocityTest.java | 2 +-
components/camel-saxon/pom.xml | 2 +-
.../camel/builder/saxon/BeanWithXQueryInjectionTest.java | 2 +-
.../org/apache/camel/builder/saxon/SaxonXPathSplitTest.java | 2 +-
.../java/org/apache/camel/builder/saxon/SaxonXPathTest.java | 2 +-
.../camel/builder/saxon/SpringXQueryTransformIssueTest.java | 2 +-
.../builder/saxon/XPathSplitChoicePerformanceTest.java | 4 ++--
.../test/java/org/apache/camel/builder/saxon/XPathTest.java | 2 +-
.../org/apache/camel/builder/saxon/XQueryFilterTest.java | 2 +-
.../saxon/XQueryHeaderNameResultTypeAndNamespaceTest.java | 2 +-
.../apache/camel/builder/saxon/XQueryHeaderNameTest.java | 2 +-
.../apache/camel/builder/saxon/XQueryRecipientListTest.java | 2 +-
.../org/apache/camel/builder/saxon/XQueryResourceTest.java | 2 +-
.../camel/builder/saxon/XQueryTransformIssueTest.java | 2 +-
.../org/apache/camel/builder/saxon/XQueryTransformTest.java | 2 +-
.../apache/camel/builder/saxon/XQueryTransformTextTest.java | 2 +-
.../camel/builder/saxon/XQueryWithNamespacesFilterTest.java | 2 +-
.../xquery/BeanWithXQueryInjectionUsingHeaderValueTest.java | 2 +-
.../apache/camel/component/xquery/SoapPayloadBeanTest.java | 2 +-
.../component/xquery/XQueryComponentConfigurationTest.java | 2 +-
.../camel/component/xquery/XQueryConcurrencyTest.java | 4 ++--
.../component/xquery/XQueryEndpointConfigurationTest.java | 2 +-
.../apache/camel/component/xquery/XQueryEndpointTest.java | 2 +-
.../apache/camel/component/xquery/XQueryExampleTest.java | 2 +-
.../camel/component/xquery/XQueryFromFileExceptionTest.java | 8 ++++----
.../apache/camel/component/xquery/XQueryFromFileTest.java | 4 ++--
.../camel/component/xquery/XQueryLanguageFromFileTest.java | 4 ++--
.../apache/camel/component/xquery/XQueryNullHeaderTest.java | 2 +-
.../camel/component/xquery/XQueryPredicateFilterTest.java | 2 +-
.../camel/component/xquery/XQueryPropogateHeadersTest.java | 2 +-
.../camel/component/xquery/XQueryStripWhitespaceTest.java | 2 +-
.../component/xquery/XQueryURLBasedConcurrencyTest.java | 4 ++--
.../camel/component/xquery/XQueryWithExplicitTypeTest.java | 2 +-
.../camel/component/xquery/XQueryWithExtensionTest.java | 2 +-
.../apache/camel/component/xquery/XQueryWithFlworTest.java | 2 +-
.../extensions/SaxonLanguageExtensionFunctionsTest.java | 2 +-
.../apache/camel/converter/saxon/SaxonConverterTest.java | 2 +-
.../language/xpath/XPathHeaderEnableSaxonJavaDslTest.java | 2 +-
.../org/apache/camel/language/xpath/XPathHeaderTest.java | 2 +-
.../language/xpath/XPathLanguageDefaultSettingsTest.java | 2 +-
.../org/apache/camel/language/xpath/XPathLanguageTest.java | 2 +-
components/camel-schematron/pom.xml | 2 +-
.../camel/component/schematron/SchematronComponentTest.java | 2 +-
.../camel/component/schematron/SchematronEndpointTest.java | 2 +-
.../camel/component/schematron/SchematronProducerTest.java | 2 +-
components/camel-service/pom.xml | 2 +-
.../camel-servicenow/camel-servicenow-component/pom.xml | 2 +-
.../camel/component/servicenow/ServiceNowITSupport.java | 2 +-
.../camel-servicenow/camel-servicenow-maven-plugin/pom.xml | 2 +-
components/camel-servlet/pom.xml | 2 +-
.../servlet/ExposedServletEndpointURIToJMXTest.java | 2 +-
.../component/servlet/ServletCamelRouterTestSupport.java | 2 +-
.../component/servlet/ServletTransferExceptionTest.java | 2 +-
components/camel-shiro/pom.xml | 2 +-
.../shiro/security/ShiroAuthenticationBase64Test.java | 2 +-
...hiroAuthenticationReauthenticateFalseAndNewUserTest.java | 2 +-
.../component/shiro/security/ShiroAuthenticationTest.java | 2 +-
.../component/shiro/security/ShiroAuthorizationTest.java | 2 +-
.../shiro/security/ShiroRolesAuthorizationTest.java | 2 +-
components/camel-sjms/pom.xml | 2 +-
.../apache/camel/component/sjms/ReconnectProducerTest.java | 2 +-
.../apache/camel/component/sjms/SimpleJmsComponentTest.java | 2 +-
.../camel/component/sjms/SjmsComponentRestartTest.java | 2 +-
.../component/sjms/SjmsEndpointConnectionSettingsTest.java | 2 +-
.../camel/component/sjms/SjmsEndpointNameOverrideTest.java | 2 +-
.../org/apache/camel/component/sjms/SjmsEndpointTest.java | 2 +-
.../camel/component/sjms/SjmsSendDynamicAwareTest.java | 4 ++--
.../component/sjms/consumer/AsyncConsumerFalseTest.java | 2 +-
.../component/sjms/consumer/AsyncConsumerInOutTest.java | 2 +-
.../component/sjms/consumer/InOnlyQueueConsumerTest.java | 2 +-
.../component/sjms/consumer/InOnlyTopicConsumerTest.java | 2 +-
.../sjms/consumer/InOutConcurrentConsumerTest.java | 2 +-
.../org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java | 2 +-
.../camel/component/sjms/it/AsyncJmsInOutTempDestIT.java | 2 +-
.../org/apache/camel/component/sjms/it/SyncJmsInOutIT.java | 2 +-
.../camel/component/sjms/it/SyncJmsInOutTempDestIT.java | 2 +-
.../component/sjms/manual/ManualFromQueueManualTest.java | 2 +-
.../component/sjms/producer/AsyncQueueProducerTest.java | 2 +-
.../component/sjms/producer/AsyncTopicProducerTest.java | 2 +-
.../component/sjms/producer/InOnlyTopicProducerTest.java | 2 +-
.../component/sjms/producer/InOutQueueProducerTest.java | 2 +-
.../camel/component/sjms/producer/QueueProducerQoSTest.java | 2 +-
.../camel/component/sjms/support/JmsCommonTestSupport.java | 6 +++---
.../component/sjms/tx/TransactedAsyncExceptionTest.java | 2 +-
.../camel/component/sjms/tx/TransactedConsumerSupport.java | 2 +-
.../camel/component/sjms/tx/TransactedOnCompletionTest.java | 2 +-
.../component/sjms/tx/TransactedQueueInOutProducerTest.java | 2 +-
.../component/sjms/tx/TransactedQueueProducerTest.java | 2 +-
components/camel-sjms2/pom.xml | 2 +-
.../camel/component/sjms2/SimpleJms2ComponentTest.java | 2 +-
.../camel/component/sjms2/Sjms2ComponentRestartTest.java | 2 +-
.../component/sjms2/Sjms2EndpointNameOverrideTest.java | 2 +-
.../org/apache/camel/component/sjms2/Sjms2EndpointTest.java | 2 +-
.../component/sjms2/producer/InOnlyTopicProducerTest.java | 2 +-
.../camel/component/sjms2/support/Jms2TestSupport.java | 4 ++--
components/camel-slack/pom.xml | 2 +-
.../org/apache/camel/component/slack/SlackConsumerTest.java | 2 +-
.../org/apache/camel/component/slack/SlackProducerTest.java | 2 +-
components/camel-smb/pom.xml | 2 +-
.../apache/camel/component/smb/FromSmbToAsciiFileIT.java | 2 +-
.../apache/camel/component/smb/SmbChangedReadLockIT.java | 2 +-
.../camel/component/smb/SmbChangedRootDirReadLockIT.java | 2 +-
.../camel/component/smb/SmbComponentConnectionIT.java | 2 +-
.../java/org/apache/camel/component/smb/SmbComponentIT.java | 2 +-
.../component/smb/SmbConsumerLocalWorkDirectoryIT.java | 6 +++---
.../camel/component/smb/SmbProducerAllowNullBodyIT.java | 2 +-
.../camel/component/smb/SmbProducerDoneFileNameIT.java | 2 +-
.../camel/component/smb/SmbProducerFileExistFailIT.java | 2 +-
.../apache/camel/component/smb/SmbServerTestSupport.java | 2 +-
components/camel-smooks/pom.xml | 2 +-
.../apache/camel/component/smooks/SmooksComponentTest.java | 2 +-
.../apache/camel/component/smooks/SmooksProcessorTest.java | 6 +++---
.../component/smooks/routing/BeanRouterFunctionalTest.java | 2 +-
.../component/smooks/routing/BeanRouterObserverTest.java | 2 +-
.../camel/component/smooks/routing/BeanRouterTest.java | 2 +-
.../camel/dataformat/smooks/SmooksDataFormatTest.java | 2 +-
components/camel-smpp/pom.xml | 2 +-
.../component/smpp/integration/SmppComponentManualIT.java | 2 +-
.../smpp/integration/SmppComponentSpringManualIT.java | 2 +-
.../smpp/integration/SmppConsumerReconnectManualIT.java | 2 +-
.../smpp/integration/SmppProducerReconnectManualIT.java | 2 +-
.../camel/component/smpp/integration/SmppTRXProducerIT.java | 2 +-
.../SmppTRXProducerSupervisingRouteControllerIT.java | 2 +-
components/camel-snakeyaml/pom.xml | 2 +-
.../apache/camel/component/snakeyaml/SnakeYAMLDoSTest.java | 2 +-
.../camel/component/snakeyaml/SnakeYAMLSpringTest.java | 2 +-
.../component/snakeyaml/SnakeYAMLSpringTypeFilterTest.java | 2 +-
.../org/apache/camel/component/snakeyaml/SnakeYAMLTest.java | 10 +++++-----
.../camel/component/snakeyaml/SnakeYAMLTypeFilterTest.java | 2 +-
.../component/snakeyaml/SnakeYAMLUnmarshalTypeTest.java | 2 +-
components/camel-snmp/pom.xml | 2 +-
.../org/apache/camel/component/snmp/SnmpTestSupport.java | 2 +-
components/camel-soap/pom.xml | 4 ++--
.../org/apache/camel/dataformat/soap/SoapClientTest.java | 2 +-
.../org/apache/camel/dataformat/soap/SoapCxfClientTest.java | 2 +-
.../org/apache/camel/dataformat/soap/SoapCxfServerTest.java | 2 +-
.../org/apache/camel/dataformat/soap/SoapMarshalTest.java | 2 +-
.../org/apache/camel/dataformat/soap/SoapRoundtripTest.java | 2 +-
.../org/apache/camel/dataformat/soap/SoapServerTest.java | 2 +-
.../camel/dataformat/soap/SoapSpringRoundtripTest.java | 2 +-
.../camel/dataformat/soap/SoapToSoapDontIgnoreTest.java | 2 +-
.../apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java | 2 +-
.../dataformat/soap/SoapToSoapSingleDataFormatterTest.java | 2 +-
.../org/apache/camel/dataformat/soap/SoapUnMarshalTest.java | 2 +-
.../apache/camel/dataformat/soap12/Soap12MarshalTest.java | 2 +-
.../camel/dataformat/soap12/Soap12SpringRoundtripTest.java | 2 +-
.../apache/camel/dataformat/soap12/Soap12UnMarshalTest.java | 2 +-
components/camel-solr/pom.xml | 2 +-
.../apache/camel/component/solr/InitSolrEndpointTest.java | 2 +-
components/camel-solr/src/test/resources/log4j2.properties | 2 +-
components/camel-splunk-hec/pom.xml | 2 +-
.../splunkhec/integration/SplunkHECITManualTest.java | 2 +-
components/camel-splunk/pom.xml | 2 +-
.../org/apache/camel/component/splunk/ProducerTest.java | 2 +-
.../component/splunk/SplunkComponentConfigurationTest.java | 2 +-
.../camel/component/splunk/SplunkMockTestSupport.java | 2 +-
.../camel/component/splunk/integration/SplunkTest.java | 2 +-
.../camel-spring-ai/camel-spring-ai-chat/pom.xml | 4 ++--
.../camel/component/springai/chat/OllamaTestSupport.java | 2 +-
.../component/springai/chat/SpringAiChatComponentTest.java | 2 +-
.../springai/chat/SpringAiChatToolsDiscoveryTest.java | 2 +-
.../camel-spring-ai/camel-spring-ai-embeddings/pom.xml | 2 +-
.../component/springai/embeddings/OllamaTestSupport.java | 2 +-
.../embeddings/SpringAiEmbeddingsComponentTest.java | 2 +-
.../camel-spring-ai/camel-spring-ai-tools/pom.xml | 4 ++--
.../camel/component/springai/tools/JsonSchemaTest.java | 2 +-
.../springai/tools/SpringAiToolsComponentTest.java | 2 +-
.../camel-spring-ai/camel-spring-ai-vector-store/pom.xml | 2 +-
.../component/springai/vectorstore/QdrantVectorStoreIT.java | 2 +-
.../vectorstore/SpringAiVectorStoreComponentTest.java | 2 +-
components/camel-spring-parent/camel-spring-batch/pom.xml | 4 ++--
.../spring/batch/SpringBatchEndpointDynamicTest.java | 4 ++--
.../component/spring/batch/SpringBatchEndpointTest.java | 2 +-
.../apache/camel/component/spring/batch/SpringBatchIT.java | 2 +-
.../component/spring/batch/SpringBatchJobLauncherIT.java | 2 +-
.../spring/batch/support/CamelItemProcessorTest.java | 2 +-
.../component/spring/batch/support/CamelItemReaderTest.java | 2 +-
.../component/spring/batch/support/CamelItemWriterTest.java | 2 +-
.../spring/batch/support/CamelJobExecutionListenerTest.java | 2 +-
.../camel-spring-parent/camel-spring-cloud-config/pom.xml | 4 ++--
components/camel-spring-parent/camel-spring-jdbc/pom.xml | 2 +-
.../component/spring/jdbc/AbstractJdbcTestSupport.java | 2 +-
.../component/spring/jdbc/JdbcSpringAnotherRouteTest.java | 2 +-
components/camel-spring-parent/camel-spring-ldap/pom.xml | 2 +-
.../camel/component/springldap/SpringLdapComponentTest.java | 2 +-
.../camel/component/springldap/SpringLdapProducerTest.java | 2 +-
components/camel-spring-parent/camel-spring-main/pom.xml | 2 +-
.../org/apache/camel/spring/MisspelledRouteRefTest.java | 2 +-
.../apache/camel/spring/SpringMainStartFailedIssueTest.java | 4 ++--
.../camel-spring-parent/camel-spring-rabbitmq/pom.xml | 2 +-
.../springrabbit/SpringRabbitMQSendDynamicAwareTest.java | 2 +-
.../springrabbit/integration/RabbitMQITSupport.java | 2 +-
components/camel-spring-parent/camel-spring-redis/pom.xml | 4 ++--
.../org/apache/camel/component/redis/RedisConsumerTest.java | 2 +-
.../camel/component/redis/RedisRemoveEndpointTest.java | 2 +-
.../apache/camel/component/redis/RedisRemoveRouteTest.java | 2 +-
.../org/apache/camel/component/redis/RedisTestSupport.java | 2 +-
.../redis/integration/RedisComponentSpringManualIT.java | 2 +-
.../idempotent/RedisStringIdempotentRepositoryManualIT.java | 2 +-
.../camel-spring-parent/camel-spring-security/pom.xml | 2 +-
.../security/SpringSecurityAuthorizationPolicyTest.java | 2 +-
components/camel-spring-parent/camel-spring-ws/pom.xml | 2 +-
.../camel/component/spring/ws/ConsumerBreadcrumbIdTest.java | 4 ++--
.../ws/ConsumerEndpointMappingByBeanNameRouteTest.java | 2 +-
.../ConsumerEndpointMappingResponseHandlingRouteTest.java | 2 +-
.../spring/ws/ConsumerEndpointMappingRouteTest.java | 2 +-
.../spring/ws/ConsumerExceptionPropagationRouteTest.java | 4 ++--
.../component/spring/ws/ConsumerMarshallingRouteTest.java | 4 ++--
.../spring/ws/MessageFilterResolvingDefaultsTest.java | 2 +-
.../component/spring/ws/MessageFilterResolvingTest.java | 2 +-
.../camel/component/spring/ws/ProducerLocalRouteTest.java | 2 +-
.../component/spring/ws/ProducerRemoteRouteManualTest.java | 2 +-
.../spring/ws/ProducerRemoteRouteTimeOutManualTest.java | 2 +-
.../apache/camel/component/spring/ws/SoapHeaderTest.java | 2 +-
.../component/spring/ws/SoapResponseAttachmentTest.java | 2 +-
.../component/spring/ws/addressing/AbstractWSATests.java | 2 +-
.../spring/ws/addressing/CamelDirectSenderTest.java | 2 +-
.../ws/addressing/ConsumerWSAEndpointMappingRouteTest.java | 2 +-
.../addressing/ConsumerWSANewChannelParamsActionTests.java | 2 +-
.../ws/addressing/ConsumerWSANewChannelParamsToTests.java | 2 +-
.../addressing/ConsumerWSASameChannelParamsActionTests.java | 2 +-
.../ws/addressing/ConsumerWSASameChannelParamsToTests.java | 2 +-
.../spring/ws/addressing/ProducerParamsBasicTest.java | 2 +-
.../spring/ws/addressing/ProducerParamsPrecedenceTest.java | 2 +-
.../spring/ws/filter/impl/BasicMessageFilterTest.java | 2 +-
.../ws/security/ProducerWss4JSecurityHeaderManualTest.java | 2 +-
components/camel-spring-parent/camel-spring-xml/pom.xml | 2 +-
.../org/apache/camel/spring/SpringMDCTransactedTest.java | 2 +-
.../java/org/apache/camel/spring/issues/Camel14624Test.java | 2 +-
.../camel-undertow-spring-security/pom.xml | 2 +-
.../security/AbstractSpringSecurityBearerTokenTest.java | 2 +-
.../apache/camel/component/spring/security/NoTokenTest.java | 2 +-
.../spring/security/SpringSecurityBearerTokenTest.java | 2 +-
components/camel-sql/pom.xml | 2 +-
.../apache/camel/component/sql/CamelSqlEmptyResultTest.java | 2 +-
.../camel/component/sql/ProducerBatchSimpleExpTest.java | 2 +-
.../camel/component/sql/SpringSqlEndpointLikeTest.java | 2 +-
.../apache/camel/component/sql/SpringSqlMultilineTest.java | 2 +-
.../apache/camel/component/sql/SqlAggregateBatchTest.java | 4 ++--
.../component/sql/SqlConsumerDeleteBatchCompleteTest.java | 2 +-
.../camel/component/sql/SqlConsumerDeleteFailedTest.java | 2 +-
.../apache/camel/component/sql/SqlConsumerDeleteTest.java | 2 +-
.../camel/component/sql/SqlConsumerDeleteTransformTest.java | 2 +-
.../component/sql/SqlConsumerDynamicParameterTest.java | 2 +-
.../camel/component/sql/SqlConsumerFetchSizeTest.java | 2 +-
.../component/sql/SqlConsumerMaxMessagesPerPollTest.java | 2 +-
.../component/sql/SqlConsumerOutputTypeSelectListTest.java | 4 ++--
.../sql/SqlConsumerOutputTypeSelectListWithClassTest.java | 4 ++--
.../component/sql/SqlConsumerOutputTypeStreamListTest.java | 2 +-
.../org/apache/camel/component/sql/SqlConsumerTest.java | 2 +-
.../apache/camel/component/sql/SqlDataSourceRefTest.java | 4 ++--
.../org/apache/camel/component/sql/SqlDataSourceTest.java | 4 ++--
.../apache/camel/component/sql/SqlDynamicKameletTest.java | 2 +-
.../org/apache/camel/component/sql/SqlEndpointLikeTest.java | 2 +-
.../sql/SqlEndpointMisconfigureDataSourceTest.java | 2 +-
.../org/apache/camel/component/sql/SqlEndpointTest.java | 2 +-
.../camel/component/sql/SqlGeneratedKeysInLoopTest.java | 2 +-
.../apache/camel/component/sql/SqlGeneratedKeysTest.java | 2 +-
.../apache/camel/component/sql/SqlPreserveHeaderTest.java | 2 +-
.../sql/SqlProducerAlwaysPopulateStatementFalseTest.java | 4 ++--
.../sql/SqlProducerAlwaysPopulateStatementTest.java | 4 ++--
.../apache/camel/component/sql/SqlProducerAndInTest.java | 2 +-
.../camel/component/sql/SqlProducerConcurrentTest.java | 4 ++--
.../component/sql/SqlProducerCustomDataSourceTest.java | 2 +-
.../component/sql/SqlProducerExpressionParameterTest.java | 4 ++--
.../camel/component/sql/SqlProducerFetchSizeTest.java | 2 +-
.../apache/camel/component/sql/SqlProducerInBodyTest.java | 2 +-
.../apache/camel/component/sql/SqlProducerInMultiTest.java | 2 +-
.../org/apache/camel/component/sql/SqlProducerInTest.java | 2 +-
.../camel/component/sql/SqlProducerInVariablesTest.java | 2 +-
.../sql/SqlProducerInsertNonNamedParametersTest.java | 4 ++--
.../camel/component/sql/SqlProducerInsertNullTest.java | 4 ++--
.../org/apache/camel/component/sql/SqlProducerJSONTest.java | 2 +-
.../sql/SqlProducerNamedParameterNotExistTest.java | 2 +-
.../camel/component/sql/SqlProducerNamedParameterTest.java | 4 ++--
.../camel/component/sql/SqlProducerNamedParametersTest.java | 4 ++--
.../org/apache/camel/component/sql/SqlProducerNoopTest.java | 2 +-
.../camel/component/sql/SqlProducerNullBodyHeaderTest.java | 4 ++--
.../apache/camel/component/sql/SqlProducerNullBodyTest.java | 4 ++--
.../camel/component/sql/SqlProducerOutputHeaderTest.java | 2 +-
.../component/sql/SqlProducerOutputHeaderWithQueryTest.java | 2 +-
.../component/sql/SqlProducerOutputTypeSelectListTest.java | 4 ++--
.../sql/SqlProducerOutputTypeSelectListWithClassTest.java | 4 ++--
.../sql/SqlProducerOutputTypeSelectOneNoResultTest.java | 2 +-
.../component/sql/SqlProducerOutputTypeStreamListTest.java | 2 +-
.../camel/component/sql/SqlProducerParametersCountTest.java | 4 ++--
.../camel/component/sql/SqlProducerReuseParameterTest.java | 4 ++--
.../camel/component/sql/SqlProducerSeparatorTest.java | 2 +-
.../org/apache/camel/component/sql/SqlProducerToDTest.java | 2 +-
.../component/sql/SqlProducerUseMessageBodyForSqlTest.java | 4 ++--
.../camel/component/sql/SqlProducerWhereIssueTest.java | 2 +-
.../java/org/apache/camel/component/sql/SqlRouteTest.java | 4 ++--
.../apache/camel/component/sql/SqlTransactedRouteTest.java | 2 +-
.../component/sql/stored/CallableStatementWrapperTest.java | 2 +-
.../org/apache/camel/component/sql/stored/ParserTest.java | 2 +-
.../component/sql/stored/ProducerBatchInvalidTest.java | 4 ++--
.../camel/component/sql/stored/ProducerBatchTest.java | 2 +-
.../camel/component/sql/stored/ProducerBodyArrayTest.java | 2 +-
.../camel/component/sql/stored/ProducerInOutTest.java | 2 +-
.../component/sql/stored/ProducerNamedParameterTest.java | 2 +-
.../org/apache/camel/component/sql/stored/ProducerTest.java | 2 +-
.../sql/stored/ProducerUseMessageBodyForTemplateTest.java | 2 +-
.../component/sql/stored/SqlFunctionDataSourceTest.java | 2 +-
.../camel/component/sql/stored/SqlStoredDataSourceTest.java | 2 +-
.../camel/component/sql/stored/TemplateCacheTest.java | 2 +-
.../jdbc/AbstractClusteredJdbcAggregationTestSupport.java | 2 +-
.../aggregate/jdbc/AbstractJdbcAggregationTestSupport.java | 2 +-
.../aggregate/jdbc/JdbcAggregateStoreAsText2Test.java | 2 +-
.../aggregate/jdbc/JdbcAggregateStoreAsTextTest.java | 2 +-
.../jdbc/JdbcAggregationRepositoryMultipleRepoTest.java | 2 +-
.../camel/processor/aggregate/jdbc/JdbcCamelCodecTest.java | 2 +-
.../JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java | 2 +-
.../processor/aggregate/jdbc/JdbcSpringAggregateTest.java | 2 +-
.../jdbc/CustomizedJdbcMessageIdRepositoryTest.java | 2 +-
.../idempotent/jdbc/JdbcCachedMessageIdRepositoryTest.java | 2 +-
.../jdbc/JdbcMessageIdRepositoryCustomTableNameTest.java | 2 +-
.../idempotent/jdbc/JdbcMessageIdRepositoryTest.java | 2 +-
components/camel-ssh/pom.xml | 2 +-
.../camel/component/ssh/SshAlgorithmParametersTest.java | 2 +-
.../apache/camel/component/ssh/SshComponentTestSupport.java | 2 +-
components/camel-stax/pom.xml | 2 +-
.../camel/component/stax/IssueWithWrongEncodingTest.java | 2 +-
.../stax/SpringStAXJAXBIteratorExpressionTest.java | 2 +-
.../apache/camel/component/stax/StAXComponentRefTest.java | 2 +-
.../org/apache/camel/component/stax/StAXComponentTest.java | 2 +-
.../component/stax/StAXJAXBIteratorExpressionTest.java | 2 +-
.../stax/StAXXPathSplitChoicePerformanceManualTest.java | 6 +++---
.../language/xtokenizer/SplitGroupMultiXmlTokenTest.java | 4 ++--
.../xtokenizer/SplitGroupWrappedMultiXmlTokenTest.java | 4 ++--
.../camel/language/xtokenizer/SpringXMLTokenSplitTest.java | 4 ++--
.../apache/camel/language/xtokenizer/XMLTokenSplitTest.java | 4 ++--
.../xtokenizer/XMLTokenizeLanguageGroupingTest.java | 2 +-
.../xtokenizer/XMLTokenizeLanguageStreamingFileTest.java | 4 ++--
.../camel/language/xtokenizer/XMLTokenizeLanguageTest.java | 2 +-
.../xtokenizer/XMLTokenizeWrapLanguageGroupingTest.java | 2 +-
.../language/xtokenizer/XMLTokenizeWrapLanguageTest.java | 2 +-
components/camel-stitch/pom.xml | 2 +-
.../apache/camel/component/stitch/StitchComponentTest.java | 2 +-
.../apache/camel/component/stitch/StitchProducerTest.java | 2 +-
.../component/stitch/integration/StitchProducerIT.java | 2 +-
.../stitch/operations/StitchProducerOperationsTest.java | 2 +-
.../operations/integration/StitchProducerOperationsIT.java | 2 +-
components/camel-stomp/pom.xml | 2 +-
.../org/apache/camel/component/stomp/StompBaseTest.java | 2 +-
components/camel-stream/pom.xml | 2 +-
.../apache/camel/component/stream/ScanStreamDelayTest.java | 6 +++---
.../camel/component/stream/ScanStreamFileManualTest.java | 6 +++---
.../apache/camel/component/stream/ScanStreamFileTest.java | 6 +++---
.../component/stream/ScanStreamFileWithFilterTest.java | 6 +++---
.../apache/camel/component/stream/SplitStreamFileTest.java | 6 +++---
.../org/apache/camel/component/stream/StreamDelayTest.java | 2 +-
.../apache/camel/component/stream/StreamEncodingTest.java | 2 +-
.../org/apache/camel/component/stream/StreamFileTest.java | 6 +++---
.../apache/camel/component/stream/StreamGroupLinesTest.java | 6 +++---
.../org/apache/camel/component/stream/StreamHeaderTest.java | 2 +-
.../camel/component/stream/StreamRouteBuilderTest.java | 2 +-
.../apache/camel/component/stream/StreamSystemErrTest.java | 2 +-
.../component/stream/StreamSystemOutNewLineOffTest.java | 2 +-
.../apache/camel/component/stream/StreamSystemOutTest.java | 2 +-
components/camel-stringtemplate/pom.xml | 2 +-
.../stringtemplate/StringTemplateConcurrentTest.java | 4 ++--
.../stringtemplate/StringTemplateContentCacheTest.java | 2 +-
.../stringtemplate/StringTemplateCustomDelimiterTest.java | 2 +-
.../component/stringtemplate/StringTemplateLetterTest.java | 2 +-
.../component/stringtemplate/StringTemplateRefTest.java | 2 +-
.../camel/component/stringtemplate/StringTemplateTest.java | 2 +-
.../stringtemplate/StringTemplateViaHeaderTest.java | 2 +-
components/camel-stripe/pom.xml | 2 +-
.../stripe/integration/StripeIntegrationTestSupport.java | 2 +-
components/camel-swift/pom.xml | 4 ++--
.../dataformat/swift/mt/SpringSwiftMtDataFormatTest.java | 2 +-
.../camel/dataformat/swift/mt/SwiftMtDataFormatTest.java | 2 +-
.../dataformat/swift/mx/SpringSwiftMxDataFormatTest.java | 2 +-
.../camel/dataformat/swift/mx/SwiftMxDataFormatTest.java | 2 +-
components/camel-syslog/pom.xml | 2 +-
.../camel/component/syslog/AutomatedConversionTest.java | 2 +-
.../apache/camel/component/syslog/MinaDataFormatTest.java | 2 +-
.../camel/component/syslog/MinaManyUDPMessagesTest.java | 2 +-
.../apache/camel/component/syslog/NettyDataFormatTest.java | 2 +-
.../camel/component/syslog/NettyManyUDPMessagesTest.java | 2 +-
.../camel/component/syslog/NettyRfc5425LongMessageTest.java | 2 +-
.../org/apache/camel/component/syslog/NettyRfc5425Test.java | 2 +-
.../apache/camel/component/syslog/SyslogSpringMinaTest.java | 2 +-
.../camel/component/syslog/SyslogSpringNettyTest.java | 2 +-
components/camel-tahu/pom.xml | 2 +-
.../apache/camel/component/tahu/SparkplugTCKService.java | 2 +-
.../apache/camel/component/tahu/TahuConfigurationTest.java | 4 ++--
components/camel-tarfile/pom.xml | 4 ++--
.../dataformat/tarfile/SpringTarFileDataFormatTest.java | 4 ++--
.../dataformat/tarfile/SpringTarSplitterRouteTest.java | 2 +-
.../camel/dataformat/tarfile/TarFileDataFormatTest.java | 4 ++--
.../camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java | 4 ++--
.../dataformat/tarfile/TarFileSplitIteratorCorruptTest.java | 2 +-
.../camel/dataformat/tarfile/TarSplitterRouteIssueTest.java | 4 ++--
.../camel/dataformat/tarfile/TarSplitterRouteTest.java | 2 +-
.../tarfile/AggregationStrategyWithFilenameHeaderTest.java | 4 ++--
.../tarfile/AggregationStrategyWithPreservationTest.java | 4 ++--
.../tarfile/TarAggregationStrategyEmptyFirstFileTest.java | 4 ++--
.../tarfile/TarAggregationStrategyNullBodyTest.java | 4 ++--
.../aggregate/tarfile/TarAggregationStrategyTest.java | 4 ++--
components/camel-telegram/pom.xml | 2 +-
.../camel/component/telegram/TelegramChatBotTest.java | 2 +-
.../telegram/TelegramConsumerFallbackConversionTest.java | 2 +-
.../component/telegram/TelegramConsumerMediaPhotoTest.java | 2 +-
.../camel/component/telegram/util/TelegramTestSupport.java | 2 +-
components/camel-telemetry-dev/pom.xml | 2 +-
.../camel/telemetrydev/SpanPropagationDownstreamTest.java | 2 +-
.../camel/telemetrydev/TelemetryDevTracerTestSupport.java | 2 +-
components/camel-telemetry/pom.xml | 2 +-
.../test/java/org/apache/camel/telemetry/AsyncCXFTest.java | 2 +-
.../java/org/apache/camel/telemetry/AsyncDirectTest.java | 2 +-
.../src/test/java/org/apache/camel/telemetry/AsyncTest.java | 2 +-
.../java/org/apache/camel/telemetry/AsyncWiretapTest.java | 2 +-
.../org/apache/camel/telemetry/DisableEndpointTest.java | 2 +-
.../org/apache/camel/telemetry/EnableProcessorsTest.java | 2 +-
.../java/org/apache/camel/telemetry/HeadersTraceTest.java | 2 +-
.../apache/camel/telemetry/SpanLifecycleManagerTest.java | 2 +-
.../camel/telemetry/SpanPropagationDownstreamTest.java | 2 +-
.../apache/camel/telemetry/SpanPropagationUpstreamTest.java | 2 +-
.../camel/telemetry/SpanStorageManagerExchangeTest.java | 2 +-
components/camel-test/camel-test-junit5/pom.xml | 12 ++++++++++++
components/camel-test/camel-test-junit6/pom.xml | 12 ------------
components/camel-test/camel-test-main-junit6/pom.xml | 13 -------------
components/camel-test/camel-test-spring-junit6/pom.xml | 12 ------------
components/camel-threadpoolfactory-vertx/pom.xml | 2 +-
.../apache/camel/reactive/SplitCustomThreadPoolTest.java | 2 +-
.../apache/camel/reactive/SplitParallelLookupVertxTest.java | 2 +-
.../java/org/apache/camel/reactive/SplitParallelTest.java | 2 +-
components/camel-thrift/pom.xml | 2 +-
.../camel/component/thrift/ThriftConsumerAsyncTest.java | 2 +-
.../component/thrift/ThriftConsumerConcurrentTest.java | 2 +-
.../camel/component/thrift/ThriftConsumerSecurityTest.java | 2 +-
.../camel/component/thrift/ThriftConsumerSyncTest.java | 2 +-
.../component/thrift/ThriftConsumerZlibCompressionTest.java | 2 +-
.../camel/component/thrift/ThriftProducerBaseTest.java | 2 +-
.../camel/component/thrift/ThriftProducerSecurityTest.java | 2 +-
.../component/thrift/ThriftProducerZlibCompressionTest.java | 2 +-
.../component/thrift/local/ThriftThreadPoolServerTest.java | 2 +-
.../thrift/ThriftMarshalAndUnmarshalJsonTest.java | 2 +-
.../thrift/ThriftMarshalAndUnmarshalSpringTest.java | 2 +-
.../dataformat/thrift/ThriftMarshalAndUnmarshalTest.java | 2 +-
components/camel-thymeleaf/pom.xml | 2 +-
.../component/thymeleaf/ThymeleafAbstractBaseTest.java | 2 +-
.../camel/component/thymeleaf/ThymeleafComponentTest.java | 2 +-
.../camel/component/thymeleaf/ThymeleafConcurrentTest.java | 2 +-
.../camel/component/thymeleaf/ThymeleafSetHeaderTest.java | 2 +-
components/camel-tika/pom.xml | 2 +-
.../org/apache/camel/component/tika/TikaDetectTest.java | 2 +-
.../java/org/apache/camel/component/tika/TikaParseTest.java | 2 +-
components/camel-tracing/pom.xml | 2 +-
.../org/apache/camel/tracing/ActiveSpanManagerTest.java | 2 +-
components/camel-twilio/pom.xml | 2 +-
.../camel/component/twilio/AbstractTwilioTestSupport.java | 4 ++--
components/camel-twitter/pom.xml | 2 +-
.../camel/component/twitter/CamelTwitterITSupport.java | 4 ++--
components/camel-undertow/pom.xml | 4 ++--
.../apache/camel/component/undertow/BaseUndertowTest.java | 2 +-
.../component/undertow/UndertowHttpProducerSessionTest.java | 2 +-
.../component/undertow/UndertowPrefixMatchingTest.java | 2 +-
.../UndertowProducerThrowExceptionOnFailureTest.java | 2 +-
.../camel/component/undertow/UndertowSuspendResumeTest.java | 2 +-
.../undertow/cloud/UndertowServiceCallRouteTest.java | 2 +-
.../undertow/rest/RestUndertowContentTypeTest.java | 2 +-
.../undertow/rest/RestUndertowMethodNotAllowedTest.java | 2 +-
.../undertow/rest/RestUndertowProducerGetPojoTest.java | 2 +-
.../undertow/spi/SecurityProviderHttpHandlerTest.java | 2 +-
.../undertow/spi/SecurityProviderNoAcceptanceTest.java | 2 +-
.../spi/SecurityProviderRolesFromComponentTest.java | 2 +-
.../camel/component/undertow/spi/SecurityProviderTest.java | 2 +-
.../undertow/spi/SecurityProviderWithoutProviderTest.java | 2 +-
components/camel-univocity-parsers/pom.xml | 2 +-
.../univocity/UniVocityCsvDataFormatMarshalSpringTest.java | 4 ++--
.../univocity/UniVocityCsvDataFormatMarshalTest.java | 4 ++--
.../UniVocityCsvDataFormatUnmarshalSpringTest.java | 4 ++--
.../univocity/UniVocityCsvDataFormatUnmarshalTest.java | 4 ++--
.../UniVocityFixedDataFormatMarshalSpringTest.java | 4 ++--
.../univocity/UniVocityFixedDataFormatMarshalTest.java | 4 ++--
.../UniVocityFixedDataFormatUnmarshalSpringTest.java | 4 ++--
.../univocity/UniVocityFixedDataFormatUnmarshalTest.java | 4 ++--
.../univocity/UniVocityTsvDataFormatMarshalSpringTest.java | 4 ++--
.../univocity/UniVocityTsvDataFormatMarshalTest.java | 4 ++--
.../UniVocityTsvDataFormatUnmarshalSpringTest.java | 4 ++--
.../univocity/UniVocityTsvDataFormatUnmarshalTest.java | 4 ++--
components/camel-velocity/pom.xml | 2 +-
.../component/velocity/VelocityBodyAsDomainObjectTest.java | 2 +-
.../camel/component/velocity/VelocityConcurrentTest.java | 4 ++--
.../camel/component/velocity/VelocityContentCacheTest.java | 2 +-
.../component/velocity/VelocityDynamicTemplateTest.java | 2 +-
.../apache/camel/component/velocity/VelocityLetterTest.java | 2 +-
.../component/velocity/VelocityMethodInvokationTest.java | 2 +-
.../component/velocity/VelocityOverridesPropertiesTest.java | 2 +-
.../camel/component/velocity/VelocitySetHeaderTest.java | 2 +-
.../velocity/VelocitySetTemplateViaHeaderTest.java | 2 +-
.../velocity/VelocitySomeValuesNotInExchangeTest.java | 2 +-
.../component/velocity/VelocitySupplementalContextTest.java | 2 +-
.../component/velocity/VelocityTemplateInHeaderTest.java | 4 ++--
.../org/apache/camel/component/velocity/VelocityTest.java | 2 +-
.../component/velocity/VelocityValuesInPropertiesTest.java | 2 +-
components/camel-vertx/camel-vertx-http/pom.xml | 2 +-
.../component/vertx/http/VertxHttpBufferConverterTest.java | 2 +-
.../camel/component/vertx/http/VertxHttpConsumerTest.java | 2 +-
.../camel/component/vertx/http/VertxHttpTestSupport.java | 2 +-
components/camel-vertx/camel-vertx-websocket/pom.xml | 2 +-
.../vertx/websocket/VertxWebSocketTestSupport.java | 2 +-
components/camel-vertx/camel-vertx/pom.xml | 2 +-
.../apache/camel/component/vertx/VertxBaseTestSupport.java | 2 +-
.../camel/component/vertx/VertxBufferConverterTest.java | 2 +-
.../camel/component/vertx/VertxJsonArrayConverterTest.java | 2 +-
.../camel/component/vertx/VertxJsonObjectConverterTest.java | 2 +-
components/camel-wasm/pom.xml | 2 +-
components/camel-weather/pom.xml | 2 +-
.../camel/component/weather/BaseWeatherConsumerIT.java | 6 +++---
.../CurrentWeatherConsumerGeolocationProviderTest.java | 2 +-
.../component/weather/CurrentWeatherConsumerHtmlIT.java | 2 +-
.../camel/component/weather/CurrentWeatherConsumerIT.java | 2 +-
.../component/weather/CurrentWeatherConsumerXmlIT.java | 2 +-
.../component/weather/CurrentWeatherMadridProducerIT.java | 2 +-
components/camel-web3j/pom.xml | 2 +-
.../apache/camel/component/web3j/Web3jMockTestSupport.java | 2 +-
.../web3j/integration/Web3jIntegrationTestSupport.java | 2 +-
components/camel-webhook/pom.xml | 2 +-
.../org/apache/camel/component/webhook/WebhookTestBase.java | 2 +-
components/camel-whatsapp/pom.xml | 2 +-
.../camel/component/whatsapp/WhatsAppTestSupport.java | 2 +-
components/camel-wordpress/pom.xml | 2 +-
.../camel/component/wordpress/WordpressComponentTest.java | 2 +-
.../component/wordpress/WordpressComponentTestSupport.java | 2 +-
components/camel-workday/pom.xml | 2 +-
.../java/org/apache/camel/WorkdayCommonAPIProducerTest.java | 2 +-
.../java/org/apache/camel/WorkdayReportProducerTest.java | 2 +-
components/camel-xchange/pom.xml | 2 +-
.../apache/camel/component/xchange/XChangeTestSupport.java | 2 +-
components/camel-xj/pom.xml | 2 +-
.../org/apache/camel/component/xj/J2XInputStreamTest.java | 2 +-
.../org/apache/camel/component/xj/J2XOutputBytesTest.java | 2 +-
.../org/apache/camel/component/xj/J2XOutputFileTest.java | 2 +-
.../apache/camel/component/xj/J2XOutputIdentityTest.java | 2 +-
.../org/apache/camel/component/xj/J2XOutputStringTest.java | 2 +-
.../org/apache/camel/component/xj/X2JInputStreamTest.java | 2 +-
.../org/apache/camel/component/xj/X2JOutputBytesTest.java | 2 +-
.../org/apache/camel/component/xj/X2JOutputFileTest.java | 2 +-
.../apache/camel/component/xj/X2JOutputIdentityTest.java | 2 +-
.../org/apache/camel/component/xj/X2JOutputStringTest.java | 2 +-
components/camel-xmlsecurity/pom.xml | 4 ++--
.../camel/component/xmlsecurity/SignatureAlgorithmTest.java | 4 ++--
.../component/xmlsecurity/SignatureDigestMethodTest.java | 4 ++--
.../camel/component/xmlsecurity/SpringXmlSignatureTest.java | 4 ++--
.../component/xmlsecurity/XAdESSignaturePropertiesTest.java | 4 ++--
.../camel/component/xmlsecurity/XmlSignatureTest.java | 4 ++--
.../dataformat/xmlsecurity/EncryptionAlgorithmTest.java | 2 +-
.../xmlsecurity/SpringXmlSecurityDataFormatTest.java | 2 +-
.../SpringXmlSecurityDataFormatWithKeyPasswordTest.java | 2 +-
.../camel/dataformat/xmlsecurity/XMLEncryption11Test.java | 2 +-
.../dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java | 4 ++--
.../dataformat/xmlsecurity/XMLSecurityDataFormatTest.java | 2 +-
components/camel-xmpp/pom.xml | 2 +-
.../org/apache/camel/component/xmpp/GoogleTalkTest.java | 2 +-
.../apache/camel/component/xmpp/XmppBaseContainerTest.java | 2 +-
.../apache/camel/component/xmpp/integration/XmppBaseIT.java | 2 +-
.../xmpp/integration/XmppProducerConcurrentIT.java | 2 +-
components/camel-xslt-saxon/pom.xml | 2 +-
.../component/xslt/PayloadWithDefaultNamespaceTest.java | 2 +-
.../camel/component/xslt/SaxonInvalidXsltFileTest.java | 2 +-
.../apache/camel/component/xslt/SaxonUriResolverTest.java | 2 +-
.../camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java | 2 +-
.../component/xslt/SaxonXsltComponentConfigurationTest.java | 2 +-
.../org/apache/camel/component/xslt/SaxonXsltDTDTest.java | 2 +-
.../component/xslt/SaxonXsltEndpointConfigurationTest.java | 2 +-
.../camel/component/xslt/SaxonXsltFeatureRouteTest.java | 2 +-
.../camel/component/xslt/SaxonXsltMessageTerminateTest.java | 4 ++--
.../java/org/apache/camel/component/xslt/SaxonXsltTest.java | 2 +-
.../component/xslt/SaxonXsltXsltMessageLoggerTest.java | 2 +-
.../apache/camel/component/xslt/XsltRouteAllowStAXTest.java | 2 +-
.../xslt/XsltTemplateFromHeaderOverrideEndpointUriTest.java | 2 +-
.../xslt/extensions/SaxonExtensionFunctionsTest.java | 2 +-
.../xslt/extensions/SaxonSpringExtensionFunctionsTest.java | 2 +-
.../camel/component/xslt/saxon/SAXSourceLogBodyTest.java | 2 +-
.../component/xslt/saxon/XsltAggregationStrategyTest.java | 2 +-
.../camel/component/xslt/saxon/XsltSaxonJsonBodyTest.java | 2 +-
.../apache/camel/component/xslt/saxon/XsltSaxonTest.java | 2 +-
components/camel-zeebe/pom.xml | 2 +-
.../apache/camel/component/zeebe/ResourceDeploymentIT.java | 2 +-
.../java/org/apache/camel/component/zeebe/ThrowErrorIT.java | 2 +-
.../org/apache/camel/component/zeebe/ZeebeConsumerIT.java | 2 +-
components/camel-zendesk/pom.xml | 2 +-
.../camel/component/zendesk/AbstractZendeskTestSupport.java | 4 ++--
components/camel-zip-deflater/pom.xml | 2 +-
.../dataformat/deflater/GzipDataFormatFileDeleteTest.java | 4 ++--
.../deflater/GzipDataFormatFileUnmarshalDeleteTest.java | 4 ++--
.../camel/dataformat/deflater/GzipDataFormatTest.java | 2 +-
.../deflater/ZipDeflaterDataFormatFileDeleteTest.java | 4 ++--
.../ZipDeflaterDataFormatFileUnmarshalDeleteTest.java | 4 ++--
.../dataformat/deflater/ZipDeflaterDataFormatTest.java | 2 +-
components/camel-zipfile/pom.xml | 4 ++--
.../dataformat/zipfile/SpringZipSplitterRouteTest.java | 2 +-
.../camel/dataformat/zipfile/ZipFileDataFormatTest.java | 6 +++---
.../dataformat/zipfile/ZipFileIteratorDataFormatTest.java | 2 +-
.../zipfile/ZipFileMultipleFilesSplitterTest.java | 2 +-
.../camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java | 4 ++--
.../dataformat/zipfile/ZipFileSplitIteratorCorruptTest.java | 2 +-
.../dataformat/zipfile/ZipFileSplitIteratorEmptyTest.java | 2 +-
.../camel/dataformat/zipfile/ZipFileSplitOneFileTest.java | 4 ++--
.../camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java | 4 ++--
.../camel/dataformat/zipfile/ZipSplitterRouteTest.java | 2 +-
.../zipfile/ZipSplitterUseOriginalMessageTest.java | 2 +-
.../zipfile/AggregationStrategyWithFilenameHeaderTest.java | 4 ++--
.../zipfile/AggregationStrategyWithPreservationTest.java | 4 ++--
.../zipfile/ZipAggregationStrategyEmptyFileTest.java | 4 ++--
.../zipfile/ZipAggregationStrategyNullBodyTest.java | 4 ++--
.../zipfile/ZipAggregationStrategySplitEmptyBodyTest.java | 2 +-
.../aggregate/zipfile/ZipAggregationStrategySplitTest.java | 4 ++--
.../aggregate/zipfile/ZipAggregationStrategyTest.java | 4 ++--
.../zipfile/ZipSplitAggregateTransactedIssueTest.java | 2 +-
.../ZipSplitAggregateTransactedStreamingIssueTest.java | 2 +-
components/camel-zookeeper-master/pom.xml | 4 ++--
.../camel/component/zookeepermaster/MasterEndpointIT.java | 2 +-
.../component/zookeepermaster/MasterQuartzEndpointIT.java | 2 +-
.../camel/component/zookeepermaster/group/GroupIT.java | 2 +-
components/camel-zookeeper/pom.xml | 4 ++--
.../camel/component/zookeeper/ZooKeeperEndpointTest.java | 2 +-
.../integration/SpringZooKeeperServiceCallRouteIT.java | 2 +-
.../cloud/integration/ZooKeeperServiceCallRouteIT.java | 2 +-
.../integration/ZooKeeperServiceRegistrationITBase.java | 2 +-
.../SpringZooKeeperClusteredRouteConfigurationIT.java | 2 +-
.../component/zookeeper/integration/ZooKeeperITSupport.java | 2 +-
.../zookeeper/integration/ZooKeeperProducerIT.java | 2 +-
core/camel-main/pom.xml | 2 +-
.../junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java | 1 -
.../test/junit5/patterns/IsMockEndpointsJUnit5Test.java | 1 -
.../junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java | 1 +
.../test/junit5/patterns/IsMockEndpointsJUnit5Test.java | 1 +
dsl/camel-cli-connector/pom.xml | 2 +-
dsl/camel-componentdsl/pom.xml | 2 +-
.../builder/component/ComponentsBuilderFactoryTest.java | 2 +-
dsl/camel-dsl-modeline/pom.xml | 2 +-
.../apache/camel/dsl/modeline/JBangModelineParserTest.java | 2 +-
dsl/camel-endpointdsl/pom.xml | 2 +-
.../apache/camel/builder/endpoint/BaseEndpointDslTest.java | 2 +-
.../builder/endpoint/CamelContextReloadStrategyTest.java | 2 +-
.../endpoint/FileBatchConsumerMemoryLeakManualTest.java | 2 +-
.../camel/builder/endpoint/FileConsumeCharsetTest.java | 2 +-
.../org/apache/camel/builder/endpoint/FileDelayTest.java | 2 +-
.../apache/camel/builder/endpoint/HttpsBasicAuthTest.java | 2 +-
.../java/org/apache/camel/builder/endpoint/HttpsTest.java | 2 +-
.../java/org/apache/camel/builder/endpoint/PahoTest.java | 2 +-
.../camel/builder/endpoint/PollDynamicFileNameTest.java | 2 +-
.../apache/camel/builder/endpoint/PollEnrichFilterTest.java | 2 +-
.../java/org/apache/camel/builder/endpoint/QuartzTest.java | 2 +-
.../java/org/apache/camel/builder/endpoint/SqlTest.java | 2 +-
dsl/camel-java-joor-dsl/pom.xml | 2 +-
dsl/camel-jbang/camel-jbang-core/pom.xml | 2 +-
.../src/main/resources/templates/main-kubernetes-pom.tmpl | 2 +-
.../src/main/resources/templates/main-pom.tmpl | 2 +-
.../resources/templates/spring-boot-kubernetes-pom.tmpl | 2 +-
.../src/main/resources/templates/spring-boot-pom.tmpl | 2 +-
.../src/test/resources/pom-xml-files/main-pom.xml | 2 +-
.../src/test/resources/pom-xml-files/springboot-pom.xml | 2 +-
dsl/camel-jbang/camel-jbang-it/pom.xml | 2 +-
dsl/camel-jbang/camel-jbang-plugin-kubernetes/pom.xml | 2 +-
dsl/camel-jbang/camel-jbang-plugin-test/pom.xml | 2 +-
dsl/camel-xml-io-dsl/pom.xml | 2 +-
.../dsl/xml/io/reload/RouteWatcherReloadStrategyTest.java | 6 +++---
dsl/camel-xml-jaxb-dsl-test/definition/pom.xml | 2 +-
dsl/camel-xml-jaxb-dsl-test/spring/pom.xml | 2 +-
dsl/camel-xml-jaxb-dsl/pom.xml | 2 +-
dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml | 2 +-
.../org/apache/camel/yaml/dsl/kamelet/AwsRawSecretTest.java | 2 +-
parent/pom.xml | 2 +-
test-infra/camel-test-infra-artemis/pom.xml | 2 +-
.../camel/test/infra/common/services/SingletonService.java | 2 +-
.../fhir/services/FhirLocalSingletonContainerService.java | 2 +-
test-infra/camel-test-infra-openai-mock/pom.xml | 4 ++--
test-infra/camel-test-infra-smb/pom.xml | 2 +-
tests/camel-itest/pom.xml | 2 +-
...ataFormatComponentConfigurationAndDocumentationTest.java | 2 +-
.../DirectComponentConfigurationAndDocumentationTest.java | 2 +-
.../org/apache/camel/itest/doc/EipDocumentationTest.java | 2 +-
.../GroovyLanguageConfigurationAndDocumentationTest.java | 2 +-
.../SimpleLanguageConfigurationAndDocumentationTest.java | 2 +-
.../StringDataFormatConfigurationAndDocumentationTest.java | 2 +-
...ndHttpRecipientListInterceptSendToEndpointIssueTest.java | 2 +-
.../test/java/org/apache/camel/itest/ftp/FtpXQueryTest.java | 2 +-
.../ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java | 2 +-
.../org/apache/camel/itest/ftp/SpringFtpEndpointTest.java | 2 +-
.../apache/camel/itest/greeter/CamelGreeterFileDomTest.java | 4 ++--
.../org/apache/camel/itest/greeter/CxfToJmsInOutTest.java | 2 +-
.../camel/itest/greeter/JettyRecipientListCxfIssueTest.java | 2 +-
.../org/apache/camel/itest/greeter/JmsToCxfInOutTest.java | 2 +-
.../apache/camel/itest/issues/BeanCallDerivedClassTest.java | 2 +-
.../camel/itest/issues/InterceptFromAndStrategyTest.java | 2 +-
.../org/apache/camel/itest/issues/RemoveEndpointsTest.java | 2 +-
.../org/apache/camel/itest/jetty/JettyFreemarkerTest.java | 2 +-
.../apache/camel/itest/jetty/JettyGroovySetHeaderTest.java | 2 +-
.../org/apache/camel/itest/jetty/JettyJmsShutdownTest.java | 2 +-
.../apache/camel/itest/jetty/JettyMulticastJmsFileTest.java | 4 ++--
.../itest/jetty/JettySimulateFailoverRoundRobinTest.java | 2 +-
.../org/apache/camel/itest/jetty/JettyVelocityTest.java | 2 +-
.../java/org/apache/camel/itest/jms/JmsHttpJmsTest.java | 2 +-
.../org/apache/camel/itest/jms/JmsHttpPostIssueTest.java | 2 +-
.../camel/itest/jms/JmsHttpPostIssueWithMockTest.java | 2 +-
.../test/java/org/apache/camel/itest/jms/JmsJaxbTest.java | 2 +-
.../java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java | 4 ++--
.../camel/itest/netty/NettyAsyncRequestReplyTest.java | 2 +-
.../itest/quartz/FtpCronScheduledRoutePolicyManualTest.java | 6 +++---
.../camel/itest/security/GreeterClientCxfMessageTest.java | 2 +-
.../org/apache/camel/itest/security/GreeterClientTest.java | 2 +-
.../java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java | 2 +-
.../itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java | 2 +-
.../sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java | 2 +-
.../java/org/apache/camel/itest/tx/JmsToHttpTXTest.java | 2 +-
...ExceptionAndNoTransactionErrorHandlerConfiguredTest.java | 2 +-
.../camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java | 2 +-
.../apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java | 2 +-
.../camel/itest/validator/ValidatorSchemaImportTest.java | 2 +-
tests/camel-streamcaching-test/pom.xml | 2 +-
.../stream/CachedOutputStreamDirectMemoryTest.java | 2 +-
tooling/maven/camel-api-component-maven-plugin/pom.xml | 2 +-
.../camel/component/test/AbstractTestTestSupport.java | 2 +-
3277 files changed, 3698 insertions(+), 3718 deletions(-)
diff --git a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index b8eeee6c21f1..6e11e4c54b1f 100644
--- a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++ b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -76,7 +76,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java
index 2c0e423db6df..a88289c751b8 100644
--- a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java
+++ b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
/**
diff --git a/archetypes/camel-archetype-api-component/src/test/resources/projects-disabled/build-it/archetype.properties b/archetypes/camel-archetype-api-component/src/test/resources/projects-disabled/build-it/archetype.properties
index dcc90e11d48a..27cdb823ba4c 100644
--- a/archetypes/camel-archetype-api-component/src/test/resources/projects-disabled/build-it/archetype.properties
+++ b/archetypes/camel-archetype-api-component/src/test/resources/projects-disabled/build-it/archetype.properties
@@ -28,7 +28,7 @@ maven-compiler-plugin-version=${maven-compiler-plugin-version}
maven-resources-plugin-version=${maven-resources-plugin-version}
maven-javadoc-plugin-version=${maven-javadoc-plugin-version}
build-helper-maven-plugin-version=${build-helper-maven-plugin-version}
-junit-jupiter-version=${junit-jupiter-version}
+junit-jupiter-version=${junit6-jupiter-version}
slf4j-version=${slf4j-version}
log4j2-version=${log4j2-version}
maven-surefire-plugin-version=${maven-surefire-plugin-version}
\ No newline at end of file
diff --git a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
index 33031a20f703..fc65ac352ba4 100644
--- a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
@@ -69,7 +69,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java
index f573b868c48b..5cb9f189f19c 100644
--- a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java
+++ b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java
@@ -22,7 +22,7 @@ import java.util.TimerTask;
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.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/archetypes/camel-archetype-component/src/test/resources/projects-disabled/build-it/archetype.properties b/archetypes/camel-archetype-component/src/test/resources/projects-disabled/build-it/archetype.properties
index 374fa9ada2c9..39860991c444 100644
--- a/archetypes/camel-archetype-component/src/test/resources/projects-disabled/build-it/archetype.properties
+++ b/archetypes/camel-archetype-component/src/test/resources/projects-disabled/build-it/archetype.properties
@@ -28,6 +28,6 @@ maven-resources-plugin-version=${maven-resources-plugin-version}
maven-surefire-plugin-version=${maven-surefire-plugin-version}
maven-javadoc-plugin-version=${maven-javadoc-plugin-version}
build-helper-maven-plugin-version=${build-helper-maven-plugin-version}
-junit-jupiter-version=${junit-jupiter-version}
+junit-jupiter-version=${junit6-jupiter-version}
slf4j-version=${slf4j-version}
log4j2-version=${log4j2-version}
\ No newline at end of file
diff --git a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
index 7e6f3d4990c5..92b0876c0293 100644
--- a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
@@ -68,7 +68,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java
index e31fd04c5268..8bbf39f79a3a 100644
--- a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java
+++ b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
index e6ac3fab35d6..25b480f35e6d 100644
--- a/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
@@ -74,7 +74,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-main-junit5</artifactId>
+ <artifactId>camel-test-main-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml
index 80cdbd0d2ae5..4825eac9aa39 100644
--- a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml
@@ -90,7 +90,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-main-junit5</artifactId>
+ <artifactId>camel-test-main-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/test/java/MyApplicationTest.java b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/test/java/MyApplicationTest.java
index 30c901585177..3b697074b6eb 100644
--- a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/test/java/MyApplicationTest.java
+++ b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/test/java/MyApplicationTest.java
@@ -19,7 +19,7 @@ package ${package};
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
-import org.apache.camel.test.main.junit5.CamelMainTestSupport;
+import org.apache.camel.test.main.junit6.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
index 241303b9c2f6..24ca8a48963f 100644
--- a/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
@@ -76,7 +76,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index fea0539a8e90..db3e9f50144c 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 8a1a207b84b6..64a3234dedc5 100644
--- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -106,7 +106,7 @@ public class CamelCatalogTest {
public void testFindOtherNames() {
List<String> names = catalog.findOtherNames();
- assertTrue(names.contains("test-spring-junit5"));
+ assertTrue(names.contains("test-spring-junit6"));
assertFalse(names.contains("http-common"));
assertFalse(names.contains("kura"));
diff --git a/catalog/camel-report-maven-plugin/pom.xml b/catalog/camel-report-maven-plugin/pom.xml
index bd9f47419524..d67dff6a61f0 100644
--- a/catalog/camel-report-maven-plugin/pom.xml
+++ b/catalog/camel-report-maven-plugin/pom.xml
@@ -184,13 +184,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>${junit-jupiter-version}</version>
+ <version>${junit6-jupiter-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
- <version>${junit-jupiter-version}</version>
+ <version>${junit6-jupiter-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/catalog/camel-route-parser/pom.xml b/catalog/camel-route-parser/pom.xml
index 1856f3aa6941..2c1809b5b156 100644
--- a/catalog/camel-route-parser/pom.xml
+++ b/catalog/camel-route-parser/pom.xml
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java
index b1e91a4d0be1..73c3086c26ba 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.parser.java;
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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java
index b0f0a7d9cd1d..633147b20751 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.parser.java;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java
index b974af4ee565..9a1c658a6920 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.parser.java;
import org.apache.camel.FailedToStartRouteException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java
index 4e48a8a6153b..1bfba6b6764f 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.parser.java;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java
index be5681f63123..84b71d13712d 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.parser.java;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
index 236a08e94727..db8d606b12ef 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.parser.RouteBuilderParser;
import org.apache.camel.parser.model.CamelNodeDetails;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.junit.jupiter.api.Test;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
index fd22fa985aa7..7f1994e43b64 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.parser.RouteBuilderParser;
import org.apache.camel.parser.model.CamelNodeDetails;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.junit.jupiter.api.Test;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java
index 215fc7d0e373..a1c4cf33f9b5 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.camel.parser.RouteBuilderParser;
import org.apache.camel.parser.model.CamelNodeDetails;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.junit.jupiter.api.Test;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
index 8002aac02dff..a6fa61158ba7 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.camel.parser.RestDslParser;
import org.apache.camel.parser.model.RestConfigurationDetails;
import org.apache.camel.parser.model.RestServiceDetails;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.junit.jupiter.api.Test;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java
index 00c8ae7365de..eac395818180 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.parser.java;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java
index 359a7247b17c..2ba9c09c353c 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.parser.java;
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 SplitTokenizeTest extends CamelTestSupport {
diff --git a/components/camel-ai/camel-chatscript/pom.xml b/components/camel-ai/camel-chatscript/pom.xml
index 8bb581af9da9..55596760e3c4 100644
--- a/components/camel-ai/camel-chatscript/pom.xml
+++ b/components/camel-ai/camel-chatscript/pom.xml
@@ -51,7 +51,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java b/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java
index 669514eda1fd..80cb589677ec 100644
--- a/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java
+++ b/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.language.SimpleExpression;
import org.apache.camel.test.infra.chatscript.services.ChatScriptService;
import org.apache.camel.test.infra.chatscript.services.ChatScriptServiceFactory;
-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;
import org.slf4j.Logger;
diff --git a/components/camel-ai/camel-djl/pom.xml b/components/camel-ai/camel-djl/pom.xml
index bef185a57696..6ce9142adec0 100644
--- a/components/camel-ai/camel-djl/pom.xml
+++ b/components/camel-ai/camel-djl/pom.xml
@@ -131,7 +131,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/AudioLocalTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/AudioLocalTest.java
index 797b60e0b8ed..a53e72e44468 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/AudioLocalTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/AudioLocalTest.java
@@ -28,7 +28,7 @@ import ai.djl.modality.audio.AudioFactory;
import ai.djl.modality.audio.translator.SpeechRecognitionTranslator;
import ai.djl.util.ZipUtils;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvActionRecognitionTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvActionRecognitionTest.java
index 9f6bef79ae69..1341238f4dd0 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvActionRecognitionTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvActionRecognitionTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.djl;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationLocalTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationLocalTest.java
index 26332ebd0146..0a1bc614c1dd 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationLocalTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationLocalTest.java
@@ -33,7 +33,7 @@ import ai.djl.modality.cv.translator.ImageClassificationTranslator;
import ai.djl.translate.Translator;
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.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationTest.java
index 74d679ff5a6c..7348be4a95d5 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageClassificationTest.java
@@ -18,7 +18,7 @@
package org.apache.camel.component.djl;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageEnhancementLocalTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageEnhancementLocalTest.java
index 544b5a40da9e..d836c8424381 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageEnhancementLocalTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageEnhancementLocalTest.java
@@ -35,7 +35,7 @@ import ai.djl.translate.Translator;
import ai.djl.translate.TranslatorContext;
import ai.djl.util.TarUtils;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageGenerationTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageGenerationTest.java
index cab9215fc5de..208881c7aafe 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageGenerationTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvImageGenerationTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.djl;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvInstanceSegmentationTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvInstanceSegmentationTest.java
index 19a1333420cc..0539e8aaa801 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvInstanceSegmentationTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvInstanceSegmentationTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.djl;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvObjectDetectionTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvObjectDetectionTest.java
index 7c43b852bf70..4c9bf6262d59 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvObjectDetectionTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvObjectDetectionTest.java
@@ -18,7 +18,7 @@
package org.apache.camel.component.djl;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvPoseEstimationTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvPoseEstimationTest.java
index b1221bc760ba..1562025e268d 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvPoseEstimationTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvPoseEstimationTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.djl;
import ai.djl.modality.cv.Image;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvSemanticSegmentationTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvSemanticSegmentationTest.java
index 1489331e4f2b..0d875edec502 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvSemanticSegmentationTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/CvSemanticSegmentationTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.djl;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpQuestionAnswerTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpQuestionAnswerTest.java
index e17ecd34bff7..1eef294f2cd7 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpQuestionAnswerTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpQuestionAnswerTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.djl;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpSentimentAnalysisTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpSentimentAnalysisTest.java
index 3015df17a1bb..7c4620bf3ef6 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpSentimentAnalysisTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpSentimentAnalysisTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.djl;
import java.util.List;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpWordEmbeddingTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpWordEmbeddingTest.java
index 93625190cfe7..dba7b49bc553 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpWordEmbeddingTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/NlpWordEmbeddingTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.djl;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/TimeSeriesForecastingTest.java b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/TimeSeriesForecastingTest.java
index c6e1292858d2..e13666e840a8 100644
--- a/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/TimeSeriesForecastingTest.java
+++ b/components/camel-ai/camel-djl/src/test/java/org/apache/camel/component/djl/TimeSeriesForecastingTest.java
@@ -22,7 +22,7 @@ import ai.djl.ndarray.NDManager;
import ai.djl.timeseries.TimeSeriesData;
import ai.djl.timeseries.dataset.FieldName;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-docling/pom.xml b/components/camel-ai/camel-docling/pom.xml
index 016e915ac1eb..8a080a27d32b 100644
--- a/components/camel-ai/camel-docling/pom.xml
+++ b/components/camel-ai/camel-docling/pom.xml
@@ -62,7 +62,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/BatchProcessingTest.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/BatchProcessingTest.java
index 3b936a7cddd7..e1d902ce1c29 100644
--- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/BatchProcessingTest.java
+++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/BatchProcessingTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.docling;
import java.util.List;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingComponentTest.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingComponentTest.java
index a3bcb2211c37..cf56c9d7160d 100644
--- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingComponentTest.java
+++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingComponentTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.docling;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingProducerTest.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingProducerTest.java
index b445cb7dad4a..a375c09684f5 100644
--- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingProducerTest.java
+++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingProducerTest.java
@@ -20,7 +20,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import org.apache.camel.builder.RouteBuilder;
-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.condition.EnabledIfSystemProperty;
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingServeProducerTest.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingServeProducerTest.java
index ddc48b350a7a..2cced30c967b 100644
--- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingServeProducerTest.java
+++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingServeProducerTest.java
@@ -20,7 +20,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import org.apache.camel.builder.RouteBuilder;
-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.condition.EnabledIfSystemProperty;
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingITestSupport.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingITestSupport.java
index 3472c07efbad..f593f507ad2c 100644
--- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingITestSupport.java
+++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingITestSupport.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.docling.DoclingComponent;
import org.apache.camel.component.docling.DoclingConfiguration;
import org.apache.camel.test.infra.docling.services.DoclingService;
import org.apache.camel.test.infra.docling.services.DoclingServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/OcrExtractionIT.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/OcrExtractionIT.java
index 70755164bf96..3aef0fe7d57a 100644
--- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/OcrExtractionIT.java
+++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/OcrExtractionIT.java
@@ -33,7 +33,7 @@ import org.apache.camel.component.docling.DoclingComponent;
import org.apache.camel.component.docling.DoclingConfiguration;
import org.apache.camel.test.infra.docling.services.DoclingService;
import org.apache.camel.test.infra.docling.services.DoclingServiceFactory;
-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.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-kserve/pom.xml b/components/camel-ai/camel-kserve/pom.xml
index 147b5bcc7244..4b1f7726b9bf 100644
--- a/components/camel-ai/camel-kserve/pom.xml
+++ b/components/camel-ai/camel-kserve/pom.xml
@@ -78,7 +78,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-kserve/src/test/java/org/apache/camel/component/kserve/it/KServeITSupport.java b/components/camel-ai/camel-kserve/src/test/java/org/apache/camel/component/kserve/it/KServeITSupport.java
index 62db7c3c52a4..b9585ab80005 100644
--- a/components/camel-ai/camel-kserve/src/test/java/org/apache/camel/component/kserve/it/KServeITSupport.java
+++ b/components/camel-ai/camel-kserve/src/test/java/org/apache/camel/component/kserve/it/KServeITSupport.java
@@ -20,7 +20,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.kserve.KServeComponent;
import org.apache.camel.test.infra.triton.services.TritonService;
import org.apache.camel.test.infra.triton.services.TritonServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.extension.RegisterExtension;
class KServeITSupport extends CamelTestSupport {
diff --git a/components/camel-ai/camel-langchain4j-agent/pom.xml b/components/camel-ai/camel-langchain4j-agent/pom.xml
index 1fd66fe36e1b..8dee38795233 100644
--- a/components/camel-ai/camel-langchain4j-agent/pom.xml
+++ b/components/camel-ai/camel-langchain4j-agent/pom.xml
@@ -64,7 +64,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/BaseLangChain4jAgent.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/BaseLangChain4jAgent.java
index c1062d13a937..0039d780a3b7 100644
--- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/BaseLangChain4jAgent.java
+++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/BaseLangChain4jAgent.java
@@ -23,7 +23,7 @@ import dev.langchain4j.model.openai.OpenAiChatModel;
import dev.langchain4j.rag.RetrievalAugmentor;
import dev.langchain4j.store.memory.chat.ChatMemoryStore;
import org.apache.camel.component.langchain4j.agent.pojos.PersistentChatMemoryStore;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import static dev.langchain4j.model.openai.OpenAiChatModelName.GPT_4_O_MINI;
import static java.time.Duration.ofSeconds;
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentCustomToolsIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentCustomToolsIT.java
index b7dde7d41540..5093084c570d 100644
--- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentCustomToolsIT.java
+++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentCustomToolsIT.java
@@ -30,7 +30,7 @@ import org.apache.camel.component.langchain4j.agent.pojos.WeatherTool;
import org.apache.camel.component.mock.MockEndpoint;
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.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentGuardrailsIntegrationIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentGuardrailsIntegrationIT.java
index 70f975f4bc57..cd3847a1d075 100644
--- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentGuardrailsIntegrationIT.java
+++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentGuardrailsIntegrationIT.java
@@ -29,7 +29,7 @@ import org.apache.camel.component.langchain4j.agent.pojos.TestSuccessInputGuardr
import org.apache.camel.component.mock.MockEndpoint;
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.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMcpToolsIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMcpToolsIT.java
index 163c046169e2..eb5f4e28b2bf 100644
--- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMcpToolsIT.java
+++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMcpToolsIT.java
@@ -35,7 +35,7 @@ import org.apache.camel.component.langchain4j.agent.api.AgentWithoutMemory;
import org.apache.camel.component.mock.MockEndpoint;
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.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMixedToolsIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMixedToolsIT.java
index f12945fd8d94..7809e29b9c55 100644
--- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMixedToolsIT.java
+++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMixedToolsIT.java
@@ -29,7 +29,7 @@ import org.apache.camel.component.langchain4j.agent.pojos.StringTool;
import org.apache.camel.component.mock.MockEndpoint;
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.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMultimodalityIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMultimodalityIT.java
index 9715236d4b2e..ef96f694824f 100644
--- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMultimodalityIT.java
+++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentMultimodalityIT.java
@@ -33,7 +33,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.ollama.services.OllamaService;
import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory;
import org.apache.camel.test.infra.ollama.services.OpenAIService;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithMemoryIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithMemoryIT.java
index 667f997b7e24..59fc757e3547 100644
--- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithMemoryIT.java
+++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithMemoryIT.java
@@ -30,7 +30,7 @@ import org.apache.camel.component.langchain4j.agent.pojos.PersistentChatMemorySt
import org.apache.camel.component.mock.MockEndpoint;
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.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithToolsIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithToolsIT.java
index 81d4b8e4017f..ef68ada0b565 100644
--- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithToolsIT.java
+++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWithToolsIT.java
@@ -27,7 +27,7 @@ import org.apache.camel.component.langchain4j.agent.api.AiAgentBody;
import org.apache.camel.component.mock.MockEndpoint;
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.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWrappedFileIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWrappedFileIT.java
index 994675473156..41a64f3f99e4 100644
--- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWrappedFileIT.java
+++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentWrappedFileIT.java
@@ -29,7 +29,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.ollama.services.OllamaService;
import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory;
import org.apache.camel.test.infra.ollama.services.OpenAIService;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jSimpleAgentIT.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jSimpleAgentIT.java
index 76c8a6f038bc..3842694835d8 100644
--- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jSimpleAgentIT.java
+++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jSimpleAgentIT.java
@@ -27,7 +27,7 @@ import org.apache.camel.component.langchain4j.agent.api.AiAgentBody;
import org.apache.camel.component.mock.MockEndpoint;
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.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-chat/pom.xml b/components/camel-ai/camel-langchain4j-chat/pom.xml
index 8bc4a2720e85..bab75ea9abb1 100644
--- a/components/camel-ai/camel-langchain4j-chat/pom.xml
+++ b/components/camel-ai/camel-langchain4j-chat/pom.xml
@@ -66,7 +66,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/OllamaTestSupport.java b/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/OllamaTestSupport.java
index 7824a084d7df..edcc7777ad7d 100644
--- a/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/OllamaTestSupport.java
+++ b/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/OllamaTestSupport.java
@@ -22,7 +22,7 @@ import dev.langchain4j.model.openai.OpenAiChatModel;
import org.apache.camel.test.infra.ollama.services.OllamaService;
import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory;
import org.apache.camel.test.infra.ollama.services.OpenAIService;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.extension.RegisterExtension;
import static java.time.Duration.ofSeconds;
diff --git a/components/camel-ai/camel-langchain4j-core/pom.xml b/components/camel-ai/camel-langchain4j-core/pom.xml
index 4a67fd2505d2..c358c145b9eb 100644
--- a/components/camel-ai/camel-langchain4j-core/pom.xml
+++ b/components/camel-ai/camel-langchain4j-core/pom.xml
@@ -55,7 +55,7 @@
<!-- test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-langchain4j-core/src/test/java/org/apache/camel/component/langchain4j/core/LangChain4jConverterTest.java b/components/camel-ai/camel-langchain4j-core/src/test/java/org/apache/camel/component/langchain4j/core/LangChain4jConverterTest.java
index 68c071b9f1c3..d646b50f27b0 100644
--- a/components/camel-ai/camel-langchain4j-core/src/test/java/org/apache/camel/component/langchain4j/core/LangChain4jConverterTest.java
+++ b/components/camel-ai/camel-langchain4j-core/src/test/java/org/apache/camel/component/langchain4j/core/LangChain4jConverterTest.java
@@ -20,7 +20,7 @@ import dev.langchain4j.data.document.Document;
import org.apache.camel.Exchange;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/components/camel-ai/camel-langchain4j-embeddings/pom.xml b/components/camel-ai/camel-langchain4j-embeddings/pom.xml
index 1b97622e1aab..924162d41ddb 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/pom.xml
+++ b/components/camel-ai/camel-langchain4j-embeddings/pom.xml
@@ -104,7 +104,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java
index dc8d60f99ab7..d202ffecc15e 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java
+++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java
@@ -42,7 +42,7 @@ import org.apache.camel.support.task.budget.Budgets;
import org.apache.camel.support.task.budget.IterationBoundedBudget;
import org.apache.camel.test.infra.infinispan.services.InfinispanService;
import org.apache.camel.test.infra.infinispan.services.InfinispanServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.commons.lang3.SystemUtils;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentMilvusTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentMilvusTargetIT.java
index f47859e09deb..c42e24475365 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentMilvusTargetIT.java
+++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentMilvusTargetIT.java
@@ -41,7 +41,7 @@ import org.apache.camel.component.milvus.MilvusComponent;
import org.apache.camel.component.milvus.MilvusHeaders;
import org.apache.camel.test.infra.milvus.services.MilvusService;
import org.apache.camel.test.infra.milvus.services.MilvusServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.assertj.core.util.Lists;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java
index 30c5268427ef..27d3c42507dc 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java
+++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java
@@ -33,7 +33,7 @@ import org.apache.camel.component.neo4j.Neo4jHeaders;
import org.apache.camel.spi.DataType;
import org.apache.camel.test.infra.neo4j.services.Neo4jService;
import org.apache.camel.test.infra.neo4j.services.Neo4jServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentPineconeTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentPineconeTargetIT.java
index c8dc1a740517..e798312916df 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentPineconeTargetIT.java
+++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentPineconeTargetIT.java
@@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.pinecone.PineconeVectorDbAction;
import org.apache.camel.component.pinecone.PineconeVectorDbHeaders;
import org.apache.camel.spi.DataType;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.*;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java
index 42ed7e00efc5..c5d4056a6ae3 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java
+++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java
@@ -33,7 +33,7 @@ import org.apache.camel.component.qdrant.QdrantHeaders;
import org.apache.camel.spi.DataType;
import org.apache.camel.test.infra.qdrant.services.QdrantService;
import org.apache.camel.test.infra.qdrant.services.QdrantServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentTest.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentTest.java
index b2e40e835fba..dab50c117a08 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentTest.java
+++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentTest.java
@@ -23,7 +23,7 @@ import dev.langchain4j.store.embedding.CosineSimilarity;
import dev.langchain4j.store.embedding.RelevanceScore;
import org.apache.camel.CamelContext;
import org.apache.camel.Message;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java
index f848661ad117..f4212d6cf83a 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java
+++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentWeaviateTargetIT.java
@@ -36,7 +36,7 @@ import org.apache.camel.component.weaviate.WeaviateVectorDbHeaders;
import org.apache.camel.spi.DataType;
import org.apache.camel.test.infra.weaviate.services.WeaviateService;
import org.apache.camel.test.infra.weaviate.services.WeaviateServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml b/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml
index b5d3474a476f..38777bcad09b 100644
--- a/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml
+++ b/components/camel-ai/camel-langchain4j-embeddingstore/pom.xml
@@ -67,7 +67,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentMilvusTargetIT.java b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentMilvusTargetIT.java
index c38bde806902..ed75a6e3035f 100644
--- a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentMilvusTargetIT.java
+++ b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentMilvusTargetIT.java
@@ -35,7 +35,7 @@ import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddin
import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStoreHeaders;
import org.apache.camel.test.infra.milvus.services.MilvusService;
import org.apache.camel.test.infra.milvus.services.MilvusServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java
index 058347e7aa66..02e2141482ef 100644
--- a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java
+++ b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java
@@ -40,7 +40,7 @@ import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddin
import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStoreHeaders;
import org.apache.camel.test.infra.qdrant.services.QdrantService;
import org.apache.camel.test.infra.qdrant.services.QdrantServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentTest.java b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentTest.java
index 48262997f192..982f11414c77 100644
--- a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentTest.java
+++ b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Message;
import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStore;
import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStoreComponent;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
public class LangChain4jEmbeddingStoreComponentTest extends CamelTestSupport {
diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java
index 62fc25626a1b..b5cb749c6fec 100644
--- a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java
+++ b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java
@@ -37,7 +37,7 @@ import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddin
import org.apache.camel.component.langchain4j.embeddingstore.LangChain4jEmbeddingStoreHeaders;
import org.apache.camel.test.infra.weaviate.services.WeaviateService;
import org.apache.camel.test.infra.weaviate.services.WeaviateServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-ai/camel-langchain4j-tokenizer/pom.xml b/components/camel-ai/camel-langchain4j-tokenizer/pom.xml
index 3ad28dcaa375..e67c53b76490 100644
--- a/components/camel-ai/camel-langchain4j-tokenizer/pom.xml
+++ b/components/camel-ai/camel-langchain4j-tokenizer/pom.xml
@@ -83,7 +83,7 @@
<!-- test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-langchain4j-tokenizer/src/test/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JTokenizerTestSupport.java b/components/camel-ai/camel-langchain4j-tokenizer/src/test/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JTokenizerTestSupport.java
index 93a53f8f6905..175714da565f 100644
--- a/components/camel-ai/camel-langchain4j-tokenizer/src/test/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JTokenizerTestSupport.java
+++ b/components/camel-ai/camel-langchain4j-tokenizer/src/test/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JTokenizerTestSupport.java
@@ -20,7 +20,7 @@ package org.apache.camel.component.langchain4j.tokenizer;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
public class LangChain4JTokenizerTestSupport extends CamelTestSupport {
protected static final String TEXT;
diff --git a/components/camel-ai/camel-langchain4j-tools/pom.xml b/components/camel-ai/camel-langchain4j-tools/pom.xml
index 7be1f80a190d..40984ff5c2aa 100644
--- a/components/camel-ai/camel-langchain4j-tools/pom.xml
+++ b/components/camel-ai/camel-langchain4j-tools/pom.xml
@@ -64,7 +64,7 @@
<!-- test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleCallsTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleCallsTest.java
index b052991dee96..39a60358a9be 100644
--- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleCallsTest.java
+++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleCallsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.CamelContext;
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.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleGroupsTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleGroupsTest.java
index d5e01e5d9a82..6a251f609295 100644
--- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleGroupsTest.java
+++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleGroupsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.CamelContext;
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.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleMatchingGroupsTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleMatchingGroupsTest.java
index 2ba77524fecf..533f24dc9bf6 100644
--- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleMatchingGroupsTest.java
+++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolMultipleMatchingGroupsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.CamelContext;
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.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsExistTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsExistTest.java
index 9518982b3b4a..61e76ceaea36 100644
--- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsExistTest.java
+++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsExistTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.CamelContext;
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.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsToBeCalledTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsToBeCalledTest.java
index 80dc463a6c00..554e33cdb374 100644
--- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsToBeCalledTest.java
+++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolNoToolsToBeCalledTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.CamelContext;
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.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolParameterValueTypeConversionTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolParameterValueTypeConversionTest.java
index 9115879d84dc..d5f6c7d88b98 100644
--- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolParameterValueTypeConversionTest.java
+++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolParameterValueTypeConversionTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
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.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolTest.java b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolTest.java
index 06ca58cd8f14..081f304d0e07 100644
--- a/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolTest.java
+++ b/components/camel-ai/camel-langchain4j-tools/src/test/java/org/apache/camel/component/langchain4j/tools/LangChain4jToolTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
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.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-langchain4j-web-search/pom.xml b/components/camel-ai/camel-langchain4j-web-search/pom.xml
index f71437930518..0a33aa4b65f0 100644
--- a/components/camel-ai/camel-langchain4j-web-search/pom.xml
+++ b/components/camel-ai/camel-langchain4j-web-search/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jGoogleWebSearchEngineIT.java b/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jGoogleWebSearchEngineIT.java
index c4dfb9b4d1e3..8f80a252668c 100644
--- a/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jGoogleWebSearchEngineIT.java
+++ b/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jGoogleWebSearchEngineIT.java
@@ -23,7 +23,7 @@ import dev.langchain4j.web.search.WebSearchRequest;
import dev.langchain4j.web.search.google.customsearch.GoogleCustomWebSearchEngine;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
-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.condition.EnabledIfEnvironmentVariable;
diff --git a/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jTavilyWebSearchEngineIT.java b/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jTavilyWebSearchEngineIT.java
index 4bee0b062c90..a8a24d3dfe72 100644
--- a/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jTavilyWebSearchEngineIT.java
+++ b/components/camel-ai/camel-langchain4j-web-search/src/test/java/org/apache/camel/component/langchain4j/web/search/LangChain4jTavilyWebSearchEngineIT.java
@@ -24,7 +24,7 @@ import dev.langchain4j.web.search.WebSearchRequest;
import dev.langchain4j.web.search.tavily.TavilyWebSearchEngine;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
-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.condition.EnabledIfEnvironmentVariable;
diff --git a/components/camel-ai/camel-milvus/pom.xml b/components/camel-ai/camel-milvus/pom.xml
index 2a56e27a0c29..9e9fec0a2519 100644
--- a/components/camel-ai/camel-milvus/pom.xml
+++ b/components/camel-ai/camel-milvus/pom.xml
@@ -109,7 +109,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java b/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java
index e6ad879f4e24..36903bad6361 100644
--- a/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java
+++ b/components/camel-ai/camel-milvus/src/test/java/org/apache/camel/component/milvus/MilvusTestSupport.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.milvus;
import org.apache.camel.CamelContext;
import org.apache.camel.test.infra.milvus.services.MilvusService;
import org.apache.camel.test.infra.milvus.services.MilvusServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-neo4j/pom.xml b/components/camel-ai/camel-neo4j/pom.xml
index 827f2e1f1321..44d766b8b6f8 100644
--- a/components/camel-ai/camel-neo4j/pom.xml
+++ b/components/camel-ai/camel-neo4j/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jTestSupport.java b/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jTestSupport.java
index 6b0d6eae5e88..e1e4354b73b1 100644
--- a/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jTestSupport.java
+++ b/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jTestSupport.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.neo4j;
import org.apache.camel.CamelContext;
import org.apache.camel.test.infra.neo4j.services.Neo4jService;
import org.apache.camel.test.infra.neo4j.services.Neo4jServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-openai/pom.xml b/components/camel-ai/camel-openai/pom.xml
index e0681c37dffb..36f8b5646aa5 100644
--- a/components/camel-ai/camel-openai/pom.xml
+++ b/components/camel-ai/camel-openai/pom.xml
@@ -51,7 +51,7 @@
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java
index 3dc7822c3376..671c63b5f058 100644
--- a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java
+++ b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java
@@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
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/OpenAITestSupport.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAITestSupport.java
index a27db639b9ee..8d274a9fff46 100644
--- a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAITestSupport.java
+++ b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/integration/OpenAITestSupport.java
@@ -20,7 +20,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.openai.OpenAIComponent;
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.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-pinecone/pom.xml b/components/camel-ai/camel-pinecone/pom.xml
index bf2455067ccf..9a024e522d6f 100644
--- a/components/camel-ai/camel-pinecone/pom.xml
+++ b/components/camel-ai/camel-pinecone/pom.xml
@@ -74,7 +74,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeComponentConfigurationTest.java b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeComponentConfigurationTest.java
index 55c4fc938c70..1b129c7b2762 100644
--- a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeComponentConfigurationTest.java
+++ b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeComponentConfigurationTest.java
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.util.Map;
import java.util.Properties;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.apache.camel.test.junit5.TestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeTestSupport.java b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeTestSupport.java
index c7cd88d3d327..200195c429be 100644
--- a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeTestSupport.java
+++ b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/PineconeTestSupport.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.pinecone;
import org.apache.camel.CamelContext;
import org.apache.camel.test.infra.pinecone.services.PineconeService;
import org.apache.camel.test.infra.pinecone.services.PineconeServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/it/PineconeComponentIT.java b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/it/PineconeComponentIT.java
index 9280717e3312..a33e83f607b5 100644
--- a/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/it/PineconeComponentIT.java
+++ b/components/camel-ai/camel-pinecone/src/test/java/org/apache/camel/component/pinecone/it/PineconeComponentIT.java
@@ -24,7 +24,7 @@ import io.pinecone.unsigned_indices_model.QueryResponseWithUnsignedIndices;
import org.apache.camel.Exchange;
import org.apache.camel.component.pinecone.PineconeVectorDbAction;
import org.apache.camel.component.pinecone.PineconeVectorDbHeaders;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.*;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-ai/camel-qdrant/pom.xml b/components/camel-ai/camel-qdrant/pom.xml
index 532c8f9a1428..0faa9edf3838 100644
--- a/components/camel-ai/camel-qdrant/pom.xml
+++ b/components/camel-ai/camel-qdrant/pom.xml
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantCommonTest.java b/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantCommonTest.java
index bf2f70c5858d..ee9670ee177c 100644
--- a/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantCommonTest.java
+++ b/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantCommonTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.qdrant;
import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadException;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
diff --git a/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantTestSupport.java b/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantTestSupport.java
index 491a274922df..12d57a019343 100644
--- a/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantTestSupport.java
+++ b/components/camel-ai/camel-qdrant/src/test/java/org/apache/camel/component/qdrant/QdrantTestSupport.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.qdrant;
import org.apache.camel.CamelContext;
import org.apache.camel.test.infra.qdrant.services.QdrantService;
import org.apache.camel.test.infra.qdrant.services.QdrantServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-ai/camel-tensorflow-serving/pom.xml b/components/camel-ai/camel-tensorflow-serving/pom.xml
index 8fbef949fa9f..b9de5a41105d 100644
--- a/components/camel-ai/camel-tensorflow-serving/pom.xml
+++ b/components/camel-ai/camel-tensorflow-serving/pom.xml
@@ -78,7 +78,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-tensorflow-serving/src/test/java/org/apache/camel/component/torchserve/it/TensorFlowServingITSupport.java b/components/camel-ai/camel-tensorflow-serving/src/test/java/org/apache/camel/component/torchserve/it/TensorFlowServingITSupport.java
index e92a6be7c8fc..c7dc00c0da97 100644
--- a/components/camel-ai/camel-tensorflow-serving/src/test/java/org/apache/camel/component/torchserve/it/TensorFlowServingITSupport.java
+++ b/components/camel-ai/camel-tensorflow-serving/src/test/java/org/apache/camel/component/torchserve/it/TensorFlowServingITSupport.java
@@ -20,7 +20,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.tensorflow.serving.TensorFlowServingComponent;
import org.apache.camel.test.infra.tensorflow.serving.services.TensorFlowServingService;
import org.apache.camel.test.infra.tensorflow.serving.services.TensorFlowServingServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.extension.RegisterExtension;
class TensorFlowServingITSupport extends CamelTestSupport {
diff --git a/components/camel-ai/camel-torchserve/pom.xml b/components/camel-ai/camel-torchserve/pom.xml
index 5730c7ab5d1f..a83abb66f267 100644
--- a/components/camel-ai/camel-torchserve/pom.xml
+++ b/components/camel-ai/camel-torchserve/pom.xml
@@ -94,7 +94,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/TorchServeTestSupport.java b/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/TorchServeTestSupport.java
index 5b9ea0973516..a4bdbff73fc2 100644
--- a/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/TorchServeTestSupport.java
+++ b/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/TorchServeTestSupport.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.torchserve;
import com.github.tomakehurst.wiremock.WireMockServer;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/it/TorchServeITSupport.java b/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/it/TorchServeITSupport.java
index d183cdcc2a9c..cc3682c91c2e 100644
--- a/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/it/TorchServeITSupport.java
+++ b/components/camel-ai/camel-torchserve/src/test/java/org/apache/camel/component/torchserve/it/TorchServeITSupport.java
@@ -20,7 +20,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.torchserve.TorchServeComponent;
import org.apache.camel.test.infra.torchserve.services.TorchServeService;
import org.apache.camel.test.infra.torchserve.services.TorchServeServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.extension.RegisterExtension;
class TorchServeITSupport extends CamelTestSupport {
diff --git a/components/camel-ai/camel-weaviate/pom.xml b/components/camel-ai/camel-weaviate/pom.xml
index 5fa9a4134dbc..3879a9591411 100644
--- a/components/camel-ai/camel-weaviate/pom.xml
+++ b/components/camel-ai/camel-weaviate/pom.xml
@@ -70,7 +70,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateComponentConfigurationTest.java b/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateComponentConfigurationTest.java
index fccb324a5d6e..0520eadc0b46 100644
--- a/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateComponentConfigurationTest.java
+++ b/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateComponentConfigurationTest.java
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.util.Map;
import java.util.Properties;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.apache.camel.test.junit5.TestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateTestSupport.java b/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateTestSupport.java
index a9fefd01c291..b393158defc7 100644
--- a/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateTestSupport.java
+++ b/components/camel-ai/camel-weaviate/src/test/java/org/apache/camel/component/weaviate/WeaviateTestSupport.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.weaviate;
import org.apache.camel.CamelContext;
import org.apache.camel.test.infra.weaviate.services.WeaviateService;
import org.apache.camel.test.infra.weaviate.services.WeaviateServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index ec066e9043c2..4a534ca0f6ca 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-arangodb/pom.xml b/components/camel-arangodb/pom.xml
index 2817a859b037..638b0c542dff 100644
--- a/components/camel-arangodb/pom.xml
+++ b/components/camel-arangodb/pom.xml
@@ -59,7 +59,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-as2/camel-as2-api/pom.xml b/components/camel-as2/camel-as2-api/pom.xml
index 4b0aa3ec48d7..218b0b7598c8 100644
--- a/components/camel-as2/camel-as2-api/pom.xml
+++ b/components/camel-as2/camel-as2-api/pom.xml
@@ -83,7 +83,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-as2/camel-as2-component/pom.xml b/components/camel-as2/camel-as2-component/pom.xml
index a5acb7c84a8e..5af3a4a002f6 100644
--- a/components/camel-as2/camel-as2-component/pom.xml
+++ b/components/camel-as2/camel-as2-component/pom.xml
@@ -56,7 +56,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2ITSupport.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2ITSupport.java
index eb3a39d76235..7a20f73d7f94 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2ITSupport.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2ITSupport.java
@@ -23,8 +23,8 @@ import java.util.Properties;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.support.PropertyBindingSupport;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.apache.camel.test.junit5.TestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
/**
* Abstract base class for AS2 Integration tests generated by Camel API component maven plugin.
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/MendelsonSslEndpointManualTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/MendelsonSslEndpointManualTest.java
index b3fd0bb1e801..e9438f0a8dcc 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/MendelsonSslEndpointManualTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/MendelsonSslEndpointManualTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.component.as2.api.AS2MessageStructure;
import org.apache.camel.component.as2.api.AS2SignatureAlgorithm;
import org.apache.camel.component.as2.internal.AS2ApiName;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.junit5.TestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index 2279772089b6..014dce91c927 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -53,7 +53,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java
index 25b4e25f6848..602d70c1fe32 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.camel.Exchange;
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.apache.commons.io.FileUtils;
import org.bouncycastle.asn1.ASN1Primitive;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
index f2faf9da8f44..55b0b37b4f4f 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java
index 0c11cff2ad60..033fd3e9296f 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.camel.Exchange;
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.apache.commons.io.FileUtils;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
index 450885322c49..d10d0ffa9619 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml
index dfa5b433857e..0d5d92aa264d 100644
--- a/components/camel-asterisk/pom.xml
+++ b/components/camel-asterisk/pom.xml
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java
index 5d616aae084b..f3cf77c45e76 100644
--- a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java
+++ b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.asterisk;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java
index 2b9ff1647938..e1221e7047a4 100644
--- a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java
+++ b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.camel.Exchange;
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.Disabled;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
diff --git a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java
index ce263255f757..717cf0dca6e2 100644
--- a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java
+++ b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java
@@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit;
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.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index 242d1b2785b3..c897fcad44bd 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -62,7 +62,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
index a54e4fcac1f4..ab94dca517f2 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
@@ -20,7 +20,7 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.infra.jetty.services.JettyConfiguration;
import org.apache.camel.test.infra.jetty.services.JettyConfigurationBuilder;
import org.apache.camel.test.infra.jetty.services.JettyEmbeddedService;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
index ff905693dc3b..0e6670cbe0ce 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
@@ -20,7 +20,7 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.infra.jetty.services.JettyConfiguration;
import org.apache.camel.test.infra.jetty.services.JettyConfigurationBuilder;
import org.apache.camel.test.infra.jetty.services.JettyEmbeddedService;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 55e194a51d10..ead80498f365 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -53,7 +53,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
index 25c24046be77..ce868c634b0f 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.atom;
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.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java
index 20a187b1a0ab..31ed956d3e94 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.atom;
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.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java
index e9618d4ff51b..1c4f5e11d2a7 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.atom;
-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.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
index 032d6fd49d2a..80f9a28a0c6e 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
@@ -20,7 +20,7 @@ import java.time.Duration;
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.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java
index de15bc1adb76..505e3812fb67 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
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;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
index e12b6cbf765d..774c57c05b78 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.atom;
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;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
index 6d557404575c..4dd629bf969d 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.atom;
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;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
index 164e3b3be276..9fd59d699e43 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
@@ -22,7 +22,7 @@ import com.apptasticsoftware.rssreader.Item;
import org.apache.camel.Exchange;
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;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
diff --git a/components/camel-attachments/pom.xml b/components/camel-attachments/pom.xml
index 04f7d40e01a6..f15b6a1fe771 100644
--- a/components/camel-attachments/pom.xml
+++ b/components/camel-attachments/pom.xml
@@ -60,7 +60,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/AttachmentRemovalTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/AttachmentRemovalTest.java
index 08a9bb8a86fa..8ea6cbb785df 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/AttachmentRemovalTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/AttachmentRemovalTest.java
@@ -21,7 +21,7 @@ import jakarta.activation.DataHandler;
import org.apache.camel.Exchange;
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.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
index ac4e285902be..69f8a8819644 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
@@ -22,7 +22,7 @@ import jakarta.activation.FileDataSource;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/EnrichTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/EnrichTest.java
index 780d0963c3bd..fac661072d08 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/EnrichTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/EnrichTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.ExchangePattern;
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.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
index 65fbd740989c..4cfe17bf572c 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MulticastAggregationStrategyTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MulticastAggregationStrategyTest.java
index cda4c68f0392..db593f65e960 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MulticastAggregationStrategyTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MulticastAggregationStrategyTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.builder.Builder;
import org.apache.camel.builder.ExchangeBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/SimpleAttachmentTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/SimpleAttachmentTest.java
index fe746aa3eceb..12c5643d1019 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/SimpleAttachmentTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/SimpleAttachmentTest.java
@@ -21,7 +21,7 @@ import java.io.File;
import jakarta.activation.DataHandler;
import org.apache.camel.Exchange;
-import org.apache.camel.test.junit5.LanguageTestSupport;
+import org.apache.camel.test.junit6.LanguageTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
index 6d0aa8f18bd3..cfade768f086 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.Processor;
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.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml b/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml
index 531435c49f90..bce0b54c1249 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml
@@ -54,7 +54,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
index cc8f7cb2dec3..9ea12f3845f2 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
@@ -27,7 +27,7 @@ import org.apache.camel.avro.impl.KeyValueProtocolImpl;
import org.apache.camel.avro.test.TestPojo;
import org.apache.camel.avro.test.TestReflection;
import org.apache.camel.avro.test.TestReflectionImpl;
-import org.apache.camel.test.junit5.TestNameExtension;
+import org.apache.camel.test.junit6.TestNameExtension;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
index c08490fb2099..7b36c6941b4d 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
@@ -24,7 +24,7 @@ import org.apache.camel.avro.generated.Value;
import org.apache.camel.avro.impl.KeyValueProtocolImpl;
import org.apache.camel.avro.test.TestReflectionImpl;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit5.TestNameExtension;
+import org.apache.camel.test.junit6.TestNameExtension;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java
index da53160f9d10..89eb4e9698f7 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.avro;
import org.apache.camel.CamelContext;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
public class AvroTestSupport extends CamelTestSupport {
protected int port = 9100;
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index 6ed9b5a25483..f2c64bef016b 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -48,7 +48,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateMarshalAndUnmarshalTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateMarshalAndUnmarshalTest.java
index 626553ba9020..8ac60a94cee3 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateMarshalAndUnmarshalTest.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateMarshalAndUnmarshalTest.java
@@ -26,7 +26,7 @@ import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericRecord;
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;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateRecordMarshalAndUnmarshalTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateRecordMarshalAndUnmarshalTest.java
index 3ce376faedd9..d69c8b09c8fe 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateRecordMarshalAndUnmarshalTest.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroDateRecordMarshalAndUnmarshalTest.java
@@ -22,7 +22,7 @@ import java.time.LocalDate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.avro.example.DateRecord;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshalAndUnmarshalTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshalAndUnmarshalTest.java
index cff3db9f00b0..eaf2ef384feb 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshalAndUnmarshalTest.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshalAndUnmarshalTest.java
@@ -24,7 +24,7 @@ import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericRecord;
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;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalTest.java
index 8bf1ae160d14..2aa50f5ea071 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalTest.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.avro.example.Value;
import org.apache.camel.model.dataformat.AvroLibrary;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-aws/camel-aws-bedrock/pom.xml b/components/camel-aws/camel-aws-bedrock/pom.xml
index eb29e2c4f5c5..883a52e41328 100644
--- a/components/camel-aws/camel-aws-bedrock/pom.xml
+++ b/components/camel-aws/camel-aws-bedrock/pom.xml
@@ -82,7 +82,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentConsumerIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentConsumerIT.java
index 7dc61da9c607..c4e070ea2695 100644
--- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentConsumerIT.java
+++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentConsumerIT.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.aws2.bedrock.agent.integration;
import org.apache.camel.*;
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;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java
index 8d04c59668b9..7406265282c6 100644
--- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java
+++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java
@@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConstants;
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;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agentruntime/integration/BedrockAgentRuntimeProducerIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agentruntime/integration/BedrockAgentRuntimeProducerIT.java
index ad3ff441d05c..ee226d6de60e 100644
--- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agentruntime/integration/BedrockAgentRuntimeProducerIT.java
+++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agentruntime/integration/BedrockAgentRuntimeProducerIT.java
@@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.bedrock.BedrockModels;
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;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java
index 9297bf393e31..0d164fa02b1a 100644
--- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java
+++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.bedrock.BedrockModels;
import org.apache.camel.component.aws2.bedrock.runtime.BedrockConstants;
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.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
index 6455c673a2b8..a6e33f8f4308 100644
--- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
+++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.bedrock.BedrockModels;
import org.apache.camel.component.aws2.bedrock.runtime.BedrockConstants;
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.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerStreamingIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerStreamingIT.java
index 62e189dbe5b8..72dfedfa05d3 100644
--- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerStreamingIT.java
+++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerStreamingIT.java
@@ -31,7 +31,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.bedrock.BedrockModels;
import org.apache.camel.component.aws2.bedrock.runtime.BedrockConstants;
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.BeforeEach;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
diff --git a/components/camel-aws/camel-aws-cloudtrail/pom.xml b/components/camel-aws/camel-aws-cloudtrail/pom.xml
index 4c0ad186b42c..05cc91e20762 100644
--- a/components/camel-aws/camel-aws-cloudtrail/pom.xml
+++ b/components/camel-aws/camel-aws-cloudtrail/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws-config/pom.xml b/components/camel-aws/camel-aws-config/pom.xml
index 53225900bd99..92ed703b0fac 100644
--- a/components/camel-aws/camel-aws-config/pom.xml
+++ b/components/camel-aws/camel-aws-config/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckProfileCredsTest.java
index c69492f91bea..11639a80f3f1 100644
--- a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
diff --git a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckStaticCredsTest.java
index af67f1127e78..38003c8ac56c 100644
--- a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
diff --git a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigBase.java b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigBase.java
index ab80acb58983..989391f0bc33 100644
--- a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigBase.java
+++ b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigBase.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.aws.config.AWSConfigComponent;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigProducerManualIT.java b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigProducerManualIT.java
index a7e8237a65f5..95d01dccbbb8 100644
--- a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigProducerManualIT.java
+++ b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigProducerManualIT.java
@@ -22,7 +22,7 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.config.AWSConfigConstants;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws-parameter-store/pom.xml b/components/camel-aws/camel-aws-parameter-store/pom.xml
index 0b993fe17a2e..ef3ac92bafa0 100644
--- a/components/camel-aws/camel-aws-parameter-store/pom.xml
+++ b/components/camel-aws/camel-aws-parameter-store/pom.xml
@@ -69,7 +69,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponentConfigurationTest.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponentConfigurationTest.java
index 8c34e97717af..7558d1b48846 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws.parameterstore;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducerHealthCheckStaticCredsTest.java
index aa17e481d67d..8c46ac50f01b 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/AwsParameterStoreBaseTest.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/AwsParameterStoreBaseTest.java
index 657347ab6591..4098f947e39e 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/AwsParameterStoreBaseTest.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/AwsParameterStoreBaseTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.component.aws.parameterstore.ParameterStoreComponent;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
diff --git a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreNoEnvPropertiesSourceTestIT.java b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreNoEnvPropertiesSourceTestIT.java
index 2fad4dafa03f..f977286adc32 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreNoEnvPropertiesSourceTestIT.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/integration/ParameterStoreNoEnvPropertiesSourceTestIT.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.aws.parameterstore.integration;
import org.apache.camel.FailedToCreateRouteException;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws-secrets-manager/pom.xml b/components/camel-aws/camel-aws-secrets-manager/pom.xml
index b6b4236c9a44..62ea5257fa0a 100644
--- a/components/camel-aws/camel-aws-secrets-manager/pom.xml
+++ b/components/camel-aws/camel-aws-secrets-manager/pom.xml
@@ -87,7 +87,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponentConfigurationTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponentConfigurationTest.java
index 515123d3f11a..1a004b14e2cb 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws.secretsmanager;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckProfileCredsTest.java
index 306c65b071d5..737e00f397ae 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckStaticCredsTest.java
index 6580a833d2c8..9e00040bacd0 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java
index 9effb4574909..2d62ec6b0e1b 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.component.aws.secretsmanager.SecretsManagerComponent;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java
index 75841c2845d5..86955a3ac403 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerNoEnvPropertiesSourceTestIT.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.aws.secretsmanager.integration;
import org.apache.camel.FailedToCreateRouteException;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws-security-hub/pom.xml b/components/camel-aws/camel-aws-security-hub/pom.xml
index edb58b57612d..52ca63e60f17 100644
--- a/components/camel-aws/camel-aws-security-hub/pom.xml
+++ b/components/camel-aws/camel-aws-security-hub/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<!-- test infra -->
diff --git a/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/SecurityHubComponentConfigurationTest.java b/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/SecurityHubComponentConfigurationTest.java
index d84f66b51a90..f6b3ea0706ee 100644
--- a/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/SecurityHubComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/SecurityHubComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws.securityhub;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/integration/SecurityHubManualIT.java b/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/integration/SecurityHubManualIT.java
index 464775cd156c..82aabd3ffaa8 100644
--- a/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/integration/SecurityHubManualIT.java
+++ b/components/camel-aws/camel-aws-security-hub/src/test/java/org/apache/camel/component/aws/securityhub/integration/SecurityHubManualIT.java
@@ -27,7 +27,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.securityhub.SecurityHubConstants;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws-xray/pom.xml b/components/camel-aws/camel-aws-xray/pom.xml
index 2451a084c7e6..0e1817ef396d 100644
--- a/components/camel-aws/camel-aws-xray/pom.xml
+++ b/components/camel-aws/camel-aws-xray/pom.xml
@@ -105,7 +105,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
index dfe1bcba4d32..459afcaf7ea3 100644
--- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
+++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
@@ -27,7 +27,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.aws.xray.TestDataBuilder.TestTrace;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.InterceptStrategy;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
index e1be764de75f..9b66c4816145 100644
--- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
+++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.component.aws.xray.TestDataBuilder.TestTrace;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-aws/camel-aws2-athena/pom.xml b/components/camel-aws/camel-aws2-athena/pom.xml
index c6cee1db3cbf..a239e48416e1 100644
--- a/components/camel-aws/camel-aws2-athena/pom.xml
+++ b/components/camel-aws/camel-aws2-athena/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java
index ad8575665713..6d00ab4ae72f 100644
--- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java
+++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckCustomProducerTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java
index b8bfe2a0465b..ffc356b13f3b 100644
--- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java
index 5ed6bd357397..b03995062b9e 100644
--- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java
index d55fe0dda83a..581c10d4f144 100644
--- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.athena;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java
index ba1a10285c96..607940b30ba3 100644
--- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.athena;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java
index 6e05941362d5..05c72da64072 100644
--- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java
+++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/AthenaComponentTest.java
@@ -31,7 +31,7 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
import software.amazon.awssdk.services.athena.model.GetQueryExecutionResponse;
import software.amazon.awssdk.services.athena.model.GetQueryResultsResponse;
diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java
index 21ccc4b0584f..3c69a6d2cbed 100644
--- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java
+++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java
@@ -25,7 +25,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.athena.Athena2Constants;
-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.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-comprehend/pom.xml b/components/camel-aws/camel-aws2-comprehend/pom.xml
index 60ee2edad3a1..1ab04724dab7 100644
--- a/components/camel-aws/camel-aws2-comprehend/pom.xml
+++ b/components/camel-aws/camel-aws2-comprehend/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/Comprehend2ProducerTest.java b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/Comprehend2ProducerTest.java
index d19963a4b7d5..85918b65c557 100644
--- a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/Comprehend2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/Comprehend2ProducerTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.comprehend.model.DetectDominantLanguageRequest;
import software.amazon.awssdk.services.comprehend.model.DetectSentimentRequest;
diff --git a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerDefaultCredsManualIT.java b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerDefaultCredsManualIT.java
index 674bcc8dccbb..06ea55c00afc 100644
--- a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerDefaultCredsManualIT.java
+++ b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerDefaultCredsManualIT.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.comprehend.Comprehend2Constants;
import org.apache.camel.component.aws2.comprehend.Comprehend2Operations;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import software.amazon.awssdk.services.comprehend.model.DetectSentimentResponse;
diff --git a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerManualIT.java b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerManualIT.java
index db426bc14725..3e8fc7150abc 100644
--- a/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerManualIT.java
+++ b/components/camel-aws/camel-aws2-comprehend/src/test/java/org/apache/camel/component/aws2/comprehend/integration/Comprehend2ProducerManualIT.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.comprehend.Comprehend2Constants;
import org.apache.camel.component.aws2.comprehend.Comprehend2Operations;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-cw/pom.xml b/components/camel-aws/camel-aws2-cw/pom.xml
index 214a62794c91..bee43db08e48 100644
--- a/components/camel-aws/camel-aws2-cw/pom.xml
+++ b/components/camel-aws/camel-aws2-cw/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java
index 9ea0d78c2635..c8fefbf46e4b 100644
--- a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentConfigurationTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.aws2.cw;
import java.time.Instant;
import org.apache.camel.BindToRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java
index aac44d55926c..78bfc2ea2dd5 100644
--- a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java
+++ b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentRegistryClientTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.aws2.cw;
import java.time.Instant;
import org.apache.camel.BindToRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
diff --git a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java
index cb88f6585517..0c6b9b3812e6 100644
--- a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java
+++ b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/CwComponentTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
import software.amazon.awssdk.services.cloudwatch.model.DescribeAlarmsForMetricResponse;
diff --git a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/Aws2CwBase.java b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/Aws2CwBase.java
index a03c85488878..6fd689238043 100644
--- a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/Aws2CwBase.java
+++ b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/Aws2CwBase.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.aws2.cw.Cw2Component;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-ddb/pom.xml b/components/camel-aws/camel-aws2-ddb/pom.xml
index 20045004eb56..6c9a0557c423 100644
--- a/components/camel-aws/camel-aws2-ddb/pom.xml
+++ b/components/camel-aws/camel-aws2-ddb/pom.xml
@@ -91,7 +91,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<!-- test infra -->
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java
index acf8ea816b16..1ba2516570e2 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java
index 22d4632721aa..2214589e9caf 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java
index 36c8e9fa00cc..57d90520efc6 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.ddb;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java
index 1121c82a738f..d49a3f08ea0a 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.ddb;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/Aws2DDBBase.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/Aws2DDBBase.java
index cd581f61921b..b51cf4a395b2 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/Aws2DDBBase.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/Aws2DDBBase.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.aws2.ddb.Ddb2Component;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java
index cae406de7db0..b9223b6d7a73 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java
@@ -28,7 +28,7 @@ import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java
index 142a2cb692d9..70353a83397d 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.ddbstream;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/ShardIteratorHandlerTest.java b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/ShardIteratorHandlerTest.java
index 4244ee23b33d..d9451d582438 100644
--- a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/ShardIteratorHandlerTest.java
+++ b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/ShardIteratorHandlerTest.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration.StreamIteratorType;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-ec2/pom.xml b/components/camel-aws/camel-aws2-ec2/pom.xml
index 8e1d347f94b4..d69a414dd6e0 100644
--- a/components/camel-aws/camel-aws2-ec2/pom.xml
+++ b/components/camel-aws/camel-aws2-ec2/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<!-- test infra -->
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java
index 2f33064e8116..bc38e9d28cd7 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckProfileCredsTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java
index 51b4ae5866b6..aca68726e64e 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2ProducerHealthCheckStaticCredsTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java
index f68528733c5d..2828cddc0299 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.ec2;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java
index c27798aef9e1..bf94bbadb1a9 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.aws2.ec2;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java
index 7b201c303b9a..d5c696778957 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
index 0d7ec2a3e42a..7a124e29f7f9 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.ec2.model.DescribeInstanceStatusResponse;
import software.amazon.awssdk.services.ec2.model.DescribeInstancesResponse;
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/Aws2EC2Base.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/Aws2EC2Base.java
index 7b23819b4043..06440a30c1d4 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/Aws2EC2Base.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/Aws2EC2Base.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.aws2.ec2.AWS2EC2Component;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentManualIT.java b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentManualIT.java
index 2a275a93f233..287bb3072bd3 100644
--- a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentManualIT.java
+++ b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentManualIT.java
@@ -24,7 +24,7 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.ec2.AWS2EC2Constants;
import org.apache.camel.component.aws2.ec2.AWS2EC2Operations;
-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.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-ecs/pom.xml b/components/camel-aws/camel-aws2-ecs/pom.xml
index 3d8bdd08802b..89dfdd846451 100644
--- a/components/camel-aws/camel-aws2-ecs/pom.xml
+++ b/components/camel-aws/camel-aws2-ecs/pom.xml
@@ -62,7 +62,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java
index dfabc398526d..ebd58f4f7408 100644
--- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.ecs;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java
index 9cd655acaffb..40f3f3bbe31c 100644
--- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.ecs;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java
index f066b30cc35e..a41b65c8ee57 100644
--- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java
index 94617d3877b4..dc7d248c6330 100644
--- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java
index 601e8dccb647..7e0fb9f61b93 100644
--- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.ecs.model.CreateClusterResponse;
diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java
index 7124df07facd..53c44566b356 100644
--- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.ecs.model.CreateClusterResponse;
import software.amazon.awssdk.services.ecs.model.DeleteClusterResponse;
diff --git a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerManualIT.java b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerManualIT.java
index bb0ce8815002..bc402a4afb2a 100644
--- a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerManualIT.java
+++ b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerManualIT.java
@@ -21,7 +21,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-eks/pom.xml b/components/camel-aws/camel-aws2-eks/pom.xml
index e95f3c076734..0230725337a2 100644
--- a/components/camel-aws/camel-aws2-eks/pom.xml
+++ b/components/camel-aws/camel-aws2-eks/pom.xml
@@ -68,7 +68,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentClientRegistryTest.java
index 924ed13cc2ea..80066a2eaaaf 100644
--- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.eks;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurationTest.java
index da67972ae7f0..652cdeab9646 100644
--- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.eks;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java
index 55d174e10902..1e2b632c086f 100644
--- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java
index e082ccc111d8..58286ae7555d 100644
--- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java
index be3dd4d80cf0..1ffe75397379 100644
--- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerSpringTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.eks.model.CreateClusterResponse;
diff --git a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java
index 6e781b560370..e23b91e9ad7c 100644
--- a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2ProducerTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.eks.model.CreateClusterResponse;
import software.amazon.awssdk.services.eks.model.DeleteClusterResponse;
diff --git a/components/camel-aws/camel-aws2-eventbridge/pom.xml b/components/camel-aws/camel-aws2-eventbridge/pom.xml
index 3ba497b4042a..8551c8996312 100644
--- a/components/camel-aws/camel-aws2-eventbridge/pom.xml
+++ b/components/camel-aws/camel-aws2-eventbridge/pom.xml
@@ -72,7 +72,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurationTest.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurationTest.java
index fff58a7e53fb..1f9de8fd4dfb 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.eventbridge;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java
index 0ad7512e2eba..ce4f15b0d134 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java
index 7c185b6b7dd5..9d44dde93b5b 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java
index 513021a60cfa..98dc40cbf81b 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleManualIT.java
@@ -27,7 +27,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.eventbridge.EventbridgeConstants;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java
index 96a63ec16961..69d18dc26a51 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleSqsManualIT.java
@@ -27,7 +27,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.eventbridge.EventbridgeConstants;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/Aws2EventbridgeBase.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/Aws2EventbridgeBase.java
index 19747aeed42c..8e19e2ca52e4 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/Aws2EventbridgeBase.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/Aws2EventbridgeBase.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.aws2.eventbridge.EventbridgeComponent;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java
index 364725e5c867..c9897b5deb1d 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java
@@ -28,7 +28,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-iam/pom.xml b/components/camel-aws/camel-aws2-iam/pom.xml
index a16173c2dfbb..069bd1b9bd08 100644
--- a/components/camel-aws/camel-aws2-iam/pom.xml
+++ b/components/camel-aws/camel-aws2-iam/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<!-- test infra -->
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java
index feb74dd55165..65f0e99c1a39 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckProfileCredsTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java
index c2ecdfee5934..f5e28617b2de 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2ProducerHealthCheckStaticCredsTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java
index 85efb36d1819..a63fa5c483b2 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.iam;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java
index ecc907a69a63..629717aaab3a 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.iam;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java
index abcb061972bd..2a68c9bbcf9a 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.iam.model.AddUserToGroupResponse;
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java
index 8d059d0b981f..cc2bea26b192 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.iam.model.AddRoleToInstanceProfileResponse;
import software.amazon.awssdk.services.iam.model.AddUserToGroupResponse;
diff --git a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/Aws2IAMBase.java b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/Aws2IAMBase.java
index ca918320fd98..3395a60a1399 100644
--- a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/Aws2IAMBase.java
+++ b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/integration/Aws2IAMBase.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.aws2.iam.IAM2Component;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-kinesis/pom.xml b/components/camel-aws/camel-aws2-kinesis/pom.xml
index 6988a269030a..69c5180eea2d 100644
--- a/components/camel-aws/camel-aws2-kinesis/pom.xml
+++ b/components/camel-aws/camel-aws2-kinesis/pom.xml
@@ -90,7 +90,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java
index 3268ef5ee96b..7c093446adb3 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.firehose;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentManualIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentManualIT.java
index b851b17c695d..1096104c2c12 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentManualIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentManualIT.java
@@ -26,7 +26,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.firehose.KinesisFirehose2Constants;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.SdkBytes;
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java
index 49b1a90fc642..0d082b6dee6c 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsIT.java
@@ -29,7 +29,7 @@ import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java
index 1b223c8762b4..250aac90953b 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsIT.java
@@ -29,7 +29,7 @@ import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java
index 948ff3b4902b..2a0d7c84f908 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientIT.java
@@ -29,7 +29,7 @@ import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java
index 9a180b53b78f..d28fabe69fc9 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.kinesis;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KclKinesisConsumerIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KclKinesisConsumerIT.java
index 61816ed57594..002fdf1dec69 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KclKinesisConsumerIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KclKinesisConsumerIT.java
@@ -22,7 +22,7 @@ import org.apache.camel.*;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.kinesis.Kinesis2Constants;
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.Disabled;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
index 34ca9cd81592..1fb155b3dc88 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerIT.java
@@ -31,7 +31,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.common.TestUtils;
-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.BeforeEach;
import org.junit.jupiter.api.DisplayName;
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
index d8352c63e478..1e4da5ba2de8 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisConsumerResumeIT.java
@@ -35,7 +35,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.common.TestUtils;
-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.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisProducerIT.java b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisProducerIT.java
index 8b3030175711..7ca2d4cf8970 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisProducerIT.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisProducerIT.java
@@ -33,7 +33,7 @@ import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.clients.KinesisUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.common.TestUtils;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-kms/pom.xml b/components/camel-aws/camel-aws2-kms/pom.xml
index b2274b568d0d..4966da8d26cb 100644
--- a/components/camel-aws/camel-aws2-kms/pom.xml
+++ b/components/camel-aws/camel-aws2-kms/pom.xml
@@ -65,7 +65,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java
index ad72218fd41d..9cbe45be5f09 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.kms;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java
index 4df3d1d0bdc4..5897f316a04e 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.kms;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java
index 969b644a9adf..d090eb59a9b4 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java
index 9aa898470d2c..5c43ae2ad81d 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
import software.amazon.awssdk.services.kms.model.DescribeKeyResponse;
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/Aws2KmsBase.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/Aws2KmsBase.java
index f47a39a86fef..9418579b4c1d 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/Aws2KmsBase.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/Aws2KmsBase.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.aws2.kms.KMS2Component;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-lambda/pom.xml b/components/camel-aws/camel-aws2-lambda/pom.xml
index 8497f4a8eb1b..cb85a7818dc9 100644
--- a/components/camel-aws/camel-aws2-lambda/pom.xml
+++ b/components/camel-aws/camel-aws2-lambda/pom.xml
@@ -69,7 +69,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java
index 34f3767f6af9..6e997d9257a8 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java
index 978f04256446..459e034c3648 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java
index 0c1d75472915..fcfeb0ae7c5a 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.aws2.lambda;
import org.apache.camel.PropertyBindingException;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.lambda.LambdaClient;
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java
index 179a1034492a..b0c761861a2d 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.aws2.lambda;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java
index b21e53df7d8a..7b1537690a2b 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java
index a2d20d10c80a..edf5926dd0f7 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
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;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java
index 5e086d3a9fb1..b76baa592d88 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java
@@ -30,7 +30,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.lambda.model.AddPermissionResponse;
import software.amazon.awssdk.services.lambda.model.CreateAliasResponse;
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/Aws2LambdaBase.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/Aws2LambdaBase.java
index ba7efe2779a2..8721f902c767 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/Aws2LambdaBase.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/Aws2LambdaBase.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.aws2.lambda.Lambda2Component;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentManualIT.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentManualIT.java
index df6850a8b44d..c7d6b895933f 100644
--- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentManualIT.java
+++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentManualIT.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-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.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-mq/pom.xml b/components/camel-aws/camel-aws2-mq/pom.xml
index 56149499a38c..d026fcf9b5e6 100644
--- a/components/camel-aws/camel-aws2-mq/pom.xml
+++ b/components/camel-aws/camel-aws2-mq/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java
index b84e23f3f95e..1f238563ceb7 100644
--- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java
index ba7c13638f67..bb5a0d878a3f 100644
--- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java
index 5fc8570d2d53..58af9f301c4f 100644
--- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.mq;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java
index 58f40d962370..43f2d8edc5d5 100644
--- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.mq;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java
index b424a31f2e57..fcd60dc23c26 100644
--- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.mq.model.BrokerState;
diff --git a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java
index 6d5055d5b7ee..091eb9fe7c20 100644
--- a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java
+++ b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.mq.model.BrokerState;
import software.amazon.awssdk.services.mq.model.ConfigurationId;
diff --git a/components/camel-aws/camel-aws2-msk/pom.xml b/components/camel-aws/camel-aws2-msk/pom.xml
index 8584d138905b..3a4ee8da35ce 100644
--- a/components/camel-aws/camel-aws2-msk/pom.xml
+++ b/components/camel-aws/camel-aws2-msk/pom.xml
@@ -76,7 +76,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java
index 2c10e899d72e..f3f9b7b7d4ab 100644
--- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckProfileCredsTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java
index 1ba38087ceff..69b76f6066e7 100644
--- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2ProducerHealthCheckStaticCredsTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentClientRegistryTest.java
index 9215c947319e..5b8cf5783e54 100644
--- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.msk;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentConfigurationTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentConfigurationTest.java
index fe841e21de13..e020114572a0 100644
--- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.msk;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java
index 023bb37455d6..818f2e247f1d 100644
--- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerSpringTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.kafka.model.BrokerNodeGroupInfo;
diff --git a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java
index 678c397ee9c1..3e9b1b4b8021 100644
--- a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java
+++ b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSKProducerTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.kafka.model.BrokerNodeGroupInfo;
import software.amazon.awssdk.services.kafka.model.ClusterState;
diff --git a/components/camel-aws/camel-aws2-polly/pom.xml b/components/camel-aws/camel-aws2-polly/pom.xml
index 8f9fb83ae8f6..433ef1307dad 100644
--- a/components/camel-aws/camel-aws2-polly/pom.xml
+++ b/components/camel-aws/camel-aws2-polly/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/Polly2ProducerTest.java b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/Polly2ProducerTest.java
index 006b2283bbe9..6373b43c8efc 100644
--- a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/Polly2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/Polly2ProducerTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.polly.model.Lexicon;
import software.amazon.awssdk.services.polly.model.LexiconDescription;
diff --git a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2ProducerManualIT.java b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2ProducerManualIT.java
index 94f539536e3e..262f46b00240 100644
--- a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2ProducerManualIT.java
+++ b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2ProducerManualIT.java
@@ -25,7 +25,7 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.polly.Polly2Constants;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2SpeechToFileManualIT.java b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2SpeechToFileManualIT.java
index dded392b70a4..e712c82067b7 100644
--- a/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2SpeechToFileManualIT.java
+++ b/components/camel-aws/camel-aws2-polly/src/test/java/org/apache/camel/component/aws2/polly/integration/Polly2SpeechToFileManualIT.java
@@ -23,7 +23,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-redshift/pom.xml b/components/camel-aws/camel-aws2-redshift/pom.xml
index 1f7fccded980..d678cf168974 100644
--- a/components/camel-aws/camel-aws2-redshift/pom.xml
+++ b/components/camel-aws/camel-aws2-redshift/pom.xml
@@ -71,7 +71,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentClientRegistryTest.java
index 42467b40bc1d..f5f028150daa 100644
--- a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.redshift.data;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentConfigurationTest.java
index eede17174a7a..690281ae482a 100644
--- a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.redshift.data;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerSpringTest.java b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerSpringTest.java
index 01ae2d7f1b2b..7c301d080daa 100644
--- a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerSpringTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.redshiftdata.model.BatchExecuteStatementResponse;
diff --git a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerTest.java b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerTest.java
index c3a2f2984e5f..944c95cf438e 100644
--- a/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-redshift/src/test/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2ProducerTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.redshiftdata.model.BatchExecuteStatementResponse;
import software.amazon.awssdk.services.redshiftdata.model.CancelStatementResponse;
diff --git a/components/camel-aws/camel-aws2-rekognition/pom.xml b/components/camel-aws/camel-aws2-rekognition/pom.xml
index b42a24cc991f..c2ab9bc1d62b 100644
--- a/components/camel-aws/camel-aws2-rekognition/pom.xml
+++ b/components/camel-aws/camel-aws2-rekognition/pom.xml
@@ -69,7 +69,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentClientRegistryTest.java
index c5500b15c37b..b862c6fe7c71 100644
--- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.rekognition;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentConfigurationTest.java
index 1fae4336b4f4..2f0c61e2307d 100644
--- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.rekognition;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckProfileCredsTest.java
index e2c4d76d042b..3d579060983f 100644
--- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckStaticCredsTest.java
index a0e62b28325c..ae741ad32e0c 100644
--- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerSpringTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerSpringTest.java
index 5da9f6c1f3a9..b8e648e4362d 100644
--- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerSpringTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.rekognition.model.AssociateFacesResponse;
diff --git a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerTest.java b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerTest.java
index cc5734cc2c5d..8b2eff105565 100644
--- a/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-rekognition/src/test/java/org/apache/camel/component/aws2/rekognition/Rekognition2ProducerTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.rekognition.model.*;
diff --git a/components/camel-aws/camel-aws2-s3-vectors/pom.xml b/components/camel-aws/camel-aws2-s3-vectors/pom.xml
index eb5f253df394..8512b25cbaf4 100644
--- a/components/camel-aws/camel-aws2-s3-vectors/pom.xml
+++ b/components/camel-aws/camel-aws2-s3-vectors/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws2-s3-vectors/src/test/java/org/apache/camel/component/aws2/s3vectors/integration/S3VectorsComponentManualIT.java b/components/camel-aws/camel-aws2-s3-vectors/src/test/java/org/apache/camel/component/aws2/s3vectors/integration/S3VectorsComponentManualIT.java
index 4ecb4a45b0b5..22cc295234dc 100644
--- a/components/camel-aws/camel-aws2-s3-vectors/src/test/java/org/apache/camel/component/aws2/s3vectors/integration/S3VectorsComponentManualIT.java
+++ b/components/camel-aws/camel-aws2-s3-vectors/src/test/java/org/apache/camel/component/aws2/s3vectors/integration/S3VectorsComponentManualIT.java
@@ -32,7 +32,7 @@ import org.apache.camel.component.aws2.s3vectors.AWS2S3VectorsConstants;
import org.apache.camel.component.aws2.s3vectors.AWS2S3VectorsEndpoint;
import org.apache.camel.component.aws2.s3vectors.AWS2S3VectorsOperations;
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.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
diff --git a/components/camel-aws/camel-aws2-s3/pom.xml b/components/camel-aws/camel-aws2-s3/pom.xml
index 7c0a6e848c68..581eb9073674 100644
--- a/components/camel-aws/camel-aws2-s3/pom.xml
+++ b/components/camel-aws/camel-aws2-s3/pom.xml
@@ -72,7 +72,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java
index a70fd003951d..70430c8a10b0 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsIT.java
@@ -29,7 +29,7 @@ import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java
index 44d813062636..3f2db22bfc2c 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsIT.java
@@ -28,7 +28,7 @@ import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java
index dfd8853cab41..4763575a7f2b 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.s3;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.S3Client;
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/Aws2S3Base.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/Aws2S3Base.java
index 4d8fd90a9422..ea4960277f42 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/Aws2S3Base.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/Aws2S3Base.java
@@ -26,7 +26,7 @@ import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.common.SharedNameGenerator;
import org.apache.camel.test.infra.common.TestEntityNameGenerator;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import software.amazon.awssdk.services.kms.model.CreateKeyRequest;
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java
index 67939edfc99e..ff69a951aa95 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ComponentManualIT.java
@@ -26,7 +26,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java
index 5c6bf2bb6450..08809e8d8b45 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerManualIT.java
@@ -31,7 +31,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
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.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java
index eabd9e7b0a8c..0916babf6b7e 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationManualIT.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
import org.apache.camel.component.aws2.s3.AWS2S3Operations;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java
index 85609b918a84..7972668bd084 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ObjectRangeOperationManualIT.java
@@ -30,7 +30,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3UploadWithSSES3IT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3UploadWithSSES3IT.java
index 606e43e9ad60..feb01f003917 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3UploadWithSSES3IT.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3UploadWithSSES3IT.java
@@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/stream/AWSS3NamingStrategyTest.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/stream/AWSS3NamingStrategyTest.java
index 4c8912a90dfc..b28589411cec 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/stream/AWSS3NamingStrategyTest.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/stream/AWSS3NamingStrategyTest.java
@@ -21,7 +21,7 @@ import java.util.UUID;
import org.apache.camel.component.aws2.s3.AWS2S3Configuration;
import org.apache.camel.component.aws2.s3.AWS2S3Endpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
diff --git a/components/camel-aws/camel-aws2-ses/pom.xml b/components/camel-aws/camel-aws2-ses/pom.xml
index 0c62181882af..40c26d7a53b7 100644
--- a/components/camel-aws/camel-aws2-ses/pom.xml
+++ b/components/camel-aws/camel-aws2-ses/pom.xml
@@ -81,7 +81,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SESComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SESComponentClientRegistryTest.java
index 80e1141f30af..8434efb84292 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SESComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SESComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.ses;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java
index 9b1d52507704..acb9c79fb5bd 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java
index 90aa68c5c508..a979a2ef63cf 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2ProducerHealthCheckStaticCredsTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentConfigurationTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentConfigurationTest.java
index 20e0a51ff8d3..07578739af43 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentConfigurationTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.aws2.ses;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentSpringTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentSpringTest.java
index 91e74090c4bb..aeb442a5a15f 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentSpringTest.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentSpringTest.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentTest.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentTest.java
index 936963872e9f..1ba9aa3de35a 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentTest.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/SesComponentTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.ses.model.MessageTag;
import software.amazon.awssdk.services.ses.model.SendEmailRequest;
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/integration/SesComponentManualIT.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/integration/SesComponentManualIT.java
index 4c9eb9315857..b9c6ac26b8e5 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/integration/SesComponentManualIT.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/integration/SesComponentManualIT.java
@@ -21,7 +21,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.ses.Ses2Constants;
-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.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-sns/pom.xml b/components/camel-aws/camel-aws2-sns/pom.xml
index 08047ee548ea..9b7cf77b1e41 100644
--- a/components/camel-aws/camel-aws2-sns/pom.xml
+++ b/components/camel-aws/camel-aws2-sns/pom.xml
@@ -88,7 +88,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SNSComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SNSComponentClientRegistryTest.java
index 77db7e15f402..95b645148d37 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SNSComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SNSComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.sns;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java
index a4ddf26a53ff..e1a3d9539d95 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckProfileCredsTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java
index fdba56104bbe..de3939de5938 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2ProducerHealthCheckStaticCredsTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java
index e910c4478e7c..325a235e4741 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.aws2.sns;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentSpringTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentSpringTest.java
index 03fcfb13d981..446e44527c0b 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentSpringTest.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentSpringTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.aws2.sns;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentTest.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentTest.java
index a70ec46279bd..e3182d2d61c9 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentTest.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/Aws2SNSBase.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/Aws2SNSBase.java
index f28065c26d72..f62726fe68ae 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/Aws2SNSBase.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/Aws2SNSBase.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.aws2.sns.Sns2Component;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentFifoManualIT.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentFifoManualIT.java
index 07a7b355a810..12bf6ff1f864 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentFifoManualIT.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentFifoManualIT.java
@@ -21,7 +21,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.sns.Sns2Constants;
-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.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentManualIT.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentManualIT.java
index ec833bb7cdee..faf5568128e0 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentManualIT.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsComponentManualIT.java
@@ -21,7 +21,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.sns.Sns2Constants;
-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.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicWithKmsEncryptionManualIT.java b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicWithKmsEncryptionManualIT.java
index 2b8a3a25cb85..e67852713385 100644
--- a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicWithKmsEncryptionManualIT.java
+++ b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicWithKmsEncryptionManualIT.java
@@ -21,7 +21,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.sns.Sns2Constants;
-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.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-aws/camel-aws2-sqs/pom.xml b/components/camel-aws/camel-aws2-sqs/pom.xml
index 90d986cf371a..ceee15e0778b 100644
--- a/components/camel-aws/camel-aws2-sqs/pom.xml
+++ b/components/camel-aws/camel-aws2-sqs/pom.xml
@@ -82,7 +82,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java
index 4f2b82b7688d..d0edddc3c575 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsIT.java
@@ -28,7 +28,7 @@ import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java
index 3e38cee45bb6..6e684f409930 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsIT.java
@@ -28,7 +28,7 @@ import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java
index 84cd5c743644..c1e14843ff7a 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsIT.java
@@ -28,7 +28,7 @@ import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java
index 1e0d694b64fc..7d322b0b69e2 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.ContextEvents;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.clock.EventClock;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java
index 11f2d87f7141..13dc7e0babac 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerConcurrentConsumersIT.java
@@ -22,7 +22,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
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;
import software.amazon.awssdk.services.sqs.model.Message;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java
index e3be30285ee3..d29c94f316a7 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsBatchConsumerTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
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;
import software.amazon.awssdk.services.sqs.model.Message;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
index f53522eeab0a..880a85d6a863 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.sqs;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
index 9f957278b5d4..e0c2a2841eb2 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.aws2.sqs;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
index cf92e186344e..6e4dc0438e0e 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.sqs.model.DeleteMessageResponse;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java
index 58edc046396e..7567d839c06c 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerExtendMessageVisibilityTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerExtendMessageVisibilityTest.java
index 8c105dd7adc1..e8222944ff41 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerExtendMessageVisibilityTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerExtendMessageVisibilityTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.sqs.model.Message;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java
index 900b8789c2f4..6614f132ad4f 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsConsumerIdleMessageTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.aws2.sqs;
import org.apache.camel.BindToRegistry;
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;
import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java
index 9c15a2682188..9c83c9716973 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsDoesNotExtendMessageVisibilityTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.sqs.model.Message;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java
index 24ac05198e78..3f5375ccd978 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerBatchTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchResponse;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDelayedQueueuTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDelayedQueueuTest.java
index ae821b9e016f..ce6d70a71354 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDelayedQueueuTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDelayedQueueuTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java
index 3b91867758a4..38fbac214c42 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteQueueTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
import software.amazon.awssdk.services.sqs.model.DeleteQueueResponse;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java
index cc386fe1eed6..9cf1dc04698e 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerDeleteTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
import software.amazon.awssdk.services.sqs.model.DeleteMessageResponse;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java
index b4d6f6eeeff3..9e8c8f539b0f 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerListQueuesTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
import software.amazon.awssdk.services.sqs.model.ListQueuesResponse;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java
index 887c24ca31a8..c657f1f0718c 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerPurgeTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
import software.amazon.awssdk.services.sqs.model.PurgeQueueResponse;
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java
index 5ce1eb17d93b..f15c2eea27ca 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.common.SharedNameGenerator;
import org.apache.camel.test.infra.common.TestEntityNameGenerator;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-step-functions/pom.xml b/components/camel-aws/camel-aws2-step-functions/pom.xml
index e5f379b4ae12..4c3ca5fd30c9 100644
--- a/components/camel-aws/camel-aws2-step-functions/pom.xml
+++ b/components/camel-aws/camel-aws2-step-functions/pom.xml
@@ -69,7 +69,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentClientRegistryTest.java
index f6ab0441304f..594af1959c46 100644
--- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.stepfunctions;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentConfigurationTest.java
index b337654b271d..6c7335f9bdad 100644
--- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.stepfunctions;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckProfileCredsTest.java
index ff3f2ccfbfe0..d68c57efefb6 100644
--- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckStaticCredsTest.java
index 32722556e0c9..64eca3ba6610 100644
--- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerSpringTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerSpringTest.java
index 2fc21c899799..485426db0397 100644
--- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerSpringTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.sfn.model.*;
diff --git a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerTest.java b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerTest.java
index 4e2872568935..ea6652cb9b6e 100644
--- a/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-step-functions/src/test/java/org/apache/camel/component/aws2/stepfunctions/StepFunctions2ProducerTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.sfn.model.*;
diff --git a/components/camel-aws/camel-aws2-sts/pom.xml b/components/camel-aws/camel-aws2-sts/pom.xml
index 0a692e20eec4..1c2c1cb1e120 100644
--- a/components/camel-aws/camel-aws2-sts/pom.xml
+++ b/components/camel-aws/camel-aws2-sts/pom.xml
@@ -58,7 +58,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentClientRegistryTest.java
index d807266d34b1..a0b935761a85 100644
--- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentClientRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.sts;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurationTest.java
index 92a978931a11..8e028a334d9e 100644
--- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws2.sts;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java
index 40f43bec3808..1bfec16b6ee8 100644
--- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerSpringTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.sts.model.AssumeRoleResponse;
diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java
index 916db7eda268..8565e3cf7bd1 100644
--- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/STS2ProducerTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.sts.model.AssumeRoleResponse;
import software.amazon.awssdk.services.sts.model.GetFederationTokenResponse;
diff --git a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/Aws2StsBase.java b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/Aws2StsBase.java
index a9de63d33b8b..25f78857fb23 100644
--- a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/Aws2StsBase.java
+++ b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/Aws2StsBase.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.aws2.sts.STS2Component;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-textract/pom.xml b/components/camel-aws/camel-aws2-textract/pom.xml
index 4aec60be16fd..89345807d705 100644
--- a/components/camel-aws/camel-aws2-textract/pom.xml
+++ b/components/camel-aws/camel-aws2-textract/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/Textract2ProducerTest.java b/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/Textract2ProducerTest.java
index 189f8c801fe6..445e41bc8c24 100644
--- a/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/Textract2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/Textract2ProducerTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.services.textract.model.DetectDocumentTextRequest;
diff --git a/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/integration/Textract2DetectTextIT.java b/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/integration/Textract2DetectTextIT.java
index 5d5509aaa4f0..ec7fd50b7961 100644
--- a/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/integration/Textract2DetectTextIT.java
+++ b/components/camel-aws/camel-aws2-textract/src/test/java/org/apache/camel/component/aws2/textract/integration/Textract2DetectTextIT.java
@@ -22,7 +22,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
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.Disabled;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;
diff --git a/components/camel-aws/camel-aws2-timestream/pom.xml b/components/camel-aws/camel-aws2-timestream/pom.xml
index 73e88ac6bbed..e075fa941935 100644
--- a/components/camel-aws/camel-aws2-timestream/pom.xml
+++ b/components/camel-aws/camel-aws2-timestream/pom.xml
@@ -74,7 +74,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentClientRegistryTest.java
index e8d1ca08953b..64d2fef258cd 100644
--- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentClientRegistryTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.component.aws2.timestream.query.AmazonTimestreamQueryCli
import org.apache.camel.component.aws2.timestream.query.Timestream2QueryEndpoint;
import org.apache.camel.component.aws2.timestream.write.AmazonTimestreamWriteClientMock;
import org.apache.camel.component.aws2.timestream.write.Timestream2WriteEndpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentConfigurationTest.java
index 648a71833022..00cae34245e1 100644
--- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/Timestream2ComponentConfigurationTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.aws2.timestream;
import org.apache.camel.component.aws2.timestream.query.Timestream2QueryEndpoint;
import org.apache.camel.component.aws2.timestream.write.Timestream2WriteEndpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckProfileCredsTest.java
index 6c76d4f20927..5fa5e0faa26d 100644
--- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckStaticCredsTest.java
index aab9d7d51500..ddad6b9a3470 100644
--- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerSpringTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerSpringTest.java
index ca48779559f7..c1ca12301d24 100644
--- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerSpringTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Processor;
import org.apache.camel.component.aws2.timestream.Timestream2Constants;
import org.apache.camel.component.aws2.timestream.Timestream2Operations;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.timestreamquery.model.*;
diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerTest.java
index 846df528395c..e63867c79e1c 100644
--- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerTest.java
+++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/query/Timestream2QueryProducerTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.timestream.Timestream2Constants;
import org.apache.camel.component.aws2.timestream.Timestream2Operations;
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;
import software.amazon.awssdk.services.timestreamquery.model.*;
diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckProfileCredsTest.java
index 94588992048c..1e2b706dcd8e 100644
--- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckStaticCredsTest.java
index e2398765c0f9..f29dad48b6f4 100644
--- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerSpringTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerSpringTest.java
index 22163ced7ba4..7bfac7207c82 100644
--- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerSpringTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Processor;
import org.apache.camel.component.aws2.timestream.Timestream2Constants;
import org.apache.camel.component.aws2.timestream.Timestream2Operations;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.timestreamwrite.model.*;
diff --git a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerTest.java b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerTest.java
index 1ae7e56c7133..9ff45df6fe53 100644
--- a/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerTest.java
+++ b/components/camel-aws/camel-aws2-timestream/src/test/java/org/apache/camel/component/aws2/timestream/write/Timestream2WriteProducerTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.timestream.Timestream2Constants;
import org.apache.camel.component.aws2.timestream.Timestream2Operations;
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;
import software.amazon.awssdk.services.timestreamwrite.model.*;
diff --git a/components/camel-aws/camel-aws2-transcribe/pom.xml b/components/camel-aws/camel-aws2-transcribe/pom.xml
index 41bf01f686fa..9305b8109e3f 100644
--- a/components/camel-aws/camel-aws2-transcribe/pom.xml
+++ b/components/camel-aws/camel-aws2-transcribe/pom.xml
@@ -67,7 +67,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/Transcribe2ProducerTest.java b/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/Transcribe2ProducerTest.java
index c92e3e334079..5a7ad82f25c7 100644
--- a/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/Transcribe2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/Transcribe2ProducerTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.transcribe.model.*;
diff --git a/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/integration/Aws2TranscribeBase.java b/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/integration/Aws2TranscribeBase.java
index 33e5c4198bda..f931a04f89c3 100644
--- a/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/integration/Aws2TranscribeBase.java
+++ b/components/camel-aws/camel-aws2-transcribe/src/test/java/org/apache/camel/component/aws2/transcribe/integration/Aws2TranscribeBase.java
@@ -26,7 +26,7 @@ import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.infra.common.SharedNameGenerator;
import org.apache.camel.test.infra.common.TestEntityNameGenerator;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/components/camel-aws/camel-aws2-translate/pom.xml b/components/camel-aws/camel-aws2-translate/pom.xml
index 7708fed9ea82..7edbfc902c80 100644
--- a/components/camel-aws/camel-aws2-translate/pom.xml
+++ b/components/camel-aws/camel-aws2-translate/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java
index 254c5860b84b..6eb5decd87ed 100644
--- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java
+++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckProfileCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java
index 8f69ec7b503f..7e55ed7100cf 100644
--- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java
+++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerHealthCheckStaticCredsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java
index 4bde13149436..843afdbca7c5 100644
--- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java
+++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerSpringTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.translate.model.TranslateTextRequest;
diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java
index 956b7f70d095..0ac9b2cb8a8d 100644
--- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java
+++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ProducerTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import software.amazon.awssdk.services.translate.model.TranslateTextRequest;
diff --git a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java
index 041795cfbf3f..296558f07e44 100644
--- a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java
+++ b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/integration/Translate2ProducerManualIT.java
@@ -24,7 +24,7 @@ import org.apache.camel.component.aws2.translate.Translate2Constants;
import org.apache.camel.component.aws2.translate.Translate2LanguageEnum;
import org.apache.camel.component.aws2.translate.Translate2Operations;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml b/components/camel-azure/camel-azure-cosmosdb/pom.xml
index 72f248899f90..e9f14be76d15 100644
--- a/components/camel-azure/camel-azure-cosmosdb/pom.xml
+++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml
@@ -61,7 +61,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbEndpointTest.java b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbEndpointTest.java
index d2131719b04f..0f2675fd0177 100644
--- a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbEndpointTest.java
+++ b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbEndpointTest.java
@@ -22,7 +22,7 @@ import java.util.Map;
import com.azure.cosmos.models.IndexingMode;
import com.azure.cosmos.models.IndexingPolicy;
import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java
index 58b143d1dc6f..87c31165df27 100644
--- a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java
+++ b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/CosmosDbTestUtils.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import com.azure.cosmos.CosmosAsyncClient;
import com.azure.cosmos.CosmosClientBuilder;
-import org.apache.camel.test.junit5.TestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.function.Executable;
diff --git a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/integration/BaseCamelCosmosDbTestSupport.java b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/integration/BaseCamelCosmosDbTestSupport.java
index 356c403f78f3..01833bff3486 100644
--- a/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/integration/BaseCamelCosmosDbTestSupport.java
+++ b/components/camel-azure/camel-azure-cosmosdb/src/test/java/org/apache/camel/component/azure/cosmosdb/integration/BaseCamelCosmosDbTestSupport.java
@@ -20,7 +20,7 @@ import com.azure.cosmos.CosmosAsyncClient;
import org.apache.camel.CamelContext;
import org.apache.camel.component.azure.cosmosdb.CosmosDbComponent;
import org.apache.camel.component.azure.cosmosdb.CosmosDbTestUtils;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
public abstract class BaseCamelCosmosDbTestSupport extends CamelTestSupport {
diff --git a/components/camel-azure/camel-azure-eventgrid/pom.xml b/components/camel-azure/camel-azure-eventgrid/pom.xml
index f28bc5550347..506d40a57cd0 100644
--- a/components/camel-azure/camel-azure-eventgrid/pom.xml
+++ b/components/camel-azure/camel-azure-eventgrid/pom.xml
@@ -54,7 +54,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-azure/camel-azure-eventgrid/src/test/java/org/apache/camel/component/azure/eventgrid/EventGridComponentTest.java b/components/camel-azure/camel-azure-eventgrid/src/test/java/org/apache/camel/component/azure/eventgrid/EventGridComponentTest.java
index dc67591aa2ca..c5f0dfb22444 100644
--- a/components/camel-azure/camel-azure-eventgrid/src/test/java/org/apache/camel/component/azure/eventgrid/EventGridComponentTest.java
+++ b/components/camel-azure/camel-azure-eventgrid/src/test/java/org/apache/camel/component/azure/eventgrid/EventGridComponentTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.azure.eventgrid;
import com.azure.identity.DefaultAzureCredential;
import com.azure.identity.DefaultAzureCredentialBuilder;
import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml b/components/camel-azure/camel-azure-eventhubs/pom.xml
index b8681996c023..767447e25d73 100644
--- a/components/camel-azure/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
@@ -58,7 +58,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentTest.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentTest.java
index 15d3baa0ec38..48924bf287f8 100644
--- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentTest.java
+++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentTest.java
@@ -22,7 +22,7 @@ import com.azure.messaging.eventhubs.EventHubConsumerAsyncClient;
import com.azure.messaging.eventhubs.EventHubProducerAsyncClient;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.component.azure.eventhubs.client.EventHubsClientFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java
index 9104f8eedd91..af7d9def72b7 100644
--- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java
+++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/TestUtils.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.azure.eventhubs;
import java.io.IOException;
import java.util.Properties;
-import org.apache.camel.test.junit5.TestSupport;
+import org.apache.camel.test.junit6.TestSupport;
public final class TestUtils {
diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsConsumerIT.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsConsumerIT.java
index 5403d6be97e3..a5019b203bb1 100644
--- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsConsumerIT.java
+++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsConsumerIT.java
@@ -37,7 +37,7 @@ import org.apache.camel.component.azure.eventhubs.EventHubsConstants;
import org.apache.camel.component.azure.eventhubs.TestUtils;
import org.apache.camel.component.azure.eventhubs.client.EventHubsClientFactory;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerCustomClientIT.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerCustomClientIT.java
index 222cb7223f55..62471697c986 100644
--- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerCustomClientIT.java
+++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerCustomClientIT.java
@@ -34,7 +34,7 @@ import org.apache.camel.component.azure.eventhubs.EventHubsConstants;
import org.apache.camel.component.azure.eventhubs.TestUtils;
import org.apache.camel.component.azure.eventhubs.client.EventHubsClientFactory;
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.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerIT.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerIT.java
index acf052f15b5d..59ff86733743 100644
--- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerIT.java
+++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/EventHubsProducerIT.java
@@ -33,7 +33,7 @@ import org.apache.camel.component.azure.eventhubs.EventHubsConstants;
import org.apache.camel.component.azure.eventhubs.TestUtils;
import org.apache.camel.component.azure.eventhubs.client.EventHubsClientFactory;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
diff --git a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/operations/EventHubsProducerOperationsIT.java b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/operations/EventHubsProducerOperationsIT.java
index a152acdcd9b1..e57ced1a38ad 100644
--- a/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/operations/EventHubsProducerOperationsIT.java
+++ b/components/camel-azure/camel-azure-eventhubs/src/test/java/org/apache/camel/component/azure/eventhubs/integration/operations/EventHubsProducerOperationsIT.java
@@ -33,7 +33,7 @@ import org.apache.camel.component.azure.eventhubs.TestUtils;
import org.apache.camel.component.azure.eventhubs.client.EventHubsClientFactory;
import org.apache.camel.component.azure.eventhubs.operations.EventHubsProducerOperations;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
diff --git a/components/camel-azure/camel-azure-files/pom.xml b/components/camel-azure/camel-azure-files/pom.xml
index d1af8c615bbf..3f83a71f4574 100644
--- a/components/camel-azure/camel-azure-files/pom.xml
+++ b/components/camel-azure/camel-azure-files/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesConfigurationTest.java b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesConfigurationTest.java
index 49a14c645797..07a4d70015d0 100644
--- a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesConfigurationTest.java
+++ b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesConfigurationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.file.azure;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesEndpointTest.java b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesEndpointTest.java
index 4fc7e2d67b72..c9cdeff6d3bf 100644
--- a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesEndpointTest.java
+++ b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesEndpointTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.file.azure;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesOperationsTest.java b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesOperationsTest.java
index 35140ef35633..84e1bb9b99f6 100644
--- a/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesOperationsTest.java
+++ b/components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesOperationsTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.azure;
import com.azure.core.http.policy.AzureSasCredentialPolicy;
import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
import com.azure.storage.common.policy.StorageSharedKeyCredentialPolicy;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-azure/camel-azure-key-vault/pom.xml b/components/camel-azure/camel-azure-key-vault/pom.xml
index 1282a0794110..9f0c8b0a8c34 100644
--- a/components/camel-azure/camel-azure-key-vault/pom.xml
+++ b/components/camel-azure/camel-azure-key-vault/pom.xml
@@ -73,7 +73,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/KeyVaultConfigurationTest.java b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/KeyVaultConfigurationTest.java
index 17effb111cdb..5d8c1cd2beaa 100644
--- a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/KeyVaultConfigurationTest.java
+++ b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/KeyVaultConfigurationTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.azure.key.vault;
import com.azure.identity.DefaultAzureCredentialBuilder;
import com.azure.security.keyvault.secrets.SecretClient;
import com.azure.security.keyvault.secrets.SecretClientBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
index 575678a6ae32..e185592247ff 100644
--- a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
+++ b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.azure.key.vault.KeyVaultConstants;
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;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java
index 87ba50605127..657c3a8e45e1 100644
--- a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java
+++ b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultPropertiesSourceNoEnvTestIT.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.azure.key.vault.integration.operations;
import org.apache.camel.FailedToCreateRouteException;
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;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/components/camel-azure/camel-azure-schema-registry/pom.xml b/components/camel-azure/camel-azure-schema-registry/pom.xml
index 6d8481624f14..a9f8e4e17377 100644
--- a/components/camel-azure/camel-azure-schema-registry/pom.xml
+++ b/components/camel-azure/camel-azure-schema-registry/pom.xml
@@ -51,7 +51,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml b/components/camel-azure/camel-azure-servicebus/pom.xml
index f51cc12e9ced..df55ac86d4dc 100644
--- a/components/camel-azure/camel-azure-servicebus/pom.xml
+++ b/components/camel-azure/camel-azure-servicebus/pom.xml
@@ -54,7 +54,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusEndpointTest.java b/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusEndpointTest.java
index c4a87039ce9b..e54f09d31d6e 100644
--- a/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusEndpointTest.java
+++ b/components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusEndpointTest.java
@@ -27,7 +27,7 @@ import com.azure.messaging.servicebus.ServiceBusSenderClient;
import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.component.azure.servicebus.client.ServiceBusClientFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml b/components/camel-azure/camel-azure-storage-blob/pom.xml
index bb20e6b88af8..fbcb2f938945 100644
--- a/components/camel-azure/camel-azure-storage-blob/pom.xml
+++ b/components/camel-azure/camel-azure-storage-blob/pom.xml
@@ -87,7 +87,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobComponentTest.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobComponentTest.java
index 029bb5f33073..289a61a1b6ab 100644
--- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobComponentTest.java
+++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobComponentTest.java
@@ -27,7 +27,7 @@ import com.azure.storage.common.StorageSharedKeyCredential;
import org.apache.camel.Producer;
import org.apache.camel.component.azure.storage.blob.client.BlobClientFactory;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.azure.storage.blob.CredentialType.SHARED_KEY_CREDENTIAL;
diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConfigurationOptionsProxyTest.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConfigurationOptionsProxyTest.java
index 59a5a8cbb97f..2103e4d20850 100644
--- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConfigurationOptionsProxyTest.java
+++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConfigurationOptionsProxyTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.azure.storage.blob;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobTestUtils.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobTestUtils.java
index 21ea89972526..fd509255521d 100644
--- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobTestUtils.java
+++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobTestUtils.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.azure.storage.blob;
import java.util.Properties;
-import org.apache.camel.test.junit5.TestSupport;
+import org.apache.camel.test.junit6.TestSupport;
public final class BlobTestUtils {
diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java
index d863f222f31f..bf8a48149f1b 100644
--- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java
+++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java
@@ -24,7 +24,7 @@ import org.apache.camel.test.infra.azure.common.AzureConfigs;
import org.apache.camel.test.infra.azure.common.services.AzureService;
import org.apache.camel.test.infra.azure.storage.blob.clients.AzureStorageBlobClientUtils;
import org.apache.camel.test.infra.azure.storage.blob.services.AzureStorageBlobServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.BeforeAll;
diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobCopyProducerManualIT.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobCopyProducerManualIT.java
index 80af145a5218..2b3a033e9b21 100644
--- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobCopyProducerManualIT.java
+++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobCopyProducerManualIT.java
@@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.azure.storage.blob.BlobConstants;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java
index 3e7755113dfe..12c28cad6832 100644
--- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java
+++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java
@@ -40,7 +40,7 @@ import org.apache.camel.component.azure.storage.blob.BlobConstants;
import org.apache.camel.component.azure.storage.blob.BlobType;
import org.apache.camel.component.azure.storage.blob.client.BlobClientWrapper;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
diff --git a/components/camel-azure/camel-azure-storage-datalake/pom.xml b/components/camel-azure/camel-azure-storage-datalake/pom.xml
index 7a2d7659133d..1107f52c401a 100644
--- a/components/camel-azure/camel-azure-storage-datalake/pom.xml
+++ b/components/camel-azure/camel-azure-storage-datalake/pom.xml
@@ -56,7 +56,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java
index 358fd9228199..31030e6d391e 100644
--- a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java
+++ b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.component.azure.storage.datalake.DataLakeConfiguration;
import org.apache.camel.component.azure.storage.datalake.DataLakeEndpoint;
import org.apache.camel.component.azure.storage.datalake.DataLakeOperationsDefinition;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/Base.java b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/Base.java
index bb6d4d243670..743ec3d053f4 100644
--- a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/Base.java
+++ b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/Base.java
@@ -30,7 +30,7 @@ import org.apache.camel.test.infra.azure.common.AzureConfigs;
import org.apache.camel.test.infra.azure.common.services.AzureService;
import org.apache.camel.test.infra.azure.storage.datalake.clients.AzureStorageDataLakeClientUtils;
import org.apache.camel.test.infra.azure.storage.datalake.services.AzureStorageDataLakeServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.BeforeAll;
diff --git a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeDirectoryOperationTest.java b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeDirectoryOperationTest.java
index 216843106242..bfc849894f96 100644
--- a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeDirectoryOperationTest.java
+++ b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeDirectoryOperationTest.java
@@ -21,7 +21,7 @@ import com.azure.core.http.rest.ResponseBase;
import com.azure.storage.file.datalake.DataLakeFileClient;
import org.apache.camel.component.azure.storage.datalake.DataLakeConfiguration;
import org.apache.camel.component.azure.storage.datalake.client.DataLakeDirectoryClientWrapper;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
diff --git a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperationTest.java b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperationTest.java
index 0c3380d43b7f..82c0e2bb976c 100644
--- a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperationTest.java
+++ b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperationTest.java
@@ -34,7 +34,7 @@ import org.apache.camel.component.azure.storage.datalake.DataLakeConfiguration;
import org.apache.camel.component.azure.storage.datalake.DataLakeConstants;
import org.apache.camel.component.azure.storage.datalake.client.DataLakeFileClientWrapper;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
diff --git a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileSystemOperationTest.java b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileSystemOperationTest.java
index eee0364982b7..66507a4b746a 100644
--- a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileSystemOperationTest.java
+++ b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileSystemOperationTest.java
@@ -26,7 +26,7 @@ import com.azure.storage.file.datalake.models.PathItem;
import org.apache.camel.component.azure.storage.datalake.DataLakeConfiguration;
import org.apache.camel.component.azure.storage.datalake.DataLakeConstants;
import org.apache.camel.component.azure.storage.datalake.client.DataLakeFileSystemClientWrapper;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
diff --git a/components/camel-azure/camel-azure-storage-queue/pom.xml b/components/camel-azure/camel-azure-storage-queue/pom.xml
index 61204a7cb112..077fe2430d41 100644
--- a/components/camel-azure/camel-azure-storage-queue/pom.xml
+++ b/components/camel-azure/camel-azure-storage-queue/pom.xml
@@ -83,7 +83,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java
index 66c46c44f844..d4afd60314be 100644
--- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java
+++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.Producer;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.component.azure.storage.queue.client.QueueClientFactory;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueConfigurationOptionsProxyTest.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueConfigurationOptionsProxyTest.java
index eb3709a6b194..eedb570cb228 100644
--- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueConfigurationOptionsProxyTest.java
+++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueConfigurationOptionsProxyTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.azure.storage.queue;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueTestUtils.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueTestUtils.java
index e65557f4751e..6f32e3911a5c 100644
--- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueTestUtils.java
+++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueTestUtils.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.azure.storage.queue;
import java.io.IOException;
import java.util.Properties;
-import org.apache.camel.test.junit5.TestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java
index 4ec39797b006..666e361eeb49 100644
--- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java
+++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java
@@ -24,7 +24,7 @@ import org.apache.camel.test.infra.azure.common.AzureConfigs;
import org.apache.camel.test.infra.azure.common.services.AzureService;
import org.apache.camel.test.infra.azure.storage.queue.clients.AzureStorageClientUtils;
import org.apache.camel.test.infra.azure.storage.queue.services.AzureStorageQueueServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.BeforeAll;
diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/QueueOperationsTest.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/QueueOperationsTest.java
index 1ae5e8148ff5..9da39676a4d1 100644
--- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/QueueOperationsTest.java
+++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/QueueOperationsTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.component.azure.storage.queue.QueueConfiguration;
import org.apache.camel.component.azure.storage.queue.QueueConstants;
import org.apache.camel.component.azure.storage.queue.client.QueueClientWrapper;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/integration/QueueOperationsIT.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/integration/QueueOperationsIT.java
index f2c3feb3a481..a5c68540cd58 100644
--- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/integration/QueueOperationsIT.java
+++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/operations/integration/QueueOperationsIT.java
@@ -34,7 +34,7 @@ import org.apache.camel.component.azure.storage.queue.client.QueueServiceClientW
import org.apache.camel.component.azure.storage.queue.operations.QueueOperationResponse;
import org.apache.camel.component.azure.storage.queue.operations.QueueOperations;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
diff --git a/components/camel-barcode/pom.xml b/components/camel-barcode/pom.xml
index 4a435357899f..da2f65c1da9f 100644
--- a/components/camel-barcode/pom.xml
+++ b/components/camel-barcode/pom.xml
@@ -55,7 +55,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
index 35f31a6be68b..bed4be68cc42 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
@@ -23,7 +23,7 @@ import com.google.zxing.BarcodeFormat;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
-import org.apache.camel.test.junit5.TestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java
index c1aafc139da3..b60f7dfd1a1c 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.dataformat.barcode;
import org.apache.camel.CamelContext;
import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.springframework.context.ApplicationContext;
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
index ffeb9257c0ad..71f86e7d4187 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
@@ -36,7 +36,7 @@ import com.google.zxing.common.HybridBinarizer;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
diff --git a/components/camel-base64/pom.xml b/components/camel-base64/pom.xml
index 37bc5d094830..43fb8f1f55b4 100644
--- a/components/camel-base64/pom.xml
+++ b/components/camel-base64/pom.xml
@@ -53,12 +53,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java
index dc382726086c..133d8b2a2eae 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java
@@ -19,7 +19,7 @@ package org.apache.camel.dataformat.base64;
import org.apache.camel.EndpointInject;
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 static org.junit.jupiter.api.Assertions.assertArrayEquals;
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionDecodeTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionDecodeTest.java
index 865b194e8acf..e0817b184feb 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionDecodeTest.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionDecodeTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.dataformat.base64;
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 Base64PropertiesFunctionDecodeTest extends CamelTestSupport {
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionOptionalTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionOptionalTest.java
index 3aff51ebbdd0..bf465c94fff6 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionOptionalTest.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionOptionalTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.dataformat.base64;
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 Base64PropertiesFunctionOptionalTest extends CamelTestSupport {
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java
index 5c392fb9f0cd..6a11a46c0b6b 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.dataformat.base64;
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 Base64PropertiesFunctionTest extends CamelTestSupport {
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SimpleBase64Test.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SimpleBase64Test.java
index 6c38bd21ae1f..cad581b16ffd 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SimpleBase64Test.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SimpleBase64Test.java
@@ -17,7 +17,7 @@
package org.apache.camel.dataformat.base64;
import org.apache.camel.Expression;
-import org.apache.camel.test.junit5.LanguageTestSupport;
+import org.apache.camel.test.junit6.LanguageTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java
index 0f8956feffbb..67756cf5809f 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java
@@ -18,7 +18,7 @@ package org.apache.camel.dataformat.base64;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml
index 32ea688dfe9d..40e7ab63b9ee 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
+ <artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
index 74d0798c5033..0aac0d949642 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
@@ -27,7 +27,7 @@ import jakarta.validation.Path.Node;
import jakarta.validation.TraversableResolver;
import org.apache.camel.BindToRegistry;
-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.condition.DisabledOnOs;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
index e9068fe16a1b..e23b6de4c34e 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
@@ -26,7 +26,7 @@ import jakarta.validation.ConstraintViolation;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInstance;
@@ -35,7 +35,7 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
index 7fce18c0512e..bd91721b85eb 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
@@ -23,7 +23,7 @@ import jakarta.validation.spi.ValidationProvider;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.hibernate.validator.HibernateValidator;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
index 0f6b4c8e4824..354747db4dfa 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
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 HibernateValidationProviderResolverTest extends CamelTestSupport {
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
index a5ada810688f..dd8363472417 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
@@ -21,7 +21,7 @@ import jakarta.validation.ValidatorFactory;
import jakarta.validation.bootstrap.GenericBootstrap;
import org.apache.camel.BindToRegistry;
-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.condition.DisabledOnOs;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
index d409c99a2fa1..7ac3861a76d7 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
@@ -21,7 +21,7 @@ import jakarta.validation.ValidatorFactory;
import jakarta.validation.bootstrap.GenericBootstrap;
import org.apache.camel.BindToRegistry;
-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.condition.DisabledOnOs;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryTest.java
index 390717fabd91..c96e3e01870c 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.bean.validator;
-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.condition.DisabledOnOs;
diff --git a/components/camel-beanio/pom.xml b/components/camel-beanio/pom.xml
index cda947ac4e49..90d2334976f6 100644
--- a/components/camel-beanio/pom.xml
+++ b/components/camel-beanio/pom.xml
@@ -46,7 +46,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java
index 11e1585b6a46..b9f3e80f68c3 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java
@@ -25,7 +25,7 @@ import java.util.Locale;
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.beanio.InvalidRecordException;
import org.beanio.UnexpectedRecordException;
import org.beanio.UnidentifiedRecordException;
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf;
public class BeanIODataFormatComplexTest extends CamelTestSupport {
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java
index dc278aa83d80..26c34d5b9cd5 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java
@@ -23,7 +23,7 @@ import java.util.List;
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;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java
index 52ca0f73ca0e..f7f4fec1f4a7 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
public class BeanIODataFormatSimpleTest extends CamelTestSupport {
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java
index 00150fbb5576..24ff3ec22f89 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java
@@ -23,7 +23,7 @@ import java.util.List;
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;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java
index 68d5a379a722..49048f8418d0 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java
@@ -23,7 +23,7 @@ import java.util.List;
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 BeanIOSplitterTest extends CamelTestSupport {
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOUnmarshalSingleObjectTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOUnmarshalSingleObjectTest.java
index a61f7e74d474..b6f3f54c65f6 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOUnmarshalSingleObjectTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOUnmarshalSingleObjectTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java
index ac3c9d7594c9..508f21fc886d 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java
index b11818f10fb5..7dae4f62c342 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.beanio.BeanIODataFormat;
import org.apache.camel.dataformat.beanio.Constants;
import org.apache.camel.spi.DataFormat;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index 37da4d68615d..5ad77e6c5f22 100644
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -51,7 +51,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring-junit5</artifactId>
+ <artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java
index 295d33813e13..142a60701f02 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
index 2ffa6b5e3de1..1da0cb1dca6f 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
import org.apache.camel.model.dataformat.BindyDataFormat;
import org.apache.camel.model.dataformat.BindyType;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java
index c48d415808e9..3325e43089a5 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
import org.apache.camel.model.dataformat.BindyDataFormat;
import org.apache.camel.model.dataformat.BindyType;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
index c688f9b4ef15..24cf12b763ac 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.dataformat.bindy.format.factories.DefaultFactoryRegistry
import org.apache.camel.dataformat.bindy.model.car.Car;
import org.apache.camel.dataformat.bindy.model.car.Car.Colour;
import org.apache.camel.model.dataformat.BindyType;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java
index 3c246c853911..de2505994396 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.complex.generateheader.Client;
import org.apache.camel.dataformat.bindy.model.complex.generateheader.Order;
import org.apache.camel.dataformat.bindy.model.complex.generateheader.Security;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java
index 9c6b07d67682..517d019e0aee 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Client;
import org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order;
import org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Security;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java
index 692834c89926..da84433e6595 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
index f7032d4b1db2..e6fd7b7669da 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java
index 752e9cb77193..4c6f5439d677 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.dataformat.BindyType;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java
index f089aabf965f..be1d6bdc1360 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexRegexSeparatorTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.model.dataformat.BindyType;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java
index bf779aa3de90..4ee4ce53cdcd 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvFieldEndingWithSeparatorIssueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvFieldEndingWithSeparatorIssueTest.java
index 1605ad2ae67b..27e909675370 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvFieldEndingWithSeparatorIssueTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvFieldEndingWithSeparatorIssueTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.csv.MyCsvRecord;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.dataformat.BindyType;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
index ccf099b92d9b..6cd954de473a 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvStringDefaultValueAsNullTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvStringDefaultValueAsNullTest.java
index 3fe132d0bb06..739a99de7cb8 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvStringDefaultValueAsNullTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvStringDefaultValueAsNullTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.csv.MyCsvRecord;
import org.apache.camel.model.dataformat.BindyType;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java
index 3c4a7825b99c..b2950d078923 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java
index 93566eb2e72e..df044ea6c36c 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java
index 8e12e50b6cc5..4ee47b9faea1 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyEscapedCsvTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyEscapedCsvTest.java
index 32ca69926370..6fdffd644ca4 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyEscapedCsvTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyEscapedCsvTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.dataformat.bindy.Format;
import org.apache.camel.dataformat.bindy.annotation.BindyConverter;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java
index 19722444ddb5..a16c189d9081 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java
index 12f8db0bec28..3a5a79f66831 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalEndWithLineBreakTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.dataformat.bindy.model.csv.MyCsvRecord;
import org.apache.camel.dataformat.bindy.model.csv.MyCsvRecord2;
import org.apache.camel.dataformat.bindy.util.ConverterUtils;
import org.apache.camel.model.dataformat.BindyType;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
/**
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java
index 18c2b7565888..3f37787ec91d 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.linkonetomany.Order;
import org.apache.camel.dataformat.bindy.model.simple.linkonetomany.OrderItem;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java
index eff889333ca2..68d2626bc6a6 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java
@@ -21,7 +21,7 @@ import java.util.Locale;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.padding.Unity;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
index c233af26fb13..2b21f853cd32 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.pipeline.MyData;
import org.apache.camel.model.dataformat.BindyType;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
index 2ec7b4146745..1cba0214c31f 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java
index c32259b1071f..4a834a116741 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java
index 49c026627e2a..c523d1c22291 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvAutospanLineTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.dataformat.bindy.csv;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.spanLastRecord.SpanLastRecord;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java
index 91dd9824c39e..c50f2eb3da4c 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java
index ef0dbc49eede..88639eba2140 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
index e89d9a045d84..af0f86398dae 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java
index 0e1b0e9d2ad1..dc45760ef761 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.util.ConverterUtils;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java
index 380810653bc7..fb172f570094 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.util.ConverterUtils;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java
index ded11e2513b6..86944eabcfaa 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.util.ConverterUtils;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java
index 9fd6323c1742..b724fd49ae6b 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.util.ConverterUtils;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java
index 44b9a75416de..dc885b30b75e 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java
@@ -30,7 +30,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.oneclassgenerateheader.Order;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java
index 5a74d376be5d..6cb5a0346a06 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java
index f41a8bd942e8..156ef63e2401 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
index ed1391e13c51..eab03377d15e 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
import org.apache.camel.model.dataformat.BindyDataFormat;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
index 32bd59b2b60c..b693b3b5613f 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
... 37791 lines suppressed ...