[camel] branch master updated (909f6c0 -> 77f6b83)

classic Classic list List threaded Threaded
22 messages Options
12
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (909f6c0 -> 77f6b83)

gnodet
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 909f6c0  CAMEL-15143: Fixed test to not use undertow
     new d497a94  Remove unused imports in tests
     new 20d531f  [CAMEL-11807] Upgrade camel-core to junit5
     new 5f08cdb  [CAMEL-11807] Upgrade camel-management to junit5
     new cfab0a7  [CAMEL-11807] Upgrade camel-endpointdsl to junit5
     new 33b6f34  [CAMEL-11807] Upgrade camel-componentdsl to junit5
     new df4753a  [CAMEL-11807] Upgrade camel-util to junit5
     new fd01a2a  [CAMEL-11807] Upgrade camel-caffeine-lrucache to junit5
     new 2df8746  [CAMEL-11807] Uprade camel-main to junit5
     new b7710a1  [CAMEL-11807] Upgrade camel-health to junit5
     new cc1df96  [CAMEL-11807] Upgrade camel-xml-io to junit5
     new 45ea5a0  [CAMEL-11807] Upgrade camel-xml-jaxp to junit5
     new 03560ec  [CAMEL-11807] Upgrade camel-core-xml to junit5
     new d39c65e  [CAMEL-11807] Upgrade camel-spring to junit5
     new 378d84d  [CAMEL-11807] Upgrade camel-cloud to junit5
     new db7b295  [CAMEL-11807] Fix doc related to unit tests
     new 5795395  Improve FileConsumerStartingDirectoryMustHaveAccessTest test
     new 0064ea9  Improve stability of AggregateLostGroupIssueTest for rerun
     new c717425a Fix ResourceHelper#findInFileSystem on Windows
     new 92dedbf  Fix FileDataSetProducerTest on windows
     new 7f80f15  [CAMEL-11807] Always use junit-jupiter as a test dependency
     new 77f6b83  [CAMEL-11807] Upgrade camel-util-json to junit5

The 21 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../camel/component/dataset/FileDataSet.java       |   2 -
 .../freemarker/FreemarkerSetHeaderTest.java        |   1 -
 .../FaultToleranceRefConfigurationTest.java        |   3 -
 .../FaultToleranceRouteBulkheadFallbackTest.java   |   1 -
 .../FaultToleranceTimeoutWithFallbackTest.java     |   1 -
 components/camel-spring/pom.xml                    |  11 +-
 .../bean/AutowireConstructorRouteTest.java         |   2 +-
 .../bean/AutowireConstructorRouteTwoTest.java      |   2 +-
 .../camel/component/bean/BeanBindingTest.java      |   2 +-
 .../apache/camel/component/bean/BeanRouteTest.java |  11 +-
 .../component/bean/BeanWithRecipientListTest.java  |   2 +-
 .../camel/component/cron/SpringCronRouteTest.java  |   2 +-
 .../camel/component/dataset/SpringDataSetTest.java |   2 +-
 .../camel/component/event/EventRouteTest.java      |   7 +-
 .../component/log/CustomExchangeFormatterTest.java |   6 +-
 .../camel/component/log/SpringLogMarkerTest.java   |   2 +-
 .../camel/component/log/SpringLogMaskTest.java     |   7 +-
 .../apache/camel/component/log/SpringLogTest.java  |   2 +-
 .../BaseSpringPropertiesComponentTest.java         |   2 +-
 ...elSpringPropertyPlaceholderConfigurer2Test.java |   2 +-
 ...ingPropertyPlaceholderConfigurerNestedTest.java |   2 +-
 ...melSpringPropertyPlaceholderConfigurerTest.java |   2 +-
 .../SpringAttributeNewLineRouteContextRefTest.java |   2 +-
 .../properties/SpringAttributeNewLineTest.java     |   6 +-
 .../properties/SpringBuilderRefBeanInjectTest.java |   2 +-
 .../properties/SpringBuilderRefPropertiesTest.java |   2 +-
 .../SpringBuilderRefPropertyInjectTest.java        |   2 +-
 ...rorHandlerInlinedPropertiesPlaceholderTest.java |   5 +-
 ...pringErrorHandlerPropertiesPlaceholderTest.java |   5 +-
 .../SpringOptionalPropertiesDslTokenizeTest.java   |   2 +-
 .../properties/SpringPackagePropertiesTest.java    |   2 +-
 .../SpringPackageScanPropertiesTest.java           |   2 +-
 .../SpringPropertiesAfterTransactedDSLTest.java    |   2 +-
 .../SpringPropertiesComponentFunctionTest.java     |   2 +-
 .../SpringPropertiesComponentRefTest.java          |   2 +-
 .../properties/SpringPropertiesComponentTest.java  |   5 +-
 .../apache/camel/component/rest/RestRefTest.java   |   5 +-
 .../rest/SpringFromRestDuplicateTest.java          |   9 +-
 .../language/SpringSimpleEmptyStringTest.java      |   2 +-
 .../camel/language/SpringSimpleExpressionTest.java |   2 +-
 .../camel/language/SpringSimpleNewlineTest.java    |   4 +-
 .../SpringSimplePropertyPlaceholderClashTest.java  |   2 +-
 .../camel/language/SpringSimpleRegexTest.java      |   4 +-
 .../camel/language/SpringSimpleWeirdIssueTest.java |   2 +-
 .../SpringTokenXMLPairNamespaceSplitTest.java      |   2 +-
 .../camel/language/SpringXMLTokenSplitTest.java    |   2 +-
 .../camel/language/spel/SpelNonSpringTest.java     |   2 +-
 .../camel/language/spel/SpelResourceTest.java      |   2 +-
 .../apache/camel/language/spel/SpelRouteTest.java  |   2 +-
 .../apache/camel/language/spel/SpelSpringTest.java |   2 +-
 .../org/apache/camel/language/spel/SpelTest.java   |   4 +-
 .../spel/SpringSimpleMultiLineExpressionTest.java  |   4 +-
 .../camel/processor/RemoveHeadersExcludeTest.java  |   2 +-
 .../spring/ApplicationContextClassLoaderTest.java  |   9 +-
 .../spring/ApplicationContextTestSupport.java      |  17 ++-
 .../apache/camel/spring/CamelContextAwareTest.java |  23 +--
 .../camel/spring/CamelContextFactoryBeanTest.java  |  14 +-
 .../camel/spring/CamelGlobalOptionsTest.java       |   4 +-
 .../camel/spring/CamelLoadRoutesFromXMLTest.java   |   6 +-
 .../spring/CircularComponentCreationTest.java      |  10 +-
 .../spring/CircularComponentInjectionTest.java     |   9 +-
 .../spring/CustomProcessorWithNamespacesTest.java  |  17 ++-
 .../apache/camel/spring/DefaultJMXAgentTest.java   |  13 +-
 .../camel/spring/DefaultStreamCachingTest.java     |   9 +-
 .../apache/camel/spring/DisableJmxAgentTest.java   |   6 +-
 .../spring/DumpModelAsXmlPlaceholdersTest.java     |   6 +-
 .../apache/camel/spring/EndpointReferenceTest.java |  15 +-
 .../apache/camel/spring/EndpointToIdRefTest.java   |   2 +-
 .../org/apache/camel/spring/InjectedBeanTest.java  |  24 ++--
 .../camel/spring/JMXAgentPropertiesTest.java       |   4 +-
 .../spring/LifecycleStrategyInjectionTest.java     |   4 +-
 .../MultipleLifecycleStrategyInjectionTest.java    |   4 +-
 .../apache/camel/spring/NodeIdReferenceTest.java   |   2 +-
 .../apache/camel/spring/RegistryInjectionTest.java |   4 +-
 .../RoutingUsingCamelContextFactoryTest.java       |  15 +-
 .../spring/SendMessageOnRouteStartAndStopTest.java |  16 ++-
 .../spring/SpringBeanIoCStaticMethodTest.java      |   2 +-
 .../SpringCamelContextShutdownAfterBeanTest.java   |   4 +-
 .../SpringCamelContextShutdownBeforeBeanTest.java  |   4 +-
 .../camel/spring/SpringConsumerTemplateTest.java   |   6 +-
 .../camel/spring/SpringEndpointPropertyTest.java   |   5 +-
 .../spring/SpringLogDebugBodyMaxCharsTest.java     |   4 +-
 .../org/apache/camel/spring/SpringMDCTest.java     |   4 +-
 .../camel/spring/SpringMDCTransactedTest.java      |   6 +-
 .../SpringMDCWithBreadcrumbDisabledTest.java       |   7 +-
 .../camel/spring/SpringMDCWithBreadcrumbTest.java  |   2 +
 .../camel/spring/SpringRunWithTestSupport.java     |  10 +-
 .../org/apache/camel/spring/SpringTestSupport.java |  14 +-
 .../camel/spring/StartupShutdownOrderBaseTest.java |   2 +-
 .../aop/SpringAopClassLevelCamelBeanTest.java      |   5 +-
 .../camel/spring/bind/BeanAsEndpointTest.java      |   2 +-
 .../org/apache/camel/spring/bind/BeanInfoTest.java |  14 +-
 .../camel/spring/bind/ProcessorAsEndpointTest.java |   7 +-
 .../spring/cloud/ServiceCallConfigurationTest.java |  28 ++--
 .../camel/spring/cloud/ServiceCallFilterTest.java  |  13 +-
 .../camel/spring/config/AnotherCamelProxyTest.java |   7 +-
 .../spring/config/CamelContextAutoStartupTest.java |  12 +-
 .../spring/config/CamelContextFactoryBeanTest.java |  23 +--
 .../apache/camel/spring/config/CamelProxyTest.java |   4 +-
 .../spring/config/CamelProxyUsingRefTest.java      |   7 +-
 .../spring/config/CamelSpringPackageTest.java      |   4 +-
 .../config/ConsumerTemplateAlreadyExistTest.java   |  18 ++-
 .../config/ConsumerTemplateAutoRegisterTest.java   |  10 +-
 .../ConsumerTemplateHasTwoTemplatesTest.java       |  11 +-
 .../ConsumerTemplateMaximumCacheSizeTest.java      |   9 +-
 .../config/CustomExecutorServiceManagerTest.java   |   2 +-
 .../spring/config/CustomThreadPoolFactoryTest.java |   6 +-
 .../DeadLetterChannelRedeliveryConfigTest.java     |   2 +-
 .../config/DefaultErrorHandlerConfigTest.java      |   2 +-
 .../DefaultPackageResolverConfigureTest.java       |   4 +-
 .../config/DependencyInjectCamelTemplateTest.java  |   8 +-
 .../DualCamelContextEndpointOutsideTest.java       |   4 +-
 .../config/EndpointUriSetFromSpringTest.java       |   9 +-
 .../ErrorHandlerCamelContextRefNotFoundTest.java   |   9 +-
 .../spring/config/ErrorHandlerConfigTest.java      |   2 +-
 .../ErrorHandlerRouteContextRefNotFoundTest.java   |   9 +-
 .../camel/spring/config/ErrorHandlerTest.java      |  10 +-
 .../FluentProducerTemplateAutoRegisterTest.java    |   8 +-
 .../camel/spring/config/NamespacePrefixTest.java   |   8 +-
 .../OnExceptionNoExceptionConfiguredTest.java      |   8 +-
 ...eRouteRefOnExceptionAndDLCErrorHandlerTest.java |   2 +-
 ...uteRefOnExceptionAndTwoDLCErrorHandlerTest.java |   2 +-
 .../spring/config/OneRouteRefOnExceptionTest.java  |   5 +-
 ...efReverseOnExceptionAndDLCErrorHandlerTest.java |   2 +-
 .../config/OneRouteRefReverseOnExceptionTest.java  |   5 +-
 .../config/ProducerTemplateAlreadyExistTest.java   |  18 ++-
 ...oducerTemplateAutoRegisterBeanIdExistsTest.java |   9 +-
 .../config/ProducerTemplateAutoRegisterTest.java   |   8 +-
 ...erTemplateAutoRegisterTwoCamelContextsTest.java |  12 +-
 .../ProducerTemplateHasTwoTemplatesTest.java       |  11 +-
 .../ProducerTemplateMaximumCacheSizeTest.java      |   9 +-
 ...plateMixedAutoRegisterTwoCamelContextsTest.java |  14 +-
 .../config/RouteAutoStartupPropertiesTest.java     |  11 +-
 .../camel/spring/config/RouteBuilderRef2Test.java  |   2 +-
 .../camel/spring/config/RouteBuilderRefTest.java   |   2 +-
 .../spring/config/RouteRefIncludeXmlFileTest.java  |   2 +-
 .../RouteRefMultipleCamelContextRefsTest.java      |   7 +-
 .../spring/config/RouteRefMultipleRefsTest.java    |   2 +-
 .../spring/config/RouteRefMultipleRoutesTest.java  |   2 +-
 ...rtyPlaceholderMultipleCamelContextRefsTest.java |   7 +-
 .../apache/camel/spring/config/RouteRefTest.java   |   2 +-
 ...lContextCustomDefaultThreadPoolProfileTest.java |   4 +-
 ...ingCamelContextCustomThreadPoolProfileTest.java |   4 +-
 .../config/SpringCamelContextDependsOnTest.java    |   6 +-
 .../config/SpringCamelContextNoDependsOnTest.java  |   6 +-
 ...xtSimpleCustomDefaultThreadPoolProfileTest.java |   4 +-
 .../SpringCamelContextThreadPoolProfilesTest.java  |   4 +-
 .../config/SpringErrorHandlerConfigTest.java       |   5 +-
 .../SpringProduceInjectedPrototypeBeanTest.java    |   2 +-
 .../SpringProduceInjectedSingletonBeanTest.java    |   2 +-
 .../camel/spring/config/SpringRouteNoFromTest.java |   9 +-
 .../spring/config/SpringRouteNoOutputTest.java     |   9 +-
 ...oRouteRefOnExceptionAndDLCErrorHandlerTest.java |   2 +-
 .../spring/config/TwoRouteRefOnExceptionTest.java  |   5 +-
 ...efReverseOnExceptionAndDLCErrorHandlerTest.java |   2 +-
 .../config/TwoRouteRefReverseOnExceptionTest.java  |   5 +-
 .../camel/spring/config/XmlConfigTestSupport.java  |  11 +-
 ...teExclusionFromWithinSpringTestSupportTest.java |   4 +-
 .../config/scan/SpringComponentScanTest.java       |  12 +-
 ...ingComponentScanWithDeprecatedPackagesTest.java |  10 +-
 ...anOnExceptionAndDLCErrorHandlerReverseTest.java |   2 +-
 ...ntextScanOnExceptionAndDLCErrorHandlerTest.java |   2 +-
 .../spring/converter/ResourceConverterTest.java    |  13 +-
 .../spring/example/ContentBasedRouteTest.java      |   6 +-
 .../camel/spring/example/FooEventRouteTest.java    |   2 +-
 .../camel/spring/example/PojoConsumerTest.java     |   6 +-
 .../camel/spring/example/PojoSenderTest.java       |   6 +-
 .../camel/spring/example/PojoVmConsumerTest.java   |   6 +-
 .../camel/spring/example/SimpleRouteTest.java      |   2 +-
 .../spring/example/SpringExpressionTrimTest.java   |   4 +-
 .../SpringFileAntPathMatcherFileFilterTest.java    |   6 +-
 .../spring/file/SpringFileLanguageCBRTest.java     |   6 +-
 .../camel/spring/file/SpringFileRouteTest.java     |  10 +-
 .../file/SpringSimpleFileNameWithQuoteTest.java    |   6 +-
 .../handler/ErrorHandlerDefinitionParserTest.java  |  35 ++---
 .../spring/health/HealthCheckRegistryTest.java     |  31 +++--
 .../SpringProduceConsumeImplicitPropertyTest.java  |   2 +-
 .../impl/SpringSupervisingRouteControllerTest.java |   6 +-
 .../impl/converter/SpringTypeConvertersTest.java   |   5 +-
 .../transformer/SpringTransformerRouteTest.java    |   1 +
 .../interceptor/ContainerWideInterceptorTest.java  |  16 ++-
 .../spring/interceptor/DelayerInterceptorTest.java |   8 +-
 .../MixedPropagationTransactedTest.java            |  24 ++--
 .../MixedStreamCachingInterceptorTest.java         |   4 +-
 .../MixedTransactionPropagationTest.java           |  18 ++-
 .../NoStreamCachingInterceptorTest.java            |   3 +-
 ...ransactionalClientDataSourceTransactedTest.java |  14 +-
 ...hOnExceptionAndRollbackUsingTransactedTest.java |   6 +-
 .../interceptor/StreamCachingInterceptorTest.java  |   3 +-
 .../TransactedInterceptSendToEndpointTest.java     |   2 +-
 ...InterceptUsingAdviceWithSendToEndpointTest.java |   2 +-
 .../TransactionClientDataSourceSupport.java        |   4 +-
 .../TransactionalClientDataSourceAsyncTest.java    |   8 +-
 .../TransactionalClientDataSourceHandledTest.java  |   6 +-
 .../TransactionalClientDataSourceMDCTest.java      |   3 +
 ...alClientDataSourceMinimalConfigurationTest.java |  14 +-
 ...ctionalClientDataSourceMixedTransactedTest.java |   6 +-
 ...sactionalClientDataSourceNotTransactedTest.java |  10 +-
 ...lClientDataSourceOnExceptionRedeliveryTest.java |   8 +-
 ...ransactionalClientDataSourceRedeliveryTest.java |   8 +-
 .../TransactionalClientDataSourceTest.java         |  10 +-
 ...ataSourceTransactedWithFileOnExceptionTest.java |   7 +-
 ...onalClientDataSourceTransactedWithFileTest.java |  11 +-
 ...lientDataSourceWithDefaultErrorHandlerTest.java |   4 +-
 ...ourceWithOnExceptionHandledAndRollbackTest.java |   7 +-
 ...ptionHandledAndRollbackUsingTransactedTest.java |   6 +-
 ...lientDataSourceWithOnExceptionRollbackTest.java |   7 +-
 ...ctionalClientDataSourceWithOnExceptionTest.java |   8 +-
 ...ClientDataSourceWithSpringRouteBuilderTest.java |   4 +-
 .../TransactionalClientWithAnnotatedBeanTest.java  |   6 +-
 .../TransactionalClientWithRollbackTest.java       |  14 +-
 .../issues/AdviceWithTransactionIssueTest.java     |   2 +-
 .../apache/camel/spring/issues/Camel14624Test.java |   4 +-
 .../CamelContextModelErrorHandlerIssueTest.java    |  13 +-
 .../issues/CamelRouteRefInjectionIssueTest.java    |   2 +-
 .../camel/spring/issues/CustomIdIssuesTest.java    |   7 +-
 .../issues/FileWireTapWithXMLPayloadIssueTest.java |   8 +-
 .../issues/ProduceSplitMethodCallIssueTest.java    |   4 +-
 ...RedeliveryErrorHandlerTwoXmlFilesIssueTest.java |   4 +-
 ...viceWithContextScopedErrorHandlerIssueTest.java |   2 +-
 .../spring/issues/SpringCatchNestedFailTest.java   |   4 +-
 .../spring/issues/SpringFinallyNestedFailTest.java |   4 +-
 .../issues/SpringInitializationIssueTest.java      |   3 +-
 ...stanceFactoryBeanCamelContextScanIssueTest.java |   2 +-
 .../issues/SpringInstanceFactoryBeanIssueTest.java |   2 +-
 .../camel/spring/issues/SpringPackageTest.java     |   2 +-
 ...ngPropertyPlaceholderFileEndpointIssueTest.java |   2 +-
 .../issues/SpringPropertyPlaceholderIssueTest.java |   2 +-
 .../issues/SpringRenameFileOnCommitIssueTest.java  |   6 +-
 .../issues/SpringSingletonScopedBeanIssueTest.java |   2 +-
 ...ringSplitterDetermineErrorHandlerIssueTest.java |   2 +-
 ...andlerAndContextScopedOnExceptionIssueTest.java |  17 ++-
 .../SpringTryCatchFinallyAndErrorHandlerTest.java  |   2 +-
 .../spring/issues/SpringTryNestedFailTest.java     |   2 +-
 .../SpringTwoCamelContextDirectEndpointTest.java   |   7 +-
 .../SpringRouteIsComponentAnnotatedTest.java       |   2 +-
 .../SpringRouteIsComponentAnnotated2Test.java      |   2 +-
 .../packagescan/SkipNonPublicRouteBuilderTest.java |   2 +-
 ...ualCamelContextManagedAutoAssignedNameTest.java |  12 +-
 .../management/DualCamelContextManagedTest.java    |  16 ++-
 .../JmxInstrumentationWithConnectorTest.java       |  11 +-
 .../ManagedEndpointInjectRefEndpointTest.java      |  15 +-
 .../spring/management/ManagedRefEndpointTest.java  |  17 ++-
 .../SpringCamelContextStartingFailedEventTest.java |   4 +-
 .../SpringJmxDumpCBRRoutesAsXmlTest.java           |   7 +-
 ...pringJmxDumpRoutesAsXmlIncludeHostNameTest.java |   5 +-
 .../management/SpringJmxDumpRoutesAsXmlTest.java   |   5 +-
 .../SpringJmxEndpointInjectBeanRefTest.java        |   5 +-
 .../SpringJmxEndpointInjectBeanRefTwoTest.java     |   5 +-
 .../SpringJmxEndpointInjectBeanTest.java           |   4 +-
 .../SpringJmxRecipientListRegisterAlwaysTest.java  |  14 +-
 .../management/SpringJmxRecipientListTest.java     |  14 +-
 .../management/SpringManagedCamelContextTest.java  |  15 +-
 .../SpringManagedCustomProcessorTest.java          |   4 +-
 .../management/SpringManagedSedaEndpointTest.java  |   7 +-
 .../SpringManagedTransactedProcessorTest.java      |   4 +-
 .../org/apache/camel/spring/mock/BeanMockTest.java |   2 +-
 .../InterceptSendToMockEndpointStrategyTest.java   |   4 +-
 .../org/apache/camel/spring/mock/MyAssertions.java |   7 +-
 .../apache/camel/spring/patterns/FilterTest.java   |   2 +-
 ...uageWithSpringPropertyPlaceholderRouteTest.java |  10 +-
 .../FileConsumerSpringSchedulerTest.java           |   6 +-
 ...CamelCustomPostProcessorOnRouteBuilderTest.java |   9 +-
 ...pringCustomPostProcessorOnRouteBuilderTest.java |  16 ++-
 .../DualSpringManagedThreadsThreadPoolTest.java    |   4 +-
 .../JavaDslTransactedNoTXManagerTest.java          |   7 +-
 .../SpringAggregatorWithCustomStrategyTest.java    |   2 +-
 .../processor/SpringComplexBlockWithEndTest.java   |   2 +-
 .../processor/SpringCustomExpressionTest.java      |   2 +-
 .../processor/SpringCustomPredicateTest.java       |   2 +-
 ...gDeadLetterChannelInvalidDeadLetterUriTest.java |   9 +-
 ...etterChannelInvalidOptionDeadLetterUriTest.java |   9 +-
 ...ringDoubleLoadBalancerMisconfigurationTest.java |   8 +-
 .../spring/processor/SpringEnricherRefTest.java    |   6 +-
 .../camel/spring/processor/SpringEnricherTest.java |   6 +-
 ...ingErrorHandlerRedeliveryPolicyProfileTest.java |   4 +-
 .../spring/processor/SpringFilterNoChildTest.java  |   9 +-
 ...dempotentConsumerNoSkipDuplicateFilterTest.java |   2 +-
 ...pringIdempotentConsumerNoSkipDuplicateTest.java |   2 +-
 .../processor/SpringIdempotentConsumerTest.java    |   2 +-
 .../spring/processor/SpringInterceptFromTest.java  |   2 +-
 .../processor/SpringInterceptFromWithStopTest.java |   2 +-
 .../SpringInterceptSendToEndpointDynamicTest.java  |   2 +-
 .../SpringInterceptSendToEndpointSkipTest.java     |   2 +-
 .../SpringInterceptSendToEndpointTest.java         |   2 +-
 .../SpringInterceptSendToEndpointWhenTest.java     |   2 +-
 .../spring/processor/SpringLogEipMaskTest.java     |   7 +-
 .../spring/processor/SpringLoopDoWhileTest.java    |   2 +-
 .../SpringManagedThreadsThreadPoolTest.java        |   8 +-
 .../spring/processor/SpringMethodCallTest.java     |   2 +-
 .../processor/SpringMulticastAggregatorTest.java   |   8 +-
 .../processor/SpringPollEnricherRefTest.java       |   4 +-
 .../SpringRouteContextProduceBeanTest.java         |   2 +-
 .../spring/processor/SpringRoutePoliciesTest.java  |   2 +-
 .../SpringRouteTopLevelMisconfiguredTest.java      |   4 +-
 .../camel/spring/processor/SpringSagaTest.java     |   2 +-
 .../processor/SpringScheduledThreadPoolTest.java   |   8 +-
 .../spring/processor/SpringScriptExternalTest.java |   6 +-
 .../camel/spring/processor/SpringScriptTest.java   |   6 +-
 .../camel/spring/processor/SpringSetBodyTest.java  |   2 +-
 .../SpringSetExchangePatternWithCustomIdTest.java  |   3 +-
 .../processor/SpringSetHeaderNameDynamicTest.java  |   3 +-
 .../spring/processor/SpringSetHeaderTest.java      |   2 +-
 .../processor/SpringSetHeaderWithConstantTest.java |   2 +-
 .../SpringSetHeaderXPathResultTypeTest.java        |   2 +-
 .../SpringSetPropertyNameDynamicTest.java          |   3 +-
 .../spring/processor/SpringSplitterBodyTest.java   |   2 +-
 .../processor/SpringStreamCachingStrategyTest.java |   4 +-
 .../processor/SpringThreadNamePatternTest.java     |   4 +-
 .../processor/SpringThreadsCorePoolTest.java       |   2 +-
 .../camel/spring/processor/SpringTraceTest.java    |   2 +-
 .../spring/processor/SpringTransformTest.java      |   2 +-
 .../processor/SpringTryCatchMisconfiguredTest.java |   4 +-
 ...ingTryCatchMustHaveExceptionConfiguredTest.java |   4 +-
 .../SpringWireTapUsingFireAndForgetCopyTest.java   |   8 +-
 .../SpringWireTapUsingFireAndForgetTest.java       |   8 +-
 ...ilterWithNamespaceOnImportRouteContextTest.java |   4 +-
 ...XPathFilterWithNamespaceOnRouteContextTest.java |   4 +-
 .../SpringXPathFilterWithNamespaceTest.java        |   4 +-
 .../spring/processor/SpringXPathHeaderTest.java    |   2 +-
 .../processor/TransformWithExpressionTest.java     |   6 +-
 .../apache/camel/spring/processor/XsltTest.java    |   2 +-
 .../aggregator/SpringAggregateControllerTest.java  |   4 +-
 ...yncDeadLetterChannelExecutorServiceRefTest.java |   2 +-
 .../FileConsumerIdempotentLoadStoreTest.java       |  11 +-
 .../idempotent/FileConsumerIdempotentTest.java     |   9 +-
 .../idempotent/SpringCacheIdempotentTest.java      |   2 +-
 .../DeadLetterChannelHandledExampleTest.java       |   3 +-
 .../SpringContextScopeOnExceptionTest.java         |   3 +-
 ...pringOnExceptionNotNormalizedClassNameTest.java |   3 +-
 .../onexception/SpringOnExceptionSubRouteTest.java |   4 +-
 .../processor/scattergather/ScatterGatherTest.java |   2 +-
 .../spring/produce/FluentProduceTemplateTest.java  |   2 +-
 .../camel/spring/produce/MyCoolBeanTest.java       |  12 +-
 .../camel/spring/produce/ProduceTemplateTest.java  |   2 +-
 .../ProduceTemplateWithTwoCamelContextTest.java    |   2 +-
 .../apache/camel/spring/produce/ProduceTest.java   |   6 +-
 .../spring/produce/generics/MyServiceTest.java     |   6 +-
 .../remoting/EchoSpringRemotingPojoDirectTest.java |   6 +-
 .../remoting/EchoSpringRemotingPojoTest.java       |   5 +-
 ...SpringRemotingThrowingRuntimeExceptionTest.java |   5 +-
 .../spring/remoting/MyMultiArgumentService.java    |   2 +-
 .../remoting/SpringRemotingBeanConverterTest.java  |   7 +-
 .../spring/remoting/SpringRemotingRouteTest.java   |   7 +-
 .../SpringRemotingTwoCamelContextTest.java         |   7 +-
 .../remoting/SpringRemotingWithOneWayTest.java     |   6 +-
 .../spring/routebuilder/CamelRouteBuilderTest.java |   2 +-
 .../scan/DefaultPackageScanClassResolverTest.java  |   8 +-
 .../camel/spring/scan/PackageScanFiltersTest.java  |   9 +-
 .../scan/PatternBasedPackageScanFilterTest.java    |   6 +-
 .../apache/camel/spring/scan/ScanTestSupport.java  |  14 +-
 .../BridgePropertyPlaceholderConfigurerTest.java   |   2 +-
 ...PropertyPlaceholderConfigurerUtilIssueTest.java |   2 +-
 .../spring/spi/ParentContextRegistryTest.java      |   4 +-
 .../camel/spring/util/EndpointHelperTest.java      |   4 +-
 .../apache/camel/spring/util/MainRunnerTest.java   |   4 +-
 .../spring/xml/SpringXmlRouteBuilderTest.java      |   8 +-
 .../spring/KeyStoreParametersFactoryBeanTest.java  |  10 +-
 .../SSLContextParametersFactoryBeanTest.java       |  12 +-
 .../SecureRandomParametersFactoryBeanTest.java     |  10 +-
 .../AbstractSpringSecurityBearerTokenTest.java     |   1 -
 .../UndertowComponentVerifierExtensionTest.java    |   1 -
 .../undertow/UndertowComponentVerifierTest.java    |   1 -
 .../undertow/spi/AbstractSecurityProviderTest.java |   1 -
 .../spi/SecurityProviderNoAcceptanceTest.java      |   1 -
 .../component/velocity/VelocitySetHeaderTest.java  |   1 -
 .../MasterEndpointFailoverTest.java                |   1 -
 core/camel-caffeine-lrucache/pom.xml               |   4 +-
 .../caffeine/lrucache/CaffeineLRUCacheTest.java    |  12 +-
 .../lrucache/CaffeineLRUSoftCacheTest.java         |  35 ++---
 core/camel-cloud/pom.xml                           |   9 +-
 .../impl/cloud/CombinedServiceDiscoveryTest.java   |  28 ++--
 .../impl/cloud/CombinedServiceFilterTest.java      |  23 +--
 .../apache/camel/impl/cloud/LoadBalancerTest.java  |  15 +-
 .../impl/cloud/ServiceCallConfigurationTest.java   |  85 +++++------
 .../camel/impl/cloud/ServiceDefinitionTest.java    |  10 +-
 .../camel/impl/cloud/ServiceRegistryTest.java      |  71 +++++-----
 core/camel-componentdsl/pom.xml                    |   4 +-
 .../component/ComponentsBuilderFactoryTest.java    |   6 +-
 .../camel/spring/SpringConsumerTemplateTest.java   |   6 +-
 .../org/apache/camel/processor/TransformTest.java  |   6 +-
 .../camel/processor/TransformViaDSLTest.java       |   6 +-
 core/camel-core-xml/pom.xml                        |   4 +-
 .../xml/AbstractCamelContextFactoryBeanTest.java   |   3 +-
 core/camel-core/pom.xml                            |  16 +--
 .../java/org/apache/camel/AutoCloseableTest.java   |   2 +-
 .../java/org/apache/camel/CamelExceptionsTest.java |   6 +-
 .../java/org/apache/camel/ContextTestSupport.java  |  22 +--
 .../java/org/apache/camel/ExchangeTestSupport.java |   6 +-
 .../org/apache/camel/InjectorDefaultsTest.java     |   4 +-
 .../java/org/apache/camel/LanguageTestSupport.java |   7 +-
 .../java/org/apache/camel/LoggingLevelTest.java    |   8 +-
 .../apache/camel/PropertyBindingExceptionTest.java |  12 +-
 .../org/apache/camel/SuspendableServiceTest.java   |   7 +-
 .../test/java/org/apache/camel/TestSupport.java    |  91 ++++++------
 .../apache/camel/ThreadPoolRejectedPolicyTest.java |   6 +-
 .../camel/builder/AddRoutesAtRuntimeTest.java      |   4 +-
 .../camel/builder/BuilderWithScopesTest.java       |   4 +-
 .../camel/builder/ContextErrorHandlerTest.java     |  18 +--
 .../org/apache/camel/builder/ErrorHandlerTest.java |  34 ++---
 .../apache/camel/builder/ExceptionBuilderTest.java |  23 ++-
 .../ExceptionBuilderWithHandledExceptionTest.java  |   8 +-
 .../apache/camel/builder/ExchangeBuilderTest.java  |   7 +-
 .../camel/builder/ExpressionBuilderTest.java       |  23 +--
 .../camel/builder/ExpressionFunctionTest.java      |   2 +-
 .../camel/builder/FluentProducerTemplateTest.java  |  13 +-
 .../camel/builder/NotifyBuilderFromRouteTest.java  |   4 +-
 .../apache/camel/builder/NotifyBuilderTest.java    |   5 +-
 .../builder/NotifyBuilderWhenDoneByIndexTest.java  |   4 +-
 .../builder/PredicateBinaryCoerceRouteTest.java    |   2 +-
 .../builder/PredicateBinaryCoerceTypeTest.java     |   6 +-
 .../builder/PredicateBuilderConcurrentTest.java    |   8 +-
 .../apache/camel/builder/PredicateBuilderTest.java |   7 +-
 .../ProxyBuilderSkipJavaLangObjectMethodsTest.java |   4 +-
 .../org/apache/camel/builder/ProxyBuilderTest.java |   6 +-
 .../RouteBuilderAddRoutesOnlyInterceptTest.java    |   2 +-
 .../camel/builder/RouteBuilderAddRoutesTest.java   |   2 +-
 .../org/apache/camel/builder/RouteBuilderTest.java |  68 ++++-----
 .../apache/camel/builder/SimpleBuilderTest.java    |   4 +-
 .../camel/builder/ThreadPoolBuilderTest.java       |   5 +-
 .../camel/builder/TransformerBuilderTest.java      |   5 +-
 .../org/apache/camel/builder/ValueBuilderTest.java |   2 +-
 .../builder/xml/DefaultNamespaceContextTest.java   |   4 +-
 .../builder/xml/ExtractXPathWithNamespaceTest.java |   4 +-
 .../builder/xml/XPathContentBasedRouterTest.java   |   2 +-
 .../apache/camel/builder/xml/XPathFeatureTest.java |  17 ++-
 .../camel/builder/xml/XPathFunctionsTest.java      |   2 +-
 .../XPathHeaderNameResultTypeAndNamespaceTest.java |   2 +-
 .../camel/builder/xml/XPathHeaderNameTest.java     |   2 +-
 .../apache/camel/builder/xml/XPathHeaderTest.java  |   2 +-
 .../apache/camel/builder/xml/XPathMockTest.java    |   2 +-
 .../camel/builder/xml/XPathNamespaceTest.java      |   2 +-
 .../builder/xml/XPathNestedNamespaceTest.java      |   2 +-
 .../org/apache/camel/builder/xml/XPathTest.java    |   3 +-
 .../camel/builder/xml/XPathTransformRouteTest.java |   2 +-
 .../camel/builder/xml/XPathTransformTest.java      |  14 +-
 .../xml/XPathWithNamespacesFromDomTest.java        |   9 +-
 .../apache/camel/builder/xml/XsltBuilderTest.java  |  14 +-
 .../camel/builder/xml/XsltOutputFileTest.java      |   4 +-
 .../org/apache/camel/builder/xml/XsltTest.java     |   2 +-
 .../camel/builder/xml/XsltUriResolverTest.java     |   8 +-
 .../camel/catalog/RuntimeCamelCatalogTest.java     |  10 +-
 .../camel/cluster/ClusterServiceSelectorTest.java  |  62 +++++----
 .../camel/cluster/ClusterServiceViewTest.java      |  65 ++++-----
 ...AmbiguousMethodCallExceptionSimplifiedTest.java |   2 +-
 .../component/bean/BeanByteArrayBodyTest.java      |   2 +-
 ...seMethodWithMatchingTypeAndSkipSettersTest.java |   6 +-
 .../bean/BeanComponentMissingParenthesisTest.java  |   5 +-
 ...entWithPropertiesLookupSetFromEndpointTest.java |   2 +-
 .../camel/component/bean/BeanConcurrentTest.java   |   4 +-
 .../bean/BeanCreateBodyExceptionTest.java          |   4 +-
 .../camel/component/bean/BeanEndpointTest.java     |   5 +-
 .../BeanExchangeAsReturnTypeNotAllowedTest.java    |   8 +-
 .../component/bean/BeanExcludedMethodTest.java     |   6 +-
 .../bean/BeanExplicitMethodAmbiguousTest.java      |   5 +-
 .../component/bean/BeanExplicitMethodTest.java     |   2 +-
 .../bean/BeanExpressionConcurrentTest.java         |   4 +-
 .../bean/BeanHandlerMethodPredicateTest.java       |   2 +-
 .../component/bean/BeanHandlerMethodTest.java      |   4 +-
 .../component/bean/BeanImplicitMethodTest.java     |   4 +-
 .../camel/component/bean/BeanInPipelineTest.java   |   4 +-
 .../bean/BeanInfoAMoreComplexOverloadedTest.java   |   5 +-
 .../component/bean/BeanInfoInheritanceTest.java    |   4 +-
 .../component/bean/BeanInfoOverloadedTest.java     |   4 +-
 .../BeanInfoOverloadedWithSubTypeParamTest.java    |   7 +-
 .../component/bean/BeanInfoSelectMethodTest.java   |   4 +-
 .../apache/camel/component/bean/BeanInfoTest.java  |  33 ++---
 .../bean/BeanInfoWithBridgedMethodTest.java        |   5 +-
 .../camel/component/bean/BeanInvokeAsyncTest.java  |  19 +--
 .../BeanInvokeSimpleOgnlToStringMethodTest.java    |   2 +-
 .../bean/BeanInvokeSingleMethodNoBodyTest.java     |   2 +-
 .../camel/component/bean/BeanInvokeStaticTest.java |   5 +-
 .../camel/component/bean/BeanInvokeTest.java       |   2 +-
 .../bean/BeanInvokeToStringMethodTest.java         |   2 +-
 .../component/bean/BeanInvokeWithNullBodyTest.java |   2 +-
 .../camel/component/bean/BeanLifecycleTest.java    |  12 +-
 .../bean/BeanLookupUsingJndiRegistryIssueTest.java |   7 +-
 .../camel/component/bean/BeanMapPutTest.java       |   4 +-
 .../camel/component/bean/BeanMethodBeanTest.java   |   5 +-
 .../bean/BeanMethodNameHeaderIssueTest.java        |   2 +-
 .../bean/BeanMethodValueWithCommaTest.java         |   2 +-
 .../bean/BeanMethodValueWithExchangeTest.java      |   2 +-
 ...rameterAndNoMethodWithNoParameterIssueTest.java |   5 +-
 .../bean/BeanMethodWithStringParameterTest.java    |   2 +-
 .../camel/component/bean/BeanNoCacheTest.java      |   2 +-
 .../bean/BeanNoTypeConvertionPossibleTest.java     |   4 +-
 ...BeanNoTypeConvertionPossibleWhenHeaderTest.java |   4 +-
 .../BeanOgnlBodyMethodReturnNullValueTest.java     |   4 +-
 .../component/bean/BeanOgnlPerformanceTest.java    |   2 +-
 .../component/bean/BeanOnglStaticMethodTest.java   |   2 +-
 .../bean/BeanOverloadedCovariantMethodTest.java    |   2 +-
 .../bean/BeanOverloadedMethodFQNTest.java          |   5 +-
 .../BeanOverloadedMethodParameterValueTest.java    |   2 +-
 .../component/bean/BeanOverloadedMethodTest.java   |   5 +-
 .../bean/BeanOverloadsWithAssignableParamTest.java |   2 +-
 .../bean/BeanPackageScopeOutsideTest.java          |   2 +-
 .../camel/component/bean/BeanPackageScopeTest.java |   2 +-
 .../BeanParameterBindingStreamCachingTest.java     |   2 +-
 .../component/bean/BeanParameterInfoTest.java      |   4 +-
 .../bean/BeanParameterInvalidSyntaxTest.java       |   5 +-
 .../bean/BeanParameterInvalidValueTest.java        |   4 +-
 .../BeanParameterMethodCallThreeBodyOgnlTest.java  |   4 +-
 .../bean/BeanParameterNoBeanBindingTest.java       |   5 +-
 .../bean/BeanParameterThreeBodyOgnlTest.java       |   4 +-
 .../component/bean/BeanParameterValueOgnlTest.java |   2 +-
 .../bean/BeanParameterValueOverloadedTest.java     |   2 +-
 .../component/bean/BeanParameterValueTest.java     |   2 +-
 .../camel/component/bean/BeanPerformanceTest.java  |   4 +-
 .../camel/component/bean/BeanPipelineTest.java     |   5 +-
 .../BeanPrivateClassWithInterfaceMethodTest.java   |   2 +-
 .../component/bean/BeanPropagateHeaderTest.java    |   4 +-
 .../component/bean/BeanProxyNoBindingTest.java     |   4 +-
 .../apache/camel/component/bean/BeanProxyTest.java |   4 +-
 .../component/bean/BeanRefMethodNotFoundTest.java  |   5 +-
 .../camel/component/bean/BeanRefNoCacheTest.java   |   2 +-
 .../camel/component/bean/BeanRefNotFoundTest.java  |   5 +-
 .../camel/component/bean/BeanRegistryBeanTest.java |   4 +-
 .../bean/BeanReturnCallableReturnNullTest.java     |   2 +-
 .../component/bean/BeanReturnCallableTest.java     |   2 +-
 .../camel/component/bean/BeanReturnNullTest.java   |   4 +-
 .../BeanSimpleLanguageStaticMethodIssueTest.java   |   2 +-
 .../camel/component/bean/BeanStaticMethodTest.java |   2 +-
 .../bean/BeanWithAnnotationAndExchangeTest.java    |   4 +-
 .../bean/BeanWithAnnotationInheritedTest.java      |   2 +-
 .../BeanWithExchangeExceptionAnnotationTest.java   |   5 +-
 ...ngeExceptionAnnotationWrappedExceptionTest.java |   3 +
 .../BeanWithExpressionInjectionPredicateTest.java  |   4 +-
 .../bean/BeanWithExpressionInjectionTest.java      |   8 +-
 .../camel/component/bean/BeanWithHeaderTest.java   |   2 +-
 .../bean/BeanWithHeadersAndBodyInject2Test.java    |  10 +-
 .../bean/BeanWithHeadersAndBodyInject3Test.java    |   5 +-
 .../bean/BeanWithHeadersAndBodyInjectionTest.java  |  12 +-
 .../bean/BeanWithInputStreamBodyTest.java          |   2 +-
 .../component/bean/BeanWithMethodHeaderTest.java   |   6 +-
 ...thPropertiesAndHeadersAndBodyInjectionTest.java |  21 +--
 .../BeanWithPropertiesAndHeadersInjectionTest.java |  17 ++-
 ...BeanWithXPathInjectionUsingHeaderValueTest.java |  10 +-
 .../BeanWithXPathInjectionUsingResultTypeTest.java |   8 +-
 .../BodyAnnotationToDisambiguateMethodsTest.java   |   7 +-
 .../ClassComponentInvalidConfigurationTest.java    |   4 +-
 .../camel/component/bean/ClassComponentTest.java   |   2 +-
 ...entWithPropertiesLookupSetFromEndpointTest.java |   2 +-
 ...ComponentWithPropertiesSetFromEndpointTest.java |   2 +-
 .../bean/CustomParameterMappingStrategyTest.java   |   2 +-
 .../bean/DefaultParameterMappingStrategyTest.java  |   5 +-
 ...ressionAnnotationToDisambiguateMethodsTest.java |   9 +-
 .../bean/FileBeanParameterBindingTest.java         |  12 +-
 .../bean/MethodCallBeanRefMethodNotFoundTest.java  |   5 +-
 .../bean/MethodCallBeanRefNotFoundTest.java        |   5 +-
 .../bean/MethodCallMissingParenthesisTest.java     |   5 +-
 .../bean/MethodCallRefOrBeanPrefixTest.java        |   2 +-
 .../component/bean/MethodCallStaticMethodTest.java |   2 +-
 .../MethodNotFoundExceptionSimplifiedTest.java     |   2 +-
 .../component/bean/MyAuditServiceProxyTest.java    |   2 +-
 .../camel/component/bean/MyCurrencyBeanTest.java   |   2 +-
 .../camel/component/bean/MyServiceProxyTest.java   |   9 +-
 .../camel/component/bean/NewInstanceTest.java      |   2 +-
 .../camel/component/bean/PredicateAsBeanTest.java  |   6 +-
 .../bean/ProxyReturnFutureExceptionTest.java       |   5 +-
 .../component/bean/ProxyReturnFutureListTest.java  |  11 +-
 .../component/bean/ProxyReturnFutureTest.java      |   4 +-
 .../bean/RequestScopedBeanComponentTest.java       |   2 +-
 .../component/bean/RouteMethodCallStaticTest.java  |   2 +-
 .../SimpleLanguageBeanBodyParenthesisTest.java     |   2 +-
 ...nguageBeanFunctionMethodValueWithCommaTest.java |   2 +-
 ...BeanFunctionMethodValueWithParenthesisTest.java |   2 +-
 .../bean/issues/BeanAbstractMethodIssueTest.java   |   2 +-
 .../issues/BeanInfoSingleMethodServiceTest.java    |   4 +-
 .../BeanParameterBestTypeMatchIssueTest.java       |   2 +-
 .../bean/issues/BeanRouteToDerivedClassTest.java   |  18 +--
 .../bean/issues/BeanThisAdviceWithIssueTest.java   |   2 +-
 .../issues/BeanVsProcessorPerformanceTest.java     |   4 +-
 ...efaultMethodCalledFromSimpleExpressionTest.java |   2 +-
 .../issues/FilterBeanLanguageNonRegistryTest.java  |   2 +-
 .../bean/issues/FilterBeanNonRegistryTest.java     |   2 +-
 .../bean/issues/FilterBeanRegistryTest.java        |   2 +-
 .../component/bean/issues/FilterPojoIssueTest.java |   2 +-
 .../bean/issues/TransformerIssueTest.java          |   2 +-
 .../pojomessage/PojoProxyHelperOneWayTest.java     |   4 +-
 .../PojoProxyHelperRequestReplyTest.java           |   4 +-
 .../camel/component/browse/BrowseEndpointTest.java |   4 +-
 .../component/browse/BrowseRouteConsumeTest.java   |   2 +-
 .../camel/component/browse/BrowseRouteTest.java    |   2 +-
 .../apache/camel/component/browse/BrowseTest.java  |   8 +-
 .../ControlBusLanguageSimpleStartRouteTest.java    |   4 +-
 .../controlbus/ControlBusRestartRouteTest.java     |   4 +-
 .../controlbus/ControlBusStartRouteAsyncTest.java  |   7 +-
 .../controlbus/ControlBusStartRouteTest.java       |   5 +-
 .../camel/component/dataset/BigDataSetTest.java    |   6 +-
 .../camel/component/dataset/CustomDataSetTest.java |   2 +-
 .../component/dataset/DataSetConsumerTest.java     |  10 +-
 .../component/dataset/DataSetEndpointTest.java     |  23 +--
 .../component/dataset/DataSetPreloadTest.java      |   9 +-
 .../component/dataset/DataSetProducerTest.java     |  13 +-
 .../camel/component/dataset/DataSetSedaTest.java   |   2 +-
 .../camel/component/dataset/DataSetTest.java       |   2 +-
 .../component/dataset/DataSetTestAnyOrderTest.java |   2 +-
 .../component/dataset/DataSetTestEndpointTest.java |   2 +-
 .../dataset/DataSetTestFileSplitTest.java          |  10 +-
 .../component/dataset/DataSetTestFileTest.java     |  10 +-
 .../component/dataset/DataSetTestSedaTest.java     |   2 +-
 .../component/dataset/FileDataSetConsumerTest.java |  11 +-
 .../dataset/FileDataSetConsumerWithSplitTest.java  |  11 +-
 .../component/dataset/FileDataSetProducerTest.java |  33 ++---
 .../dataset/FileDataSetProducerWithSplitTest.java  |  27 ++--
 .../component/dataset/ListDataSetConsumerTest.java |   6 +-
 .../component/dataset/ListDataSetProducerTest.java |   6 +-
 .../component/dataset/RoutePerformanceTest.java    |   2 +-
 .../direct/DirectEndpointRouteInlinedTest.java     |   5 +-
 .../camel/component/direct/DirectEndpointTest.java |   2 +-
 .../component/direct/DirectNoConsumerTest.java     |   4 +-
 .../direct/DirectNoMultipleConsumersTest.java      |   4 +-
 .../camel/component/direct/DirectNoToTypeTest.java |   4 +-
 .../direct/DirectProducerBlockingTest.java         |   5 +-
 .../camel/component/direct/DirectQueueTest.java    |   2 +-
 .../camel/component/direct/DirectRouteTest.java    |   9 +-
 .../direct/DirectShouldUseSameThreadTest.java      |   4 +-
 .../SendToNonExistingDirectEndpointTest.java       |   5 +-
 ...SendingToAlotOfDifferentDirectEndpointTest.java |   2 +-
 .../direct/TwoCamelContextDirectEndpointTest.java  |  15 +-
 .../directvm/AbstractDirectVmTestSupport.java      |   8 +-
 .../directvm/DirectVmConsumerExpressionTest.java   |  10 +-
 .../directvm/DirectVmHeaderFilterStrategyTest.java |   5 +-
 .../component/directvm/DirectVmNoConsumerTest.java |   4 +-
 ...DirectVmNoPropertyPropagationComponentTest.java |   4 +-
 .../DirectVmNoPropertyPropagationTest.java         |   5 +-
 .../directvm/DirectVmProducerBlockingTest.java     |   5 +-
 .../directvm/DirectVmShouldUseSameThreadTest.java  |   4 +-
 .../DirectVmTwoCamelContextAdviceWithTest.java     |   2 +-
 ...rectVmTwoCamelContextDuplicateConsumerTest.java |   5 +-
 .../directvm/DirectVmTwoCamelContextTest.java      |   4 +-
 .../extension/verifier/ComponentVerifierTest.java  |  23 +--
 .../file/AntPathMatcherGenericFileFilterTest.java  |   6 +-
 .../camel/component/file/BeanToFileTest.java       |   2 +-
 .../file/ConsumerTemplateFileShutdownTest.java     |   5 +-
 .../component/file/DirectoryCreateIssueTest.java   |   8 +-
 .../file/FileAbsoluteAndRelativeConsumerTest.java  |   6 +-
 .../component/file/FileAbsolutePathIssueTest.java  |   6 +-
 .../file/FileBatchConsumerMemoryLeakTest.java      |  10 +-
 .../file/FileBeginFailureOneTimeTest.java          |  10 +-
 .../component/file/FileBrowsableEndpointTest.java  |  20 +--
 .../FileConcurrentWriteAppendSameFileTest.java     |  13 +-
 .../camel/component/file/FileConfigureTest.java    |  36 ++---
 .../FileConsumeAlterFileNameHeaderIssueTest.java   |  21 +--
 .../file/FileConsumeBackoffMultiplierTest.java     |   6 +-
 .../component/file/FileConsumeCharsetTest.java     |  10 +-
 .../file/FileConsumeDoneFileIssueTest.java         |  37 ++---
 ...eConsumeDynamicDoneFileNameWithTwoDotsTest.java |  13 +-
 .../file/FileConsumeFilesAndDeleteTest.java        |  10 +-
 .../file/FileConsumeMaxMessagesPerPollTest.java    |   6 +-
 .../file/FileConsumeMoveRelativeNameTest.java      |   6 +-
 .../file/FileConsumeMultipleDirectoriesTest.java   |   8 +-
 .../FileConsumeNoopIdempotentDisabledTest.java     |   6 +-
 .../file/FileConsumeNoopIdempotentEnabledTest.java |   6 +-
 .../FileConsumeNotEagerMaxMessagesPerPollTest.java |   6 +-
 .../file/FileConsumePollEnrichFileTest.java        |   6 +-
 ...ileConsumePollEnrichFileUsingProcessorTest.java |   6 +-
 .../file/FileConsumeRootDirManualTest.java         |   6 +-
 .../file/FileConsumeRunLoggingLevelTest.java       |   6 +-
 ...ileConsumeSimpleAbsoluteMoveToAbsoluteTest.java |   6 +-
 ...ileConsumeSimpleAbsoluteMoveToRelativeTest.java |   6 +-
 ...meSimpleDynamicDoneFileNameWithTwoDotsTest.java |  13 +-
 ...ileConsumeSimpleRelativeMoveToAbsoluteTest.java |   6 +-
 ...ileConsumeSimpleRelativeMoveToRelativeTest.java |   6 +-
 .../file/FileConsumeSingleDirectoryOnlyTest.java   |   6 +-
 .../component/file/FileConsumeTemplateTest.java    |   9 +-
 .../file/FileConsumeWithDollarInPathTest.java      |   6 +-
 .../FileConsumerAbsolutePathDefaultMoveTest.java   |   6 +-
 .../file/FileConsumerAbsolutePathTest.java         |   6 +-
 ...leConsumerAbsolutePathWithAbsoluteMoveTest.java |   6 +-
 ...leConsumerAbsolutePathWithRelativeMoveTest.java |   6 +-
 ...ileConsumerAbsoluteRootPathDefaultMoveTest.java |   2 +-
 .../file/FileConsumerAutoCreateDirectoryTest.java  |  20 +--
 .../component/file/FileConsumerBatchTest.java      |   6 +-
 ...BeginAndCommitExpressionRenameStrategyTest.java |   8 +-
 ...leConsumerBeginAndCommitRenameStrategyTest.java |   8 +-
 ...eConsumerBeginExpressionRenameStrategyTest.java |   9 +-
 .../file/FileConsumerBeginRenameStrategyTest.java  |   9 +-
 ...ileConsumerBridgeRouteExceptionHandlerTest.java |   6 +-
 ...nsumerCommitRenameAbsolutePathStrategyTest.java |   6 +-
 .../file/FileConsumerCommitRenameStrategyTest.java |  10 +-
 .../file/FileConsumerConsumedFileNameTest.java     |   6 +-
 .../FileConsumerCustomExceptionHandlerTest.java    |   6 +-
 .../file/FileConsumerCustomSchedulerTest.java      |   8 +-
 .../file/FileConsumerDeleteAndFailureTest.java     |   6 +-
 .../file/FileConsumerDirectoryFilterTest.java      |  11 +-
 ...erDirectoryMustExistBridgeErrorHandlerTest.java |   4 +-
 .../file/FileConsumerDirectoryNotMatchedTest.java  |   6 +-
 .../file/FileConsumerExcludeNameTest.java          |   2 +-
 .../file/FileConsumerExtendedAttributesTest.java   |   8 +-
 .../file/FileConsumerFailureHandledTest.java       |  14 +-
 .../file/FileConsumerFileExpressionTest.java       |   6 +-
 ...leConsumerFileExpressionThrowExceptionTest.java |   7 +-
 .../component/file/FileConsumerFileFilterTest.java |   6 +-
 .../file/FileConsumerFilterDirectoryTest.java      |   6 +-
 .../component/file/FileConsumerFilterFileTest.java |   6 +-
 ...FileConsumerIdempotentKeyChangedIssue2Test.java |   2 +-
 .../FileConsumerIdempotentKeyChangedIssueTest.java |   2 +-
 .../FileConsumerIdempotentKeyNameAndSizeTest.java  |   2 +-
 ...leConsumerIdempotentOnExceptionHandledTest.java |   6 +-
 .../file/FileConsumerIdempotentRefTest.java        |  11 +-
 .../component/file/FileConsumerIdempotentTest.java |  11 +-
 .../file/FileConsumerIdleMessageTest.java          |   4 +-
 .../FileConsumerIncludeAndExcludeNameTest.java     |   6 +-
 .../file/FileConsumerIncludeNameTest.java          |   6 +-
 .../file/FileConsumerInterceptEmptyFileTest.java   |   6 +-
 .../file/FileConsumerMoveAndMoveFailureTest.java   |   6 +-
 .../file/FileConsumerMoveExpressionTest.java       |  12 +-
 .../FileConsumerMoveFailureOnCompletionTest.java   |   6 +-
 .../file/FileConsumerMoveFailureTest.java          |   6 +-
 .../camel/component/file/FileConsumerNoopTest.java |   8 +-
 .../file/FileConsumerPathWithAmpersandTest.java    |   6 +-
 .../file/FileConsumerPollStrategyNotBeginTest.java |   8 +-
 ...FileConsumerPollStrategyPolledMessagesTest.java |   9 +-
 ...umerPollStrategyRollbackThrowExceptionTest.java |   7 +-
 ...FileConsumerPollStrategyStopOnRollbackTest.java |   8 +-
 .../file/FileConsumerPollStrategyTest.java         |   8 +-
 .../file/FileConsumerPreMoveDeleteTest.java        |  15 +-
 .../file/FileConsumerPreMoveIssueTest.java         |  10 +-
 .../file/FileConsumerPreMoveLastModifiedTest.java  |   8 +-
 .../file/FileConsumerPreMoveNoopTest.java          |  14 +-
 .../component/file/FileConsumerPreMoveTest.java    |  10 +-
 ...ileConsumerPreMoveWithProbeContentTypeTest.java |   6 +-
 .../file/FileConsumerProducerRouteTest.java        |   6 +-
 .../file/FileConsumerRelativeFileNameTest.java     |   6 +-
 .../file/FileConsumerRestartNotLeakThreadTest.java |  10 +-
 .../FileConsumerSharedThreadPollStopRouteTest.java |   2 +-
 .../file/FileConsumerSharedThreadPollTest.java     |   6 +-
 .../file/FileConsumerSkipDotFilesTest.java         |   6 +-
 .../file/FileConsumerSpringSchedulerTest.java      |   5 +-
 ...onsumerStartingDirectoryMustHaveAccessTest.java |  16 ++-
 .../file/FileConsumerSuspendAndResumeTest.java     |  13 +-
 .../component/file/FileConsumerSuspendTest.java    |  11 +-
 .../component/file/FileConsumerTemplateTest.java   |  12 +-
 .../FileConsumerThreadsInProgressIssueTest.java    |   6 +-
 .../component/file/FileContentBasedRouterTest.java |   6 +-
 .../component/file/FileConvertBodyToUTF8Test.java  |  10 +-
 .../file/FileEagerDeleteTargetFileTest.java        |  15 +-
 .../file/FileExclusiveReadLockCopyTest.java        |   6 +-
 .../file/FileExclusiveReadManuelTest.java          |   6 +-
 .../file/FileExclusiveReadNoneStrategyTest.java    |  10 +-
 .../file/FileHeaderFileNameProducedTest.java       |   2 +-
 .../file/FileIdempotentReadSameFileAgainTest.java  |   6 +-
 .../file/FileInvalidStartingPathTest.java          |   5 +-
 .../component/file/FileKeepLastModifiedTest.java   |  15 +-
 .../camel/component/file/FileLanguageCBRTest.java  |   6 +-
 .../camel/component/file/FileMEPInOutTest.java     |   2 +-
 .../file/FileMarkerFileDeleteOldLockFilesTest.java |   6 +-
 ...eMarkerFileRecursiveDeleteOldLockFilesTest.java |   6 +-
 ...erFileRecursiveDoNotDeleteOldLockFilesTest.java |   6 +-
 ...cursiveFilterDeleteOldLockFilesIncludeTest.java |   6 +-
 ...rFileRecursiveFilterDeleteOldLockFilesTest.java |   6 +-
 .../file/FileMoveAndMoveFailedIssueTest.java       |   6 +-
 .../FileMoveErrorOnExceptionNotHandledTest.java    |   6 +-
 .../component/file/FileMulticastDeleteTest.java    |   6 +-
 .../camel/component/file/FileNoOpLockFileTest.java |  10 +-
 .../component/file/FilePollEnrichNoWaitTest.java   |  10 +-
 .../camel/component/file/FilePollEnrichTest.java   |  10 +-
 .../component/file/FilePollingConsumerTest.java    |  10 +-
 .../component/file/FileProduceAppendCharsTest.java |   6 +-
 .../component/file/FileProduceAppendTest.java      |   6 +-
 .../file/FileProduceGeneratedFileNameTest.java     |   6 +-
 .../file/FileProduceOverruleExpressionTest.java    |   6 +-
 .../file/FileProduceOverruleOnlyOnceTest.java      |   6 +-
 .../component/file/FileProduceOverruleTest.java    |   6 +-
 .../file/FileProduceTempFileNameTest.java          |  14 +-
 .../component/file/FileProduceTempPrefixTest.java  |  10 +-
 ...ProducerAllowNullBodyFileAlreadyExistsTest.java |   6 +-
 .../file/FileProducerAllowNullBodyTest.java        |  10 +-
 .../file/FileProducerCharsetUTFOptimizedTest.java  |  13 +-
 .../FileProducerCharsetUTFtoISOConfiguredTest.java |  13 +-
 ...leProducerCharsetUTFtoISOConvertBodyToTest.java |  13 +-
 .../file/FileProducerCharsetUTFtoISOTest.java      |  13 +-
 .../file/FileProducerCharsetUTFtoUTFTest.java      |  13 +-
 .../file/FileProducerChmodOptionTest.java          |   9 +-
 .../file/FileProducerDirectoryChmodOptionTest.java |   8 +-
 .../component/file/FileProducerExpressionTest.java |   6 +-
 .../file/FileProducerFileBodyGetsMovedTest.java    |  12 +-
 ...ileProducerFileExistAppendNoFileBeforeTest.java |   6 +-
 .../file/FileProducerFileExistAppendTest.java      |   6 +-
 .../file/FileProducerFileExistFailTest.java        |   9 +-
 .../file/FileProducerFileExistIgnoreTest.java      |   6 +-
 ...eProducerFileExistOverrideNoFileBeforeTest.java |   6 +-
 .../file/FileProducerFileExistOverrideTest.java    |   6 +-
 .../file/FileProducerFileExistTryRenameTest.java   |   6 +-
 .../file/FileProducerFilenameConstantTest.java     |  10 +-
 .../FileProducerJailStartingDirectoryTest.java     |   9 +-
 .../file/FileProducerMoveExistingStrategyTest.java |   8 +-
 .../file/FileProducerMoveExistingTest.java         |   8 +-
 .../file/FileProducerNoForcedWritesTest.java       |   8 +-
 .../file/FileProducerRenameUsingCopyTest.java      |  13 +-
 .../component/file/FileProducerStreamTest.java     |   6 +-
 .../file/FileProducerTempFileExistsIssueTest.java  |   8 +-
 .../file/FileProducerToDMoveExistingTest.java      |   4 +-
 .../component/file/FileRecursiveDepthTest.java     |   6 +-
 .../component/file/FileRecursiveNoopTest.java      |   6 +-
 .../file/FileRenameFileOnCommitIssueTest.java      |   6 +-
 .../FileRenameReadLockMustUseMarkerFileTest.java   |  13 +-
 .../file/FileRouteOnDosWithNoVolTest.java          |   6 +-
 .../component/file/FileSortByExpressionTest.java   |   6 +-
 .../file/FileSortByIgnoreCaseExpressionTest.java   |   6 +-
 .../file/FileSortByNestedExpressionTest.java       |   6 +-
 .../camel/component/file/FileSorterRefTest.java    |   6 +-
 .../camel/component/file/FileSplitInSplitTest.java |  13 +-
 .../component/file/FileSplitXPathCharsetTest.java  |   6 +-
 .../component/file/FileToFileNioLowBufferTest.java |   6 +-
 .../component/file/FileToFileWithFlattenTest.java  |  10 +-
 .../camel/component/file/FileURLDecodingTest.java  |  12 +-
 .../file/FilerConsumerDoneFileNameDeleteTest.java  |  12 +-
 .../file/FilerConsumerDoneFileNamePrefixTest.java  |  10 +-
 .../FilerConsumerDoneFileNameSimplePrefixTest.java |  10 +-
 .../file/FilerConsumerDoneFileNameSuffixTest.java  |  10 +-
 .../file/FilerConsumerDoneFileNameTest.java        |  13 +-
 .../file/FilerConsumerDoneFileNoopTest.java        |  12 +-
 .../file/FilerConsumerDualDoneFileNameTest.java    |   6 +-
 .../FilerConsumerMoveFailedDoneFileNameTest.java   |  13 +-
 .../file/FilerConsumerPreMoveDoneFileNameTest.java |  10 +-
 .../file/FilerConsumerRetryDoneFileNameTest.java   |  15 +-
 .../FilerConsumerShouldSkipDoneFilePrefixTest.java |  13 +-
 .../FilerConsumerShouldSkipDoneFileSuffixTest.java |  13 +-
 .../file/FilerConsumerShouldSkipDoneFileTest.java  |  13 +-
 .../component/file/FilerProducerAbsoluteTest.java  |   6 +-
 .../file/FilerProducerDoneFileNameRouteTest.java   |  13 +-
 .../file/FilerProducerDoneFileNameTest.java        |  32 +++--
 .../component/file/FilerProducerFileNamesTest.java |  12 +-
 .../FromFileDoNotDeleteFileIfProcessFailsTest.java |  10 +-
 .../FromFileDoNotMoveFileIfProcessFailsTest.java   |  10 +-
 .../file/FromFileMoveDoneCustomHeaderTest.java     |   6 +-
 .../file/FromFileMoveFileIfProcessFailsTest.java   |   6 +-
 .../file/FromFileMulticastToFilesTest.java         |   6 +-
 .../file/FromFilePollThirdTimeOkTest.java          |  12 +-
 .../component/file/GenericFileConverterTest.java   |   6 +-
 .../component/file/GenericFileMessageTest.java     |   9 +-
 ...kerFileExclusiveReadLockStrategyUnlockTest.java |  10 +-
 .../camel/component/file/NewFileConsumeTest.java   |   9 +-
 .../camel/component/file/NewFileConsumerTest.java  |   6 +-
 .../camel/component/file/NewFileProduceTest.java   |  10 +-
 .../camel/component/file/ToFileRouteTest.java      |   2 +-
 .../camel/component/file/XPathToFileTest.java      |  13 +-
 .../FileLockClusteredRoutePolicyFactoryTest.java   |  10 +-
 .../cluster/FileLockClusteredRoutePolicyTest.java  |  10 +-
 .../FileChangedReadLockMinAgeShortCircuitTest.java |   6 +-
 .../strategy/FileChangedReadLockMinAgeTest.java    |  10 +-
 .../file/strategy/FileChangedReadLockTest.java     |  10 +-
 .../FileChangedReadLockZeroTimeoutTest.java        |   8 +-
 .../FileChangedZeroLengthReadLockTest.java         |   6 +-
 .../FileIdempotentChangedReadLockTest.java         |   2 +
 .../FileIdempotentReadLockDelayedAsyncTest.java    |   9 +-
 .../FileIdempotentReadLockDelayedTest.java         |   9 +-
 .../file/strategy/FileIdempotentReadLockTest.java  |   9 +-
 .../strategy/FileIdempotentRenameReadLockTest.java |   2 +
 .../GenericFileDeleteProcessStrategyTest.java      |  13 +-
 .../MarkerFileExclusiveReadLockStrategyTest.java   |  11 +-
 .../file/stress/FileAsyncStressFileDropper.java    |   4 +-
 .../file/stress/FileAsyncStressManually.java       |   4 +-
 .../FileAsyncStressReadLockLockFileTest.java       |   4 +-
 .../stress/FileAsyncStressReadLockNoneTest.java    |   4 +-
 .../stress/FileAsyncStressReadLockRenameTest.java  |   4 +-
 .../component/file/stress/FileAsyncStressTest.java |  10 +-
 .../file/stress/FileConsumerPollManyFilesTest.java |  10 +-
 .../FileProducerAppendManyMessagesFastTest.java    |  10 +-
 .../stress/FileProducerAppendManyMessagesTest.java |  10 +-
 .../language/LanguageCacheScriptTest.java          |   5 +-
 .../language/LanguageEndpointScriptRouteTest.java  |   2 +-
 .../language/LanguageHeaderRouteTest.java          |   2 +-
 .../LanguageLoadScriptFromClasspathHeaderTest.java |   2 +-
 .../LanguageLoadScriptFromClasspathTest.java       |   2 +-
 .../LanguageLoadScriptFromFileUpdateTest.java      |   6 +-
 .../language/LanguageNoCacheScriptTest.java        |   5 +-
 ...guageResourceLoadConstantFromClasspathTest.java |   2 +-
 .../language/LanguageRouteConvertBodyTest.java     |   2 +-
 .../language/LanguageRouteNoTransformTest.java     |   2 +-
 .../component/language/LanguageRouteTest.java      |   2 +-
 ...guageScriptInHeaderRouteTakePrecedenceTest.java |   2 +-
 .../language/LanguageScriptInHeaderRouteTest.java  |   2 +-
 .../language/LanguageScriptRouteTest.java          |   2 +-
 .../component/language/LanguageXPathRouteTest.java |   2 +-
 .../log/DefaultExchangeFormatterTest.java          |   4 +-
 .../component/log/LogBodyWithNewLineTest.java      |   8 +-
 .../component/log/LogComponentOptionsTest.java     |  14 +-
 .../component/log/LogCustomFormatterTest.java      |   8 +-
 .../camel/component/log/LogCustomLoggerTest.java   |   7 +-
 .../component/log/LogEndpointOptionsTest.java      |   6 +-
 .../camel/component/log/LogEndpointTest.java       |  15 +-
 .../camel/component/log/LogInputStreamTest.java    |   2 +-
 .../camel/component/log/LogListenerTest.java       |   9 +-
 .../apache/camel/component/log/LogMaskTest.java    |   7 +-
 .../apache/camel/component/log/LogRouteTest.java   |   4 +-
 .../camel/component/log/ThroughputLoggerTest.java  |   2 +-
 .../camel/component/mock/MockAsBeanTest.java       |   2 +-
 .../component/mock/MockAssertionClauseTest.java    |   2 +-
 .../camel/component/mock/MockEndpointTest.java     |   4 +-
 .../component/mock/MockEndpointTimeClauseTest.java |   5 +-
 .../mock/MockEndpointWithParametersTest.java       |   2 +-
 .../mock/MockExpectedBodiesAsListTest.java         |   2 +-
 .../camel/component/mock/MockPredicateTest.java    |   2 +-
 .../component/mock/MockStreamCachingTest.java      |   2 +-
 .../camel/component/mock/MockThroughtputTest.java  |   2 +-
 .../apache/camel/component/mock/MockXpathTest.java |   2 +-
 .../org/apache/camel/component/mock/TimeTest.java  |   7 +-
 .../apache/camel/component/pojo/PojoRouteTest.java |   7 +-
 .../ComponentResolvePropertyPlaceholdersTest.java  |   5 +-
 .../OptionalPropertiesDslInvalidSyntaxTest.java    |   5 +-
 .../properties/OptionalPropertiesDslTest.java      |   4 +-
 ...onentAdviceWithInterceptSendToEndpointTest.java |   2 +-
 ...opertiesComponentConcatenatePropertiesTest.java |  10 +-
 .../PropertiesComponentDefaultFunctionsTest.java   |   2 +-
 .../PropertiesComponentDisableDefaultsTest.java    |   2 +-
 ...pertiesComponentEIPChoiceConvertBodyToTest.java |   2 +-
 .../PropertiesComponentEIPChoiceSimpleTest.java    |   2 +-
 .../PropertiesComponentEIPConvertBodyToTest.java   |   2 +-
 .../PropertiesComponentEIPRoutingSlipTest.java     |   2 +-
 .../PropertiesComponentEncodingTest.java           |   2 +-
 .../PropertiesComponentEndpointTest.java           |   2 +-
 .../PropertiesComponentFunctionTest.java           |   2 +-
 .../PropertiesComponentInitialPropertiesTest.java  |   2 +-
 .../PropertiesComponentInterceptFromTest.java      |   2 +-
 ...ertiesComponentInterceptSendToEndpointTest.java |   2 +-
 ...ponentLoadPropertiesFromFileTrimValuesTest.java |   8 +-
 .../PropertiesComponentLoadPropertiesTest.java     |   5 +-
 ...ertiesComponentOnExceptionDelayPatternTest.java |   2 +-
 .../PropertiesComponentOnExceptionTest.java        |   4 +-
 ...ropertiesComponentOnlyUseDefaultValuesTest.java |   4 +-
 ...esComponentOverridePropertiesNonStringTest.java |   2 +-
 .../PropertiesComponentOverridePropertiesTest.java |   2 +-
 .../PropertiesComponentPropertiesSourceTest.java   |   2 +-
 .../PropertiesComponentRegistryTest.java           |   4 +-
 .../PropertiesComponentServiceHostPortTest.java    |   2 +-
 .../PropertiesComponentServiceHostTest.java        |   2 +-
 .../PropertiesComponentServicePortTest.java        |   2 +-
 .../properties/PropertiesComponentServiceTest.java |   2 +-
 .../PropertiesComponentSetHeaderSimpleTest.java    |   2 +-
 ...rtiesComponentSomethingElseBoundToJndiTest.java |   6 +-
 .../properties/PropertiesRouteFromTest.java        |   5 +-
 .../properties/PropertiesRouteIdTest.java          |   7 +-
 .../properties/XPathPropertyPlaceholderTest.java   |   2 +-
 .../camel/component/ref/RefComponentTest.java      |   2 +-
 .../camel/component/ref/RefFileEndpointTest.java   |   8 +-
 .../apache/camel/component/ref/RefInvalidTest.java |   5 +-
 .../component/rest/FromRestAdviceWithTest.java     |   4 +-
 .../camel/component/rest/FromRestApiTest.java      |   5 +-
 .../component/rest/FromRestConfigurationTest.java  |   5 +-
 .../component/rest/FromRestDefaultValueTest.java   |   2 +-
 .../component/rest/FromRestDuplicateTest.java      |   5 +-
 .../component/rest/FromRestGetContentTypeTest.java |   5 +-
 .../rest/FromRestGetCorsAllowCredentialsTest.java  |   5 +-
 .../component/rest/FromRestGetCorsCustomTest.java  |   5 +-
 .../camel/component/rest/FromRestGetCorsTest.java  |   5 +-
 .../rest/FromRestGetEmbeddedRouteTest.java         |   5 +-
 .../component/rest/FromRestGetEndPathTest.java     |   5 +-
 .../rest/FromRestGetHttpErrorCodeTest.java         |   5 +-
 .../component/rest/FromRestGetInterceptTest.java   |   4 +-
 .../component/rest/FromRestGetOnExceptionTest.java |   4 +-
 .../rest/FromRestGetPlaceholderParamTest.java      |   5 +-
 .../component/rest/FromRestGetPolicyTest.java      |   4 +-
 .../camel/component/rest/FromRestGetTest.java      |   5 +-
 .../rest/FromRestIdAndDescriptionTest.java         |   4 +-
 .../component/rest/FromRestUriPrefixTest.java      |   5 +-
 .../camel/component/rest/RestComponentTest.java    |  13 +-
 .../rest/RestComponentVerifierExtensionTest.java   |  18 +--
 .../component/rest/RestComponentVerifierTest.java  |  18 +--
 .../camel/component/rest/RestEndpointTest.java     |   7 +-
 .../rest/RestProducerBindingProcessorTest.java     |  14 +-
 .../camel/component/rest/RestProducerPathTest.java |  28 ++--
 .../camel/component/rest/RestProducerTest.java     |   6 +-
 .../camel/component/saga/SagaComponentTest.java    |   7 +-
 .../scheduler/SchedulerNoPolledMessagesTest.java   |   2 +-
 .../scheduler/SchedulerRepeatCountTest.java        |   2 +-
 .../component/scheduler/SchedulerRouteTest.java    |   6 +-
 .../TwoSchedulerConcurrentTasksOneRouteTest.java   |   2 +-
 .../scheduler/TwoSchedulerConcurrentTasksTest.java |   2 +-
 .../component/scheduler/TwoSchedulerTest.java      |   4 +-
 .../seda/DirectRequestReplyAndSedaInOnlyTest.java  |   4 +-
 .../seda/FileSedaShutdownCompleteAllTasksTest.java |  10 +-
 ...meSedaQueueMultipleConsumersDifferenceTest.java |   8 +-
 .../seda/SameSedaQueueSizeAndNoSizeTest.java       |   5 +-
 .../component/seda/SedaAsyncProducerTest.java      |   8 +-
 .../camel/component/seda/SedaAsyncRouteTest.java   |   4 +-
 .../SedaBlockWhenFullInvalidConfigurationTest.java |   5 +-
 .../component/seda/SedaBlockWhenFullTest.java      |   6 +-
 .../camel/component/seda/SedaComplexInOutTest.java |   4 +-
 .../seda/SedaComponentReferenceEndpointTest.java   |   5 +-
 .../seda/SedaConcurrentConsumersNPEIssueTest.java  |   5 +-
 .../seda/SedaConcurrentConsumersTest.java          |   2 +-
 .../camel/component/seda/SedaConcurrentTest.java   |   5 +-
 .../camel/component/seda/SedaConfigureTest.java    |  18 +--
 .../seda/SedaConsumerSuspendResumeTest.java        |   3 +-
 .../seda/SedaDefaultBlockWhenFullTest.java         |   6 +-
 .../seda/SedaDefaultDiscardWhenFullTest.java       |   2 +-
 .../seda/SedaDefaultUnboundedQueueSizeTest.java    |   5 +-
 .../seda/SedaDiscardIfNoConsumerTest.java          |   4 +-
 .../component/seda/SedaDiscardWhenFullTest.java    |   2 +-
 .../camel/component/seda/SedaEndpointTest.java     |   4 +-
 .../apache/camel/component/seda/SedaErrorTest.java |   2 +-
 .../camel/component/seda/SedaFromRouteIdTest.java  |   4 +-
 .../component/seda/SedaInOnlyChainedTest.java      |   2 +-
 .../camel/component/seda/SedaInOnlyTest.java       |   2 +-
 .../component/seda/SedaInOutBigChainedTest.java    |   4 +-
 .../camel/component/seda/SedaInOutChainedTest.java |   4 +-
 .../seda/SedaInOutChainedTimeoutTest.java          |   6 +-
 .../seda/SedaInOutChainedWithOnCompletionTest.java |   4 +-
 .../apache/camel/component/seda/SedaInOutTest.java |   4 +-
 .../SedaInOutWithErrorDeadLetterChannelTest.java   |   2 +-
 .../component/seda/SedaInOutWithErrorTest.java     |   5 +-
 .../component/seda/SedaMultipleConsumersTest.java  |   2 +-
 .../camel/component/seda/SedaNoConsumerTest.java   |   5 +-
 .../component/seda/SedaPurgeWhenStoppingTest.java  |   2 +-
 .../camel/component/seda/SedaQueueFactoryTest.java |   8 +-
 .../apache/camel/component/seda/SedaQueueTest.java |   7 +-
 .../seda/SedaRemoveRouteThenAddAgainTest.java      |   2 +-
 .../apache/camel/component/seda/SedaRouteTest.java |  12 +-
 .../seda/SedaShouldNotUseSameThreadTest.java       |   7 +-
 .../camel/component/seda/SedaSimpleSizeTest.java   |   2 +-
 .../seda/SedaSuspendConsumerStopRouteTest.java     |   8 +-
 .../component/seda/SedaTimeoutDisabledTest.java    |   4 +-
 .../camel/component/seda/SedaTimeoutTest.java      |   8 +-
 .../camel/component/seda/SedaUnitOfWorkTest.java   |   8 +-
 .../seda/SedaWaitForTaskAsPropertyTest.java        |   4 +-
 .../SedaWaitForTaskCompleteOnCompletionTest.java   |   5 +-
 .../seda/SedaWaitForTaskCompleteTest.java          |   4 +-
 .../seda/SedaWaitForTaskIfReplyExpectedTest.java   |   4 +-
 .../seda/SedaWaitForTaskNewerOnCompletionTest.java |   5 +-
 .../component/seda/SedaWaitForTaskNewerTest.java   |   4 +-
 .../camel/component/seda/TracingWithDelayTest.java |   2 +-
 .../apache/camel/component/stub/StubAwsTest.java   |   2 +-
 .../camel/component/stub/StubConsumerTest.java     |   2 +-
 .../camel/component/stub/StubInOnlyTest.java       |   2 +-
 .../apache/camel/component/stub/StubInOutTest.java |   2 +-
 .../org/apache/camel/component/stub/StubTest.java  |   2 +-
 .../camel/component/timer/TimerAsyncTest.java      |   9 +-
 .../component/timer/TimerDelaySecondsTest.java     |   3 +-
 .../camel/component/timer/TimerDelayTest.java      |   2 +-
 .../camel/component/timer/TimerEndpointTest.java   |   4 +-
 .../camel/component/timer/TimerFiredTimeTest.java  |   5 +-
 .../component/timer/TimerGracefulShutdownTest.java |  10 +-
 .../timer/TimerMultipleConsumerStopRouteTest.java  |   2 +-
 .../component/timer/TimerMultipleConsumerTest.java |   2 +-
 .../camel/component/timer/TimerNameTest.java       |   4 +-
 .../component/timer/TimerNegativeDelayTest.java    |   2 +-
 .../timer/TimerNegativeNoRepeatCountDelayTest.java |   5 +-
 .../timer/TimerReferenceConfigurationTest.java     |   4 +-
 .../component/timer/TimerRepeatCountTest.java      |   2 +-
 .../camel/component/timer/TimerRestartTest.java    |   2 +-
 .../camel/component/timer/TimerRouteTest.java      |   6 +-
 .../timer/TimerSuspendCamelContextTest.java        |   2 +-
 .../component/timer/TimerWithTimeOptionTest.java   |   4 +-
 .../validator/CustomSchemaFactoryFeatureTest.java  |   2 +-
 .../validator/FileValidatorRouteTest.java          |  12 +-
 .../component/validator/ValidatorBeanCallTest.java |   6 +-
 .../validator/ValidatorDtdAccessAbstractTest.java  |   4 +-
 .../validator/ValidatorDtdAccessOffTest.java       |   2 +-
 .../validator/ValidatorDtdAccessOnTest.java        |   2 +-
 .../ValidatorEndpointClearCachedSchemaTest.java    |   2 +-
 .../validator/ValidatorIllegalImportTest.java      |   5 +-
 .../ValidatorIncludeEncodingRouteTest.java         |   6 +-
 .../ValidatorIncludeRelativeRouteTest.java         |   2 +-
 .../validator/ValidatorIncludeRouteTest.java       |   6 +-
 .../validator/ValidatorLazyStartProducerTest.java  |   4 +-
 .../ValidatorResourceResolverFactoryTest.java      |   9 +-
 .../component/validator/ValidatorRootPathTest.java |   6 +-
 .../component/validator/ValidatorRouteTest.java    |  18 ++-
 .../ValidatorWithResourceResolverRouteTest.java    |   6 +-
 .../camel/component/vm/AbstractVmTestSupport.java  |   9 +-
 .../component/vm/ConsumerCamelContextAware.java    |   3 +
 .../component/vm/SameVmQueueSizeAndNoSizeTest.java |   5 +-
 .../apache/camel/component/vm/VMSplitterTest.java  |   2 +-
 .../vm/VmComponentReferenceEndpointTest.java       |   5 +-
 .../component/vm/VmConcurrentConsumersTest.java    |   2 +-
 ...mDifferentOptionsOnConsumerAndProducerTest.java |   6 +-
 .../component/vm/VmDiscardIfNoConsumerTest.java    |   4 +-
 .../camel/component/vm/VmInOnlyChainedTest.java    |   2 +-
 .../apache/camel/component/vm/VmInOnlyTest.java    |   2 +-
 .../camel/component/vm/VmInOutChainedTest.java     |   4 +-
 .../component/vm/VmInOutChainedTimeoutTest.java    |   6 +-
 .../org/apache/camel/component/vm/VmInOutTest.java |   4 +-
 .../camel/component/vm/VmInOutWithErrorTest.java   |   5 +-
 .../component/vm/VmMultipleConsumersIssueTest.java |   2 +-
 .../vm/VmMultipleConsumersKeepRouteTest.java       |   5 +-
 .../vm/VmMultipleConsumersMultipleContextTest.java |   2 +-
 .../vm/VmMultipleConsumersRemoteRouteTest.java     |   5 +-
 .../vm/VmMultipleContextsStartStopTest.java        |   2 +-
 .../org/apache/camel/component/vm/VmQueueTest.java |   2 +-
 .../component/vm/VmShouldNotUseSameThreadTest.java |   7 +-
 .../component/vm/VmShouldUseConsumerContext.java   |   2 +
 .../camel/component/vm/VmTimeoutIssueTest.java     |   5 +-
 .../camel/component/vm/VmUseSameQueueTest.java     |   2 +-
 .../component/vm/VmWaitForTaskCompleteTest.java    |   4 +-
 .../vm/VmWaitForTaskIfReplyExpectedTest.java       |   5 +-
 .../camel/component/vm/VmWaitForTaskNewerTest.java |   5 +-
 .../camel/component/xslt/InvalidXsltFileTest.java  |   4 +-
 .../org/apache/camel/component/xslt/MyXPath.java   |   1 +
 .../xslt/XsltCustomErrorListenerTest.java          |   8 +-
 .../xslt/XsltCustomizeEntityResolverTest.java      |   2 +-
 .../xslt/XsltCustomizeURIResolverTest.java         |   2 +-
 .../apache/camel/component/xslt/XsltDTDTest.java   |  14 +-
 .../camel/component/xslt/XsltFeatureRouteTest.java |  11 +-
 .../camel/component/xslt/XsltFileNotFoundTest.java |   4 +-
 .../component/xslt/XsltFromFileExceptionTest.java  |  17 ++-
 .../XsltIncludeClasspathDotInDirectoryTest.java    |  14 +-
 .../component/xslt/XsltIncludeClasspathTest.java   |   2 +-
 .../xslt/XsltIncludeRelativeFileSchemeTest.java    |   2 +-
 .../xslt/XsltIncludeRelativeNestedTest.java        |   2 +-
 .../xslt/XsltIncludeRelativeOtherTest.java         |   2 +-
 .../component/xslt/XsltIncludeRelativeTest.java    |   2 +-
 .../camel/component/xslt/XsltIncludeTest.java      |   2 +-
 .../component/xslt/XsltMessageTerminateTest.java   |   5 +-
 .../camel/component/xslt/XsltOutputBytesTest.java  |   2 +-
 .../camel/component/xslt/XsltOutputDOMTest.java    |   2 +-
 .../component/xslt/XsltOutputFileDeleteTest.java   |   6 +-
 .../camel/component/xslt/XsltOutputFileTest.java   |   5 +-
 .../camel/component/xslt/XsltOutputStringTest.java |   2 +-
 .../apache/camel/component/xslt/XsltRouteTest.java |   8 +-
 .../component/xslt/XsltRouteXsltWithErrorTest.java |   4 +-
 .../xslt/XsltTransformingExceptionTest.java        |  11 +-
 .../component/xslt/XsltUriResolverFactoryTest.java |   7 +-
 .../apache/camel/converter/CamelConverterTest.java |   3 +-
 .../camel/converter/CollectionConverterTest.java   |   7 +-
 .../camel/converter/ConverterBenchmarkTest.java    |   8 +-
 .../org/apache/camel/converter/ConverterTest.java  |  75 +++++-----
 .../camel/converter/DateTimeConverterTest.java     |   5 +-
 .../camel/converter/DurationConverterTest.java     |  11 +-
 .../apache/camel/converter/EnumConverterTest.java  |   5 +-
 .../camel/converter/FallbackPromoteTest.java       |   8 +-
 .../camel/converter/FutureConverterTest.java       |   4 +-
 .../apache/camel/converter/IOConverterTest.java    |  36 ++---
 .../converter/InstanceFallbackConverterTest.java   |   4 +-
 .../java/org/apache/camel/converter/JaxpTest.java  |  21 +--
 .../apache/camel/converter/NIOConverterTest.java   |   7 +-
 .../camel/converter/ObjectConverterNaNTest.java    |   8 +-
 .../camel/converter/ObjectConverterTest.java       |   7 +-
 .../converter/PrimitiveTypeConverterIssueTest.java |   4 +-
 .../PropertyEditorTypeConverterIssueTest.java      |   4 +-
 .../apache/camel/converter/SQLConverterTest.java   |   4 +-
 .../converter/StaticFallbackConverterTest.java     |   4 +-
 .../apache/camel/converter/StringSourceTest.java   |  25 ++--
 .../converter/TimePatternTypeConversionTest.java   |   4 +-
 .../TimerDrivenTimePatternConverterTest.java       |   6 +-
 .../camel/converter/jaxp/BytesSourceTest.java      |   4 +-
 .../camel/converter/jaxp/DomConverterTest.java     |   9 +-
 .../camel/converter/jaxp/StAX2SAXSourceTest.java   |   5 +-
 .../camel/converter/jaxp/StaxConverterTest.java    |   6 +-
 .../converter/jaxp/StreamSourceConverterTest.java  |   5 +-
 .../camel/converter/jaxp/XmlConverterTest.java     |   8 +-
 .../stream/ByteArrayInputStreamCacheTest.java      |   4 +-
 .../converter/stream/CachedOutputStreamTest.java   |  90 ++++++------
 .../converter/stream/FileInputStreamCacheTest.java |   5 +-
 .../converter/stream/InputStreamCacheTest.java     |   4 +-
 .../camel/converter/stream/ReaderCacheTest.java    |   4 +-
 .../camel/converter/stream/SourceCacheTest.java    |   4 +-
 .../converter/stream/StreamCacheConverterTest.java |  12 +-
 .../converter/stream/StreamSourceCacheTest.java    |   4 +-
 .../camel/impl/BeanInjectRouteBuilderTest.java     |   2 +-
 .../impl/BindToRegistryBeanPostProcessorTest.java  |   5 +-
 .../CamelContextAddRestDefinitionsFromXmlTest.java |  12 +-
 ...CamelContextAddRouteDefinitionsFromXmlTest.java |  24 ++--
 .../camel/impl/CamelContextDeadlockTest.java       |   6 +-
 .../apache/camel/impl/CamelContextTrackerTest.java |   7 +-
 .../CamelCustomDefaultThreadPoolProfileTest.java   |   4 +-
 .../CamelProduceInterfaceEventNotifierTest.java    |  15 +-
 .../camel/impl/CamelProduceInterfaceTest.java      |   4 +-
 .../camel/impl/ConsumerCacheOneCapacityTest.java   |  11 +-
 .../impl/CustomHeadersMapFactoryRouteTest.java     |   4 +-
 .../org/apache/camel/impl/CustomIdFactoryTest.java |   8 +-
 .../camel/impl/CustomUnitOfWorkFactoryTest.java    |   2 +-
 .../camel/impl/DataFormatContextAwareTest.java     |   4 +-
 .../DefaultAsyncProcessorAwaitManagerTest.java     |   4 +-
 ...efaultCamelBeanPostProcessorFieldFirstTest.java |   9 +-
 .../impl/DefaultCamelBeanPostProcessorTest.java    |   8 +-
 ...melContextAllowUseOriginalMessageFalseTest.java |   2 +-
 ...amelContextAllowUseOriginalMessageTrueTest.java |   2 +-
 .../impl/DefaultCamelContextAutoStartupTest.java   |   4 +-
 .../impl/DefaultCamelContextResolverTest.java      |  66 ++++-----
 .../camel/impl/DefaultCamelContextRestartTest.java |   4 +-
 .../impl/DefaultCamelContextStopFailureTest.java   |   4 +-
 ...lContextSuspendResumeRouteStartupOrderTest.java |   5 +-
 .../DefaultCamelContextSuspendResumeRouteTest.java |   5 +-
 ...melContextWithLifecycleStrategyRestartTest.java |   4 +-
 .../camel/impl/DefaultClassResolverTest.java       |   8 +-
 .../DefaultComponentReferencePropertiesTest.java   |   4 +-
 .../apache/camel/impl/DefaultComponentTest.java    |   6 +-
 .../impl/DefaultComponentValidateURITest.java      |   7 +-
 .../camel/impl/DefaultConsumerCacheTest.java       |  10 +-
 .../camel/impl/DefaultConsumerTemplateTest.java    |  29 ++--
 ...ConsumerTemplateWithCustomCacheMaxSizeTest.java |  10 +-
 .../camel/impl/DefaultEndpointRegistryTest.java    |   4 +-
 .../camel/impl/DefaultExchangeHolderTest.java      |   4 +-
 .../org/apache/camel/impl/DefaultExchangeTest.java |   8 +-
 .../impl/DefaultExecutorServiceManagerTest.java    |  16 ++-
 .../impl/DefaultHeaderFilterStrategyTest.java      |   4 +-
 .../camel/impl/DefaultHeadersMapFactoryTest.java   |   7 +-
 .../camel/impl/DefaultInflightRepositoryTest.java  |   4 +-
 .../org/apache/camel/impl/DefaultInjectorTest.java |   7 +-
 .../camel/impl/DefaultMessageHeaderTest.java       |  12 +-
 .../camel/impl/DefaultProducerCacheTest.java       |  30 ++--
 .../impl/DefaultProducerTemplateAsyncTest.java     |  24 ++--
 ...efaultProducerTemplateNonBlockingAsyncTest.java |  14 +-
 .../camel/impl/DefaultProducerTemplateTest.java    |  36 ++---
 ...ProducerTemplateWithCustomCacheMaxSizeTest.java |  10 +-
 .../camel/impl/DefaultUuidGeneratorTest.java       |   8 +-
 .../camel/impl/DurationRoutePolicyFactoryTest.java |   4 +-
 .../impl/DurationRoutePolicyMaxMessagesTest.java   |   4 +-
 .../impl/DurationRoutePolicyMaxSecondsTest.java    |   4 +-
 .../apache/camel/impl/EndpointPrototypeTest.java   |   4 +-
 ...outeEndpointsRemoteRouteSharedEndpointTest.java |   4 +-
 ...tRegistryKeepRouteEndpointsRemoteRouteTest.java |   4 +-
 .../EndpointRegistryKeepRouteEndpointsTest.java    |   6 +-
 .../camel/impl/EndpointShutdownOnceTest.java       |  15 +-
 .../EventDrivenPollingConsumerQueueSizeTest.java   |   8 +-
 .../apache/camel/impl/ExpressionAdapterTest.java   |   5 +-
 .../apache/camel/impl/ExpressionSupportTest.java   |   5 +-
 .../impl/ExtendedStartupListenerComponentTest.java |   5 +-
 .../apache/camel/impl/FileStateRepositoryTest.java |  28 ++--
 .../org/apache/camel/impl/FromEndpointTest.java    |   9 +-
 .../camel/impl/FromHasNoOutputRouteTest.java       |   5 +-
 .../camel/impl/FromMultipleEndpointTest.java       |   8 +-
 .../apache/camel/impl/GetRegistryAsTypeTest.java   |   8 +-
 .../GracefulShutdownNoAutoStartOrderClashTest.java |   7 +-
 .../impl/HashMapHeadersMapFactoryRouteTest.java    |   2 +-
 .../impl/HeaderFilterStrategyComponentTest.java    |   8 +-
 .../InflightRepositoryBrowseFromRouteTest.java     |   5 +-
 .../camel/impl/InflightRepositoryBrowseTest.java   |   5 +-
 .../camel/impl/InflightRepositoryRouteTest.java    |   4 +-
 ...erceptSendToMockEndpointStrategyCustomTest.java |   7 +-
 .../InterceptSendToMockEndpointStrategyTest.java   |   5 +-
 .../camel/impl/LanguageCamelContextAwareTest.java  |   4 +-
 .../apache/camel/impl/LazyStartProducerTest.java   |   4 +-
 .../camel/impl/LifecycleStrategyDiscoveryTest.java |   3 +-
 .../impl/LifecycleStrategyFailOnStartupTest.java   |   5 +-
 .../camel/impl/LifecycleStrategyServiceTest.java   |   4 +-
 .../LimitedPollingConsumerPollStrategyTest.java    |  68 ++++-----
 .../camel/impl/LogDebugBodyMaxCharsOffTest.java    |  11 +-
 .../camel/impl/LogDebugBodyMaxCharsTest.java       |  13 +-
 .../apache/camel/impl/LogDebugBodyStreamsTest.java |   4 +-
 .../camel/impl/MemoryStateRepositoryTest.java      |   4 +-
 .../org/apache/camel/impl/MessageSupportTest.java  |   4 +-
 .../apache/camel/impl/ModelCamelContextTest.java   |   4 +-
 .../camel/impl/MultipleConsumersSupportTest.java   |   5 +-
 .../camel/impl/MultipleLifecycleStrategyTest.java  |   6 +-
 ...ingExchangesAsyncDelayShutdownGracefulTest.java |   6 +-
 .../impl/PendingExchangesShutdownGracefulTest.java |   7 +-
 ...ndingExchangesTwoRouteShutdownGracefulTest.java |   9 +-
 .../impl/PojoProduceInterceptEndpointTest.java     |   7 +-
 .../PojoProduceProxyInterceptEndpointTest.java     |   7 +-
 .../camel/impl/ProducerCacheNonSingletonTest.java  |  12 +-
 .../impl/ProxyInstantiationExceptionTest.java      |   4 +-
 .../org/apache/camel/impl/RefDataFormatTest.java   |   2 +-
 .../RegistryLookupTypeClassCastExceptionTest.java  |   7 +-
 .../camel/impl/RemoveRouteStopEndpointTest.java    |  28 ++--
 .../camel/impl/RouteDirectSuspendResumeTest.java   |   5 +-
 .../camel/impl/RouteIdRestDefinitionTest.java      |   4 +-
 .../impl/RouteMustHaveOutputOnExceptionTest.java   |   4 +-
 .../org/apache/camel/impl/RouteNoOutputTest.java   |   9 +-
 .../RoutePolicyAutoStartupCancelledOnInitTest.java |   7 +-
 .../apache/camel/impl/RoutePolicyCallbackTest.java |   5 +-
 .../apache/camel/impl/RoutePolicyFactoryTest.java  |   2 +-
 .../apache/camel/impl/RoutePolicySupportTest.java  |   4 +-
 .../org/apache/camel/impl/RoutePolicyTest.java     |   5 +-
 .../org/apache/camel/impl/RouteRemoveTest.java     |   4 +-
 .../apache/camel/impl/RouteSedaStopStartTest.java  |   4 +-
 .../camel/impl/RouteSedaSuspendResumeTest.java     |   3 +-
 .../camel/impl/RouteSetRouteIdTwoTimesTest.java    |   4 +-
 .../camel/impl/RouteSuspendResumeWarmUpTest.java   |   4 +-
 .../impl/RouteWithMistypedComponentNameTest.java   |   4 +-
 .../camel/impl/RuntimeEndpointRegistryTest.java    |   4 +-
 .../impl/ScheduledPollConsumerBackoffTest.java     |   4 +-
 .../impl/ScheduledPollConsumerGreedyTest.java      |   4 +-
 .../camel/impl/ScheduledPollConsumerTest.java      |   8 +-
 .../ShutdownGracefulNoAutoStartedRoutesTest.java   |   8 +-
 .../impl/ShutdownGracefulTimeoutTriggerTest.java   |   6 +-
 ...ownStrategyNotSuppressLoggingOnTimeoutTest.java |   6 +-
 ...utdownStrategySuppressLoggingOnTimeoutTest.java |   6 +-
 .../org/apache/camel/impl/SimpleRegistryTest.java  |  11 +-
 .../apache/camel/impl/SimpleRegistryWrapTest.java  |  11 +-
 .../SimpleShutdownGracefulNoAtuoStartedTest.java   |   6 +-
 .../camel/impl/SimpleShutdownGracefulTest.java     |   6 +-
 .../apache/camel/impl/SimpleUuidGeneratorTest.java |   7 +-
 .../apache/camel/impl/StartAndStopRoutesTest.java  |   2 +-
 .../camel/impl/StartStopAndShutdownRouteTest.java  |   5 +-
 .../StartupListenerComponentFromRegistryTest.java  |   5 +-
 .../camel/impl/StartupListenerComponentTest.java   |   5 +-
 .../org/apache/camel/impl/StartupListenerTest.java |   4 +-
 .../camel/impl/StopRouteAbortAfterTimeoutTest.java |  14 +-
 .../camel/impl/TwoRouteSuspendResumeTest.java      |   3 +-
 .../camel/impl/TypeConverterAllowNullTest.java     |   7 +-
 .../TypeConverterRegistryMissesThenAddTest.java    |   7 +-
 .../impl/TypeConverterRegistryPerformanceTest.java |   7 +-
 ...TypeConverterRegistryStatisticsEnabledTest.java |   6 +-
 .../camel/impl/TypeConverterRegistryTest.java      |  11 +-
 .../camel/impl/VetoCamelContextStartTest.java      |   4 +-
 .../camel/impl/converter/TypeConvertersTest.java   |   7 +-
 .../camel/impl/converter/UriTypeConverterTest.java |  10 +-
 ...melPostProcessorHelperConsumePredicateTest.java |   2 +-
 ...amelPostProcessorHelperConsumePropertyTest.java |   4 +-
 ...ostProcessorHelperSedaConsumePredicateTest.java |   2 +-
 .../impl/engine/CamelPostProcessorHelperTest.java  |  13 +-
 .../impl/engine/CustomThreadPoolFactoryTest.java   |   6 +-
 .../camel/impl/engine/DefaultCamelContextTest.java |  18 +--
 .../engine/DefaultComponentNameResolverTest.java   |   5 +-
 .../impl/engine/DefaultFactoryFinderTest.java      |  18 +--
 .../DefaultPackageScanResourceResolverTest.java    |   2 +-
 .../DefaultSupervisingRouteControllerTest.java     |   7 +-
 .../camel/impl/engine/EmptyProducerCacheTest.java  |  14 +-
 .../apache/camel/impl/engine/RouteRemove2Test.java |  22 +--
 .../camel/impl/event/EventNotifierEventsTest.java  |   9 +-
 .../event/EventNotifierExchangeCompletedTest.java  |  10 +-
 .../EventNotifierExchangeSentParallelTest.java     |  10 +-
 .../impl/event/EventNotifierExchangeSentTest.java  |  16 ++-
 .../EventNotifierFailureHandledEventsTest.java     |  32 +++--
 .../event/EventNotifierRedeliveryEventsTest.java   |   9 +-
 ...ventNotifierServiceStoppingFailedEventTest.java |   8 +-
 .../event/MultipleEventNotifierEventsTest.java     |   9 +-
 .../camel/impl/lw/EnricherLightweightTest.java     |   6 +-
 .../camel/impl/lw/LightweightContextTest.java      |   6 +-
 .../camel/impl/lw/PollEnricherLightweightTest.java |  10 +-
 .../camel/impl/lw/SplitterLightweightTest.java     |  25 ++--
 .../camel/impl/model/RouteIdFactoryTest.java       |   4 +-
 .../impl/transformer/TransformerContractTest.java  |   4 +-
 .../impl/transformer/TransformerRouteTest.java     |   6 +-
 .../validator/BeanValidatorInputValidateTest.java  |   2 +-
 .../validator/BeanValidatorOutputValidateTest.java |   5 +-
 ...InflightRepositoryWithFailedValidationTest.java |   5 +-
 .../impl/validator/ValidatorContractTest.java      |   4 +-
 .../camel/impl/validator/ValidatorRouteTest.java   |   4 +-
 .../impl/validator/ValidatorXmlSchemaTest.java     |   4 +-
 .../verifier/DefaultComponentVerifierTest.java     |  30 ++--
 .../camel/impl/verifier/ResultErrorHelperTest.java |   6 +-
 .../org/apache/camel/issues/AdviceWithCBRTest.java |   2 +-
 ...viceWithContextScopedErrorHandlerIssueTest.java |   2 +-
 .../issues/AdviceWithErrorHandlerRemoveTest.java   |   5 +-
 .../issues/AdviceWithInterceptFromRemoveTest.java  |   2 +-
 .../issues/AdviceWithInterceptRemoveTest.java      |   2 +-
 ...dviceWithInterceptSendToEndpointRemoveTest.java |   2 +-
 ...nterceptSendToEndpointWithLoadbalancerTest.java |   2 +-
 .../camel/issues/AdviceWithInterceptTest.java      |   2 +-
 .../issues/AdviceWithInvalidConfiguredTest.java    |   5 +-
 .../apache/camel/issues/AdviceWithIssueTest.java   |   5 +-
 .../issues/AdviceWithOnCompletionRemoveTest.java   |   2 +-
 .../camel/issues/AdviceWithOnCompletionTest.java   |   2 +-
 .../AdviceWithOnExceptionAndInterceptTest.java     |   2 +-
 .../AdviceWithOnExceptionMultipleIssueTest.java    |   2 +-
 .../issues/AdviceWithOnExceptionRemoveTest.java    |   5 +-
 .../camel/issues/AdviceWithOnExceptionTest.java    |   2 +-
 .../apache/camel/issues/AdviceWithPolicyTest.java  |   2 +-
 .../camel/issues/AdviceWithRoutePolicyTest.java    |   2 +-
 ...AdviceWithRouteScopedErrorHandlerIssueTest.java |   2 +-
 .../issues/AdviceWithStartTargetIssueTest.java     |   2 +-
 .../camel/issues/AdviceWithTransactedTest.java     |   2 +-
 .../AdviceWithTwoRoutesOnExceptionIssueTest.java   |   4 +-
 .../camel/issues/AdviceWithUrlIssueTest.java       |   2 +-
 .../issues/AdviceWithWeaveByToUriCBRTest.java      |   2 +-
 .../camel/issues/AdviceWithWeaveByTypeCBRTest.java |   2 +-
 .../AggregatorWithBatchConsumingIssueTest.java     |   2 +-
 .../apache/camel/issues/AmahDeadLetterTest.java    |   2 +-
 .../camel/issues/CBRConcurrencyIssueTest.java      |   2 +-
 .../apache/camel/issues/CBRContainsIssueTest.java  |   2 +-
 .../issues/CBRCustomPredicateAsFilterTest.java     |   4 +-
 .../CacheInputStreamInDeadLetterIssue520Test.java  |  10 +-
 .../apache/camel/issues/Camel4857UriIssueTest.java |  13 +-
 .../camel/issues/ChangeHeaderCaseIssueTest.java    |   4 +-
 .../CharlesSplitAndTryCatchRollbackIssueTest.java  |   5 +-
 ...CharlesSplitUseBeanAsErrorHandlerIssueTest.java |   4 +-
 .../issues/ChoiceEndOrEndChoiceIssueTest.java      |   7 +-
 .../issues/ChoicePredicateSimpleHeaderTest.java    |   2 +-
 .../camel/issues/ComponentUseRawUriTest.java       |  11 +-
 .../issues/ConsumerTemplateSedaQueueIssueTest.java |   4 +-
 ...tScopedOnExceptionErrorHandlerRefIssueTest.java |   2 +-
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |   2 +-
 ...ScopedOnExceptionMultipleRouteBuildersTest.java |   2 +-
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |   5 +-
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   5 +-
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   5 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   5 +-
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   2 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   2 +-
 .../camel/issues/CustomFailveOverProcessor.java    |   2 +
 .../org/apache/camel/issues/DavidSiefertTest.java  |   4 +-
 .../issues/DoCatchCaughExceptionIssueTest.java     |   4 +-
 .../issues/DynamicRouterWithInterceptorTest.java   |   8 +-
 .../issues/EndpointWithRawUriParameterTest.java    |   4 +-
 .../camel/issues/ErrorHandlerAdviceIssueTest.java  |   2 +-
 .../camel/issues/ExceptionCamel4022Test.java       |   5 +-
 .../camel/issues/ExceptionPolicyIssueTest.java     |   2 +-
 .../org/apache/camel/issues/ExceptionTest.java     |   4 +-
 ...tionThrownFromOnExceptionNoEndlessLoopTest.java |  11 +-
 .../issues/ExceptionThrownFromOnExceptionTest.java |  29 ++--
 .../camel/issues/FilePollingConsumerIssueTest.java |   9 +-
 .../issues/FileSplitStreamingWithChoiceTest.java   |   6 +-
 .../issues/FilterCustomPredicateAsFilterTest.java  |   4 +-
 .../org/apache/camel/issues/GertJBIIssueTest.java  |   6 +-
 .../InterceptCustomPredicateAsFilterTest.java      |   3 +-
 .../apache/camel/issues/InterceptFromLogTest.java  |   2 +-
 .../InterceptFromPredicateProceedAndStopTest.java  |   2 +-
 .../java/org/apache/camel/issues/Issue170Test.java |   2 +-
 .../java/org/apache/camel/issues/Issue3Test.java   |  10 +-
 .../camel/issues/MethodClassByTypeIssueTest.java   |   2 +-
 .../MockExpectedHeaderNoMessageSentTest.java       |   5 +-
 .../camel/issues/MockExpectedHeadersIssueTest.java |   2 +-
 .../camel/issues/MockValueBuilderIssueTest.java    |   5 +-
 ...ticastAggregationStrategyInputExchangeTest.java |   5 +-
 ...icastAggregationStrategyThrowExceptionTest.java |   2 +-
 ...essageBodyAndEnrichedHeadersClaimCheckTest.java |   2 +-
 ...xOriginalMessageBodyAndEnrichedHeadersTest.java |   2 +-
 ...eBodyAndEnrichedHeadersUseOriginalBodyTest.java |   2 +-
 ...lelStopOnExceptionWithOnExceptionIssueTest.java |   4 +-
 ...thAggregationStrategyThrowingExceptionTest.java |   2 +-
 .../MulticastPipelineAggregateIssueTest.java       |   2 +-
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   5 +-
 .../issues/MulticastSingleAggregateIssueTest.java  |   2 +-
 ...astStopOnExceptionWithOnExceptionIssueTest.java |   4 +-
 .../issues/MulticastWithOnExceptionIssueTest.java  |   4 +-
 .../MultipleErrorHandlerOnExceptionIssueTest.java  |   2 +-
 .../org/apache/camel/issues/MultipleFromTest.java  |   2 +-
 .../org/apache/camel/issues/NeilSplitterTest.java  |   6 +-
 ...derExactlyDoneSplitterWhereSentToIssueTest.java |   4 +-
 ...tifyBuilderOnFailureShutdownCamelIssueTest.java |   4 +-
 .../apache/camel/issues/OnCompletionIssueTest.java |   5 +-
 .../OnExceptionBeforeErrorHandlerIssueTest.java    |   2 +-
 .../issues/OnExceptionContinuedIssueTest.java      |   2 +-
 ...OnExceptionContinuedNoFailureProcessorTest.java |   2 +-
 ...tionErrorHandlerNoRouteOnExchangeIssueTest.java |   4 +-
 .../OnExceptionErrorHandlerRefIssueTest.java       |   2 +-
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |   2 +-
 .../OnExceptionHandledNoFailureProcessorTest.java  |   2 +-
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |   5 +-
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   5 +-
 ...nExceptionNotHandledNoFailureProcessorTest.java |   2 +-
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   5 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   5 +-
 .../camel/issues/OnExceptionProcessIssueTest.java  |   5 +-
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   2 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   2 +-
 .../camel/issues/OnExceptionWithTwoBeansTest.java  |   2 +-
 .../issues/PropertiesAvailableEverywhereTest.java  |   2 +-
 .../camel/issues/ProxyReturnNullIssueTest.java     |   4 +-
 ...ntListAggregationStrategyInputExchangeTest.java |   5 +-
 .../RecipientListDirectNoConsumerIssueTest.java    |   2 +-
 .../RecipientListErrorHandlingIssueTest.java       |   2 +-
 ...thAggregationStrategyThrowingExceptionTest.java |   2 +-
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   5 +-
 ...eOriginalMessageEndpointExceptionIssueTest.java |   6 +-
 .../RecipientListUseOriginalMessageIssueTest.java  |   8 +-
 .../issues/RecipientListWithInterceptorTest.java   |   8 +-
 ...andlerAsyncDelayedTwoCamelContextIssueTest.java |  14 +-
 ...olicyOnExceptionWhileRedeliveringIssueTest.java |   2 +-
 .../camel/issues/RegExPredicateIssueTest.java      |   2 +-
 ...etryRouteScopedUntilRecipientListIssueTest.java |   5 +-
 .../RetryWhilePredicateExpressionIssueTest.java    |   3 +-
 .../RetryWhileSimpleExpressionIssueTest.java       |   4 +-
 .../apache/camel/issues/RomeksExceptionTest.java   |   7 +-
 .../issues/RouteIdAnonymousAndFixedClashTest.java  |   9 +-
 .../camel/issues/RouteIdAutoAssignClashIssue.java  |   3 +
 .../RouteScopedErrorHandlerAndOnExceptionTest.java |   5 +-
 ...ScopedOnExceptionMultipleRouteBuildersTest.java |   2 +-
 ...eptionWithInterceptSendToEndpointIssueTest.java |   5 +-
 ...erceptSendToEndpointIssueWithPredicateTest.java |   4 +-
 .../RouteStartupFailShouldStopAlsoIssueTest.java   |   4 +-
 .../apache/camel/issues/RouteWithCustomIdTest.java |   4 +-
 .../camel/issues/RoutingSlipMemoryLeakTest.java    |   8 +-
 .../issues/RoutingSlipNotStopErrorHandlerTest.java |   2 +-
 .../issues/RoutingSlipWithInterceptorTest.java     |   8 +-
 ...RouteAndContextScopedErrorHandlerIssueTest.java |   4 +-
 .../camel/issues/SedaFileIdempotentIssueTest.java  |  13 +-
 .../issues/SentExchangeEventNotifierIssueTest.java |   4 +-
 .../SentExchangeEventNotifierTwoIssueTest.java     |   4 +-
 .../camel/issues/SetBodyTryCatchIssueTest.java     |   4 +-
 .../camel/issues/SetHeaderInDoCatchIssueTest.java  |   4 +-
 .../camel/issues/SplitContinuedLogIssueTest.java   |   4 +-
 .../camel/issues/SplitListListIssueTest.java       |   4 +-
 .../camel/issues/SplitPropertiesFileIssueTest.java |   6 +-
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   5 +-
 .../issues/SplitStopOnExceptionIssueTest.java      |   4 +-
 .../SplitWithCustomAggregationStrategyTest.java    |   2 +-
 .../camel/issues/SplitWithInterceptorTest.java     |   8 +-
 ...litterAggregationStrategyInputExchangeTest.java |   5 +-
 .../issues/SplitterCorrelationIdIssueTest.java     |   5 +-
 .../camel/issues/SplitterParallelIssueTest.java    |   2 +-
 ...arallelRuntimeExceptionInHasNextOrNextTest.java |   4 +-
 ...thAggregationStrategyThrowingExceptionTest.java |   2 +-
 ...rParallelWithIteratorThrowingExceptionTest.java |   5 +-
 .../SplitterThrowExceptionInExpressionTest.java    |   2 +-
 .../SplitterThrowExceptionInExpressionTwoTest.java |   2 +-
 ...terUsingBeanReturningCloseableIteratorTest.java |   7 +-
 .../SplitterUsingBeanReturningMessageTest.java     |   4 +-
 .../camel/issues/StopCamelFromRouteTest.java       |   7 +-
 .../camel/issues/StopRouteFromRouteTest.java       |  15 +-
 .../issues/StopRouteImpactsErrorHandlerTest.java   |   2 +-
 ...dNotStopContextScopedErrorHandlerIssueTest.java |   2 +-
 ...uldNotStopRouteScopedErrorHandlerIssueTest.java |   2 +-
 ...ryCatchInterceptSendToAllEndpointIssueTest.java |   2 +-
 ...ThreadsRejectedExecutionWithDeadLetterTest.java |   2 +-
 .../issues/TimerAndErrorHandlerIssueTest.java      |   2 +-
 .../TransactedPropertyPlaceholderIssueTest.java    |   2 +-
 .../TryCatchFinallyOnExceptionIssueTest.java       |   2 +-
 .../camel/issues/TryCatchSetHeaderIssueTest.java   |   2 +-
 .../camel/issues/TryCatchWithSplitIssueTest.java   |   2 +-
 ...erceptSendToEndpointIssueWithPredicateTest.java |   4 +-
 .../apache/camel/issues/TwoTimerWithJMXIssue.java  |   7 +-
 .../issues/TypeConverterConcurrencyIssueTest.java  |   7 +-
 .../apache/camel/issues/XPathSplitStreamTest.java  |   6 +-
 .../language/BeanAnnotationParameterTest.java      |   2 +-
 .../language/BeanAnnotationParameterTwoTest.java   |   2 +-
 .../language/BeanLanguageInvalidOGNLTest.java      |   5 +-
 .../BeanLanguageMethodMissingParenthesisTest.java  |   5 +-
 .../camel/language/BeanLanguageOGNLTest.java       |   4 +-
 ...LWithDotInParameterPropertyPlaceholderTest.java |   2 +-
 .../BeanLanguageOGNLWithDotInParameterTest.java    |   2 +-
 .../java/org/apache/camel/language/BeanTest.java   |   4 +-
 .../ConstantLanguageBinaryResourceTest.java        |   5 +-
 .../org/apache/camel/language/ConstantTest.java    |   2 +-
 .../camel/language/FileLanguageExtSingleTest.java  |   2 +-
 .../apache/camel/language/FileLanguageTest.java    |   4 +-
 .../java/org/apache/camel/language/HeaderTest.java |   4 +-
 .../apache/camel/language/LanguageServiceTest.java |   4 +-
 .../apache/camel/language/NoSuchLanguageTest.java  |   5 +-
 .../PropertyInjectAnnotationParameterTest.java     |   2 +-
 .../org/apache/camel/language/PropertyTest.java    |   4 +-
 .../apache/camel/language/RefPredicateTest.java    |   2 +-
 .../java/org/apache/camel/language/RefTest.java    |   5 +-
 .../camel/language/SimpleLanguageRouteTest.java    |   2 +-
 .../SimpleLanguageTransformRandomTest.java         |   4 +-
 .../camel/language/SimpleOgnlMapIssueTest.java     |   2 +-
 ...okenPairIteratorSplitChoicePerformanceTest.java |  23 +--
 .../camel/language/TokenPairPredicateTest.java     |  13 +-
 .../TokenXMLPairMultiNamespaceSplitTest.java       |   6 +-
 .../TokenXMLPairNamespaceMultilineSplitTest.java   |   2 +-
 ...kenXMLPairNamespaceSplitChildNamespaceTest.java |   6 +-
 .../language/TokenXMLPairNamespaceSplitTest.java   |   6 +-
 .../org/apache/camel/language/TokenizerTest.java   |   5 +-
 .../apache/camel/language/XMLTokenSplitTest.java   |   6 +-
 .../language/XPathAnotherRouteConcurrentTest.java  |   2 +-
 .../camel/language/XPathFromFileExceptionTest.java |  17 ++-
 .../apache/camel/language/XPathFunctionTest.java   |   9 +-
 .../language/XPathLanguageSingleNodeListTest.java  |   5 +-
 .../apache/camel/language/XPathResourceTest.java   |   2 +-
 .../language/XPathRouteConcurrentBigTest.java      |   2 +-
 .../camel/language/XPathRouteConcurrentTest.java   |   2 +-
 .../language/XPathSplitChoicePerformanceTest.java  |  23 +--
 .../java/org/apache/camel/language/XPathTest.java  |   4 +-
 .../simple/SimpleBackwardsCompatibleTest.java      |   8 +-
 .../camel/language/simple/SimpleDecHeaderTest.java |   2 +-
 .../camel/language/simple/SimpleIncHeaderTest.java |   2 +-
 .../SimpleMessageHistoryNotDetailedTest.java       |   4 +-
 .../language/simple/SimpleMessageHistoryTest.java  |   5 +-
 .../camel/language/simple/SimpleOperatorTest.java  |   5 +-
 .../language/simple/SimpleOverrideMethodTest.java  |   2 +-
 .../simple/SimpleParserExpressionInvalidTest.java  |   5 +-
 .../simple/SimpleParserExpressionTest.java         |   5 +-
 .../simple/SimpleParserPredicateInvalidTest.java   |   5 +-
 .../language/simple/SimpleParserPredicateTest.java |  55 ++++----
 .../simple/SimpleParserRegexpPredicateTest.java    |   5 +-
 .../language/simple/SimpleResourceDynamicTest.java |   2 +-
 .../camel/language/simple/SimpleResourceTest.java  |   2 +-
 .../SimpleRouteExpressionAsPredicateTest.java      |   2 +-
 .../simple/SimpleSetHeaderPredicateTest.java       |   2 +-
 .../apache/camel/language/simple/SimpleTest.java   |  16 ++-
 .../language/simple/SimpleWhiteSpaceTest.java      |   2 +-
 .../language/tokenizer/TokenizeLanguageTest.java   |   2 +-
 .../tokenizer/TokenizeWrapLanguageTest.java        |   2 +-
 .../tokenizer/XMLTokenizeLanguageGroupingTest.java |   2 +-
 .../XMLTokenizeLanguageStreamingFileTest.java      |   6 +-
 .../tokenizer/XMLTokenizeLanguageTest.java         |   2 +-
 .../XMLTokenizeWrapLanguageGroupingTest.java       |   2 +-
 .../tokenizer/XMLTokenizeWrapLanguageTest.java     |   2 +-
 .../apache/camel/model/ChoiceDefinitionTest.java   |   4 +-
 .../model/GatherAllStaticEndpointUrisTest.java     |   5 +-
 .../model/GenerateXmFromCamelContextTest.java      |   8 +-
 .../org/apache/camel/model/GenerateXmlTest.java    |   8 +-
 .../camel/model/GlobalOptionsDefinitionTest.java   |  36 ++---
 .../apache/camel/model/LoadRestFromXmlTest.java    |   9 +-
 .../apache/camel/model/LoadRouteFromXmlTest.java   |   9 +-
 .../model/LoadRouteFromXmlWithInterceptTest.java   |   7 +-
 .../model/LoadRouteFromXmlWithNamespaceTest.java   |   6 +-
 .../model/LoadRouteFromXmlWithOnExceptionTest.java |   7 +-
 .../model/LoadRouteFromXmlWithPolicyTest.java      |  11 +-
 .../model/ModelRouteFilterPatternExcludeTest.java  |   4 +-
 .../ModelRouteFilterPatternIncludeExcludeTest.java |   4 +-
 .../model/ModelRouteFilterPatternIncludeTest.java  |   4 +-
 .../apache/camel/model/ModelSanityCheckerTest.java |  21 +--
 .../camel/model/OnFallbackDefinitionTest.java      |   4 +-
 .../camel/model/ProcessDefinitionSetBodyTest.java  |   2 +-
 .../camel/model/ProcessorDefinitionHelperTest.java |   4 +-
 .../model/ProcessorTypeConfigurationTest.java      |   5 +-
 .../org/apache/camel/model/RouteGroupTest.java     |   4 +-
 .../apache/camel/model/RoutePropertiesTest.java    |   4 +-
 .../model/StartingRoutesErrorReportedTest.java     |   5 +-
 .../java/org/apache/camel/model/XmlParseTest.java  |  49 ++++---
 .../org/apache/camel/model/XmlRestParseTest.java   |   4 +-
 .../apache/camel/model/XmlRestParseToDTest.java    |   4 +-
 .../org/apache/camel/model/XmlRouteGroupTest.java  |   4 +-
 .../apache/camel/model/XmlRoutePropertiesTest.java |   6 +-
 .../org/apache/camel/model/XmlTestSupport.java     |   6 +-
 .../model/dataformat/Any23DataFormatTest.java      |   2 +-
 .../apache/camel/processor/AsyncLoopCopyTest.java  |   7 +-
 .../org/apache/camel/processor/AsyncLoopTest.java  |   8 +-
 .../BatchResequencerAllowDuplicatesTest.java       |   2 +-
 .../processor/BatchResequencerJMSPriorityTest.java |   2 +-
 .../BatchResequencerWithDuplicateTest.java         |   2 +-
 .../camel/processor/BeanCachedProcessorTest.java   |   7 +-
 .../org/apache/camel/processor/BeanCachedTest.java |   7 +-
 .../BeanInvocationThrowsExceptionTest.java         |  10 +-
 .../BeanOgnMethodWithXPathInjectionTest.java       |  16 ++-
 .../BeanProcessorSpecializedMessageTest.java       |   2 +-
 .../camel/processor/BeanRecipientListTest.java     |  10 +-
 .../processor/BeanRecipientListTimeoutTest.java    |   5 +-
 .../org/apache/camel/processor/BeanRouteTest.java  |  14 +-
 .../apache/camel/processor/BeanSingletonTest.java  |   7 +-
 .../camel/processor/BeanWithExceptionTest.java     |   9 +-
 .../processor/BeanWithXPathInjectionTest.java      |  16 ++-
 .../camel/processor/BreadcrumbDisabledTest.java    |   6 +-
 .../org/apache/camel/processor/BreadcrumbTest.java |   2 +
 .../camel/processor/CBRHeaderPredicateTest.java    |   2 +-
 .../CBRPredicateBeanThrowExceptionTest.java        |   5 +-
 .../processor/CBRSimplePredicateEmptyBodyTest.java |   2 +-
 .../apache/camel/processor/CBRSimpleTypeTest.java  |   2 +-
 .../camel/processor/CBRWithLoadBalancerTest.java   |   2 +-
 .../camel/processor/CBRWithMulticastTest.java      |   2 +-
 .../camel/processor/CBRWithRecipientListTest.java  |   2 +-
 .../apache/camel/processor/CBRWithWireTapTest.java |   2 +-
 .../processor/Camel715ThreadProcessorTest.java     |   8 +-
 .../CamelCaseInsentiveHeadersFalseTest.java        |   2 +-
 .../CamelCaseInsentiveHeadersTrueTest.java         |   2 +-
 .../CamelContextLogExhaustedMessageBodyTest.java   |   4 +-
 .../org/apache/camel/processor/ChannelTest.java    |   2 +-
 .../apache/camel/processor/ChoiceAsyncTest.java    |   6 +-
 .../processor/ChoiceCompoundPredicateTest.java     |   2 +-
 .../apache/camel/processor/ChoiceNoActionTest.java |   2 +-
 .../camel/processor/ChoiceNoErrorHandlerTest.java  |   4 +-
 .../org/apache/camel/processor/ChoiceTest.java     |   6 +-
 .../processor/ChoiceWhenBeanExpressionTest.java    |   6 +-
 .../ChoiceWhenBeanExpressionWithExceptionTest.java |   8 +-
 .../processor/ChoiceWhenNotPredicateTest.java      |   2 +-
 .../apache/camel/processor/ChoiceWithEndTest.java  |   4 +-
 .../camel/processor/ChoiceWithTranfromTest.java    |   4 +-
 .../ClaimCheckEipDynamicKeyGetSetTest.java         |   2 +-
 .../ClaimCheckEipGetAndRemoveSetTest.java          |   2 +-
 .../camel/processor/ClaimCheckEipGetSetTest.java   |   2 +-
 .../processor/ClaimCheckEipPushPopBodyTest.java    |   2 +-
 .../ClaimCheckEipPushPopExcludeBodyTest.java       |   2 +-
 .../ClaimCheckEipPushPopHeadersPatternTest.java    |   2 +-
 .../processor/ClaimCheckEipPushPopHeadersTest.java |   2 +-
 .../ClaimCheckEipPushPopRemoveHeaderTest.java      |   2 +-
 .../camel/processor/ClaimCheckEipPushPopTest.java  |   2 +-
 .../org/apache/camel/processor/ClaimCheckTest.java |   2 +-
 .../processor/ComposedMessageProcessorTest.java    |   4 +-
 .../camel/processor/ConsumerRouteIdAwareTest.java  |   2 +-
 .../apache/camel/processor/ConvertBodyTest.java    |   8 +-
 .../apache/camel/processor/CorrectRouteIdTest.java |   2 +-
 .../CreateRouteWithNonExistingEndpointTest.java    |  11 +-
 .../CustomConsumerExceptionHandlerTest.java        |   6 +-
 .../camel/processor/CustomLoadBalanceTest.java     |   6 +-
 .../processor/CustomProcessorFactoryTest.java      |   2 +-
 .../camel/processor/CustomRoutePolicyTest.java     |   6 +-
 .../processor/CustomScheduledRoutePolicyTest.java  |   2 +-
 .../camel/processor/DataFormatServiceTest.java     |   5 +-
 .../DeadLetterChannelAlwaysHandledTest.java        |   6 +-
 ...ChannelBuilderWithInvalidDeadLetterUriTest.java |   4 +-
 .../DeadLetterChannelCatchThrowableTest.java       |   2 +-
 ...dLetterChannelExceptionCausePropagatedTest.java |   4 +-
 .../DeadLetterChannelFailureRouteIdTest.java       |   2 +-
 .../DeadLetterChannelHandleNewExceptionTest.java   |   2 +-
 .../DeadLetterChannelHandledExampleTest.java       |   4 +-
 ...etterChannelLogExhaustedMessageHistoryTest.java |   2 +-
 ...nnelLogExhaustedMessageHistoryWithBodyTest.java |   2 +-
 .../DeadLetterChannelNewExceptionTest.java         |   2 +-
 .../DeadLetterChannelNoRedeliveryTest.java         |   6 +-
 ...DeadLetterChannelNotHandleNewExceptionTest.java |   5 +-
 ...adLetterChannelOnExceptionOnRedeliveryTest.java |   6 +-
 .../processor/DeadLetterChannelOnPrepareTest.java  |   2 +-
 .../DeadLetterChannelOnRedeliveryTest.java         |   8 +-
 ...dLetterChannelPropagateCausedExceptionTest.java |   5 +-
 ...etterChannelRedeliverWithDelayBlockingTest.java |   2 +-
 ...LetterChannelRedeliveringWhileShutdownTest.java |   2 +-
 ...eadLetterChannelRedeliveryDelayPatternTest.java |   7 +-
 .../processor/DeadLetterChannelRedeliveryTest.java |  22 ++-
 .../DeadLetterChannelRestartFromBeginningTest.java |   2 +-
 .../processor/DeadLetterChannelSetHeaderTest.java  |   2 +-
 .../camel/processor/DeadLetterChannelTest.java     |  18 ++-
 .../DeadLetterChannelUnmarshalSetHeaderTest.java   |   2 +-
 .../DeadLetterChannelUseOriginalInBodyTest.java    |   4 +-
 ...LetterChannelUseOriginalInBodyWithFileTest.java |   8 +-
 ...tConsumerBridgeErrorHandlerOnExceptionTest.java |   5 +-
 ...ltConsumerBridgeErrorHandlerRedeliveryTest.java |   5 +-
 .../DefaultConsumerBridgeErrorHandlerTest.java     |   5 +-
 .../DefaultErrorHandlerCatchThrowableTest.java     |   5 +-
 .../DefaultErrorHandlerFailureRouteIdTest.java     |   4 +-
 ...ErrorHandlerLogExhaustedMessageHistoryTest.java |   4 +-
 .../DefaultErrorHandlerLogStackTraceTest.java      |   4 +-
 .../DefaultErrorHandlerOnExceptionTest.java        |   2 +-
 .../DefaultErrorHandlerOnPrepareTest.java          |   6 +-
 .../DefaultErrorHandlerRedeliveryTest.java         |  14 +-
 .../camel/processor/DefaultErrorHandlerTest.java   |   7 +-
 ...cheduledPollConsumerBridgeErrorHandlerTest.java |   5 +-
 .../DefinitionPolicyPerProcessorTest.java          |   6 +-
 .../camel/processor/DelayInterceptorTest.java      |   8 +-
 .../camel/processor/DelayerAsyncDelayedTest.java   |   2 +-
 .../camel/processor/DelayerPerRouteTest.java       |   2 +-
 .../org/apache/camel/processor/DelayerTest.java    |   2 +-
 .../camel/processor/DelayerWhileShutdownTest.java  |   2 +-
 .../org/apache/camel/processor/DetourTest.java     |   2 +-
 .../processor/DoTryCatchWithSplitterTest.java      |   2 +-
 .../DoubleLoadBalancerMisconfigurationTest.java    |   5 +-
 .../apache/camel/processor/DualPipelineTest.java   |   4 +-
 .../apache/camel/processor/DynamicRouter2Test.java |   2 +-
 .../apache/camel/processor/DynamicRouter3Test.java |   2 +-
 .../apache/camel/processor/DynamicRouter4Test.java |   2 +-
 .../processor/DynamicRouterAnnotationTest.java     |   4 +-
 .../DynamicRouterExchangeHeaders2Test.java         |   4 +-
 .../DynamicRouterExchangeHeadersTest.java          |   4 +-
 .../DynamicRouterExchangePropertiesTest.java       |   4 +-
 .../camel/processor/DynamicRouterNoCacheTest.java  |   5 +-
 .../processor/DynamicRouterOnExceptionTest.java    |   2 +-
 .../apache/camel/processor/DynamicRouterTest.java  |   4 +-
 ...amicRouterThrowExceptionFromExpressionTest.java |   2 +-
 ...point2MustBeStartedBeforeSendProcessorTest.java |   4 +-
 ...dpointMustBeStartedBeforeSendProcessorTest.java |   4 +-
 .../apache/camel/processor/EnrichNoCacheTest.java  |   5 +-
 .../camel/processor/EnrichSubUnitOfWorkTest.java   |   7 +-
 ...HandlerOnExceptionRedeliveryAndHandledTest.java |   5 +-
 .../apache/camel/processor/ErrorHandlerTest.java   |   2 +-
 .../processor/ErrorHandlerWrappedEachNodeTest.java |   4 +-
 .../processor/EvaluateExpressionProcessorTest.java |   5 +-
 .../EventNotifierExchangeSentExampleTest.java      |   2 +-
 .../processor/EventNotifierExchangeSentTest.java   |   4 +-
 .../processor/ExceptionHandlerStreamCacheTest.java |  12 +-
 .../processor/ExchangeCreatedTimestampTest.java    |   4 +-
 .../processor/ExchangeIdempotentConsumerTest.java  |  11 +-
 .../processor/FailOverAllFailedExceptionTest.java  |   9 +-
 .../FailOverLoadBalanceAutoStartupFalseTest.java   |   2 +-
 .../FailOverLoadBalanceMultipleExceptionTest.java  |   6 +-
 ...verLoadBalanceNotInheritedErrorHandlerTest.java |   2 +-
 .../camel/processor/FailOverLoadBalanceTest.java   |  11 +-
 .../FailOverLoadBalanceWithRedeliveryTest.java     |   2 +-
 ...lOverLoadBalanceWrappedExceptionNoLuckTest.java |   9 +-
 .../FailOverLoadBalanceWrappedExceptionTest.java   |   6 +-
 .../FailOverLoadBalancerSetFaultTest.java          |   4 +-
 .../processor/FailOverNotCatchedExceptionTest.java |   9 +-
 ...overLoadBalancerBreakoutDuringShutdownTest.java |   6 +-
 .../FailoverMaximumFailoverAttemptsTest.java       |   5 +-
 .../processor/FailoverRoundRobinGoodBadTest.java   |   2 +-
 .../processor/FailoverRoundRobinStickyTest.java    |   2 +-
 .../camel/processor/FailoverRoundRobinTest.java    |   2 +-
 .../apache/camel/processor/FailoverStickyTest.java |   2 +-
 .../camel/processor/FileIdempotentClearTest.java   |   8 +-
 .../FileIdempotentConsumerCreateRepoTest.java      |  10 +-
 .../FileIdempotentConsumerLoadStoreTest.java       |   9 +-
 .../processor/FileIdempotentConsumerTest.java      |   9 +-
 .../camel/processor/FileIdempotentRemoveTest.java  |   8 +-
 .../processor/FileIdempotentTrunkStoreTest.java    |  12 +-
 .../processor/FileRollbackOnCompletionTest.java    |  14 +-
 .../camel/processor/FilterBeforeSplitTest.java     |   2 +-
 .../camel/processor/FilterNotMatchedTest.java      |   2 +-
 .../org/apache/camel/processor/FilterNotTest.java  |   2 +-
 .../org/apache/camel/processor/FilterTest.java     |   2 +-
 .../camel/processor/FlipRoutePolicyTest.java       |   2 +-
 .../apache/camel/processor/FromToInOutTest.java    |   4 +-
 .../camel/processor/FromToInOutUsingToTest.java    |   4 +-
 .../camel/processor/GenericXmlTokenizeTest.java    |   2 +-
 .../processor/IdempotentConsumerAsyncTest.java     |   6 +-
 .../IdempotentConsumerCompletionEagerTest.java     |   6 +-
 .../IdempotentConsumerConcurrentTest.java          |  10 +-
 .../camel/processor/IdempotentConsumerDslTest.java |   2 +-
 .../processor/IdempotentConsumerEagerTest.java     |  13 +-
 .../IdempotentConsumerNoMessageIdTest.java         |   6 +-
 .../IdempotentConsumerRemoveOnFailureTest.java     |   6 +-
 .../IdempotentConsumerRepoExceptionTest.java       |   2 +-
 .../camel/processor/IdempotentConsumerTest.java    |   6 +-
 ...dempotentConsumerUsingCustomRepositoryTest.java |   9 +-
 .../processor/InheritErrorHandlerDefaultTest.java  |   4 +-
 .../processor/InheritErrorHandlerFalseTest.java    |   5 +-
 .../processor/InheritErrorHandlerTrueTest.java     |   4 +-
 .../camel/processor/InlinedProcessorIdTest.java    |   4 +-
 .../org/apache/camel/processor/JoinRoutesTest.java |   6 +-
 .../camel/processor/LanguageBuilderTest.java       |   2 +-
 .../apache/camel/processor/LogEipListenerTest.java |   9 +-
 .../org/apache/camel/processor/LogEipMaskTest.java |   7 +-
 .../processor/LogEipPropagateExceptionTest.java    |   2 +-
 .../apache/camel/processor/LogProcessorTest.java   |   2 +-
 .../LogProcessorWithProvidedLoggerTest.java        |  11 +-
 .../apache/camel/processor/LoopAsyncCopyTest.java  |   2 +-
 .../camel/processor/LoopAsyncNoCopyTest.java       |   2 +-
 .../apache/camel/processor/LoopCopyErrorTest.java  |   5 +-
 .../org/apache/camel/processor/LoopCopyTest.java   |   2 +-
 .../apache/camel/processor/LoopDoWhileTest.java    |   2 +-
 .../apache/camel/processor/LoopExceptionTest.java  |   2 +-
 .../org/apache/camel/processor/LoopNoCopyTest.java |   2 +-
 .../java/org/apache/camel/processor/LoopTest.java  |   8 +-
 .../camel/processor/LoopWithAggregatorTest.java    |   2 +-
 .../org/apache/camel/processor/MDCAsyncTest.java   |   6 +-
 .../processor/MDCOnCompletionOnCompletionTest.java |   4 +-
 .../camel/processor/MDCOnCompletionTest.java       |   4 +-
 .../org/apache/camel/processor/MDCResetTest.java   |   4 +-
 .../java/org/apache/camel/processor/MDCTest.java   |   4 +-
 .../org/apache/camel/processor/MDCWireTapTest.java |   5 +-
 .../camel/processor/MDCWithBreadcrumbTest.java     |   2 +
 .../camel/processor/MarkRollbackOnlyTest.java      |   4 +-
 .../processor/MessageHistoryCopyExchangeTest.java  |   4 +-
 .../processor/MessageHistoryCopyMessageTest.java   |   5 +-
 .../processor/MessageHistoryDumpRoutingTest.java   |   2 +-
 .../processor/MessageHistoryStepOnlyTest.java      |   5 +-
 .../apache/camel/processor/MethodFilterTest.java   |   2 +-
 .../MultiCastParallelAndStreamCachingTest.java     |   2 +-
 .../MultiCastStreamCachingInSubRouteTest.java      |   2 +-
 .../MultiErrorHandlerInRouteNotHandledTest.java    |   2 +-
 .../processor/MultiErrorHandlerInRouteTest.java    |   2 +-
 .../processor/MulticastCompletedPropertyTest.java  |   2 +-
 .../MulticastCopyOfSplitSubUnitOfWorkTest.java     |   7 +-
 .../apache/camel/processor/MulticastDslTest.java   |   2 +-
 .../MulticastFineGrainedErrorHandlingTest.java     |   4 +-
 .../MulticastGroupedExchangeExceptionTest.java     |   9 +-
 .../MulticastKeepOriginalMessageUnchangedTest.java |   2 +-
 .../camel/processor/MulticastNoOnPrepareTest.java  |   4 +-
 .../processor/MulticastNoStopOnExceptionTest.java  |   5 +-
 .../camel/processor/MulticastOnPrepareTest.java    |   4 +-
 .../MulticastParallelAllTimeoutAwareTest.java      |   5 +-
 .../MulticastParallelFailureEndpointTest.java      |   5 +-
 ...ticastParallelFineGrainedErrorHandlingTest.java |   4 +-
 .../MulticastParallelLastTimeoutTest.java          |   2 +-
 .../MulticastParallelMiddleTimeoutTest.java        |   2 +-
 .../MulticastParallelNoStopOnExceptionTest.java    |  13 +-
 .../MulticastParallelStopOnExceptionTest.java      |  12 +-
 .../processor/MulticastParallelStreamingTest.java  |   4 +-
 .../MulticastParallelStreamingTimeoutTest.java     |   2 +-
 .../MulticastParallelStreamingTwoTimeoutTest.java  |   2 +-
 .../processor/MulticastParallelStressTest.java     |   2 +-
 .../camel/processor/MulticastParallelTest.java     |   4 +-
 .../processor/MulticastParallelTimeout2Test.java   |   2 +-
 .../processor/MulticastParallelTimeout3Test.java   |   2 +-
 .../MulticastParallelTimeoutAwareTest.java         |   5 +-
 .../processor/MulticastParallelTimeoutTest.java    |   2 +-
 .../MulticastParallelTwoTimeoutMiddleTest.java     |   2 +-
 .../processor/MulticastParallelTwoTimeoutTest.java |   2 +-
 .../camel/processor/MulticastPipelineTest.java     |   2 +-
 .../camel/processor/MulticastRedeliverTest.java    |  14 +-
 ...castStopOnExceptionLastWithOnExceptionTest.java |   4 +-
 .../processor/MulticastStopOnExceptionTest.java    |   4 +-
 ...ulticastStopOnExceptionWithOnExceptionTest.java |   4 +-
 .../processor/MulticastStreamCachingTest.java      |   6 +-
 .../processor/MulticastSubUnitOfWorkTest.java      |   7 +-
 .../org/apache/camel/processor/MulticastTest.java  |   6 +-
 .../camel/processor/MulticastUnitOfWorkTest.java   |   7 +-
 .../processor/MulticastWithOnExceptionTest.java    |   4 +-
 .../apache/camel/processor/NavigateRouteTest.java  |   6 +-
 .../camel/processor/NestedChoiceIssueTest.java     |   2 +-
 .../processor/NewProcessorAndServiceTest.java      |   7 +-
 .../org/apache/camel/processor/NormalizerTest.java |   2 +-
 ...deliveryWhileStoppingDeadLetterChannelTest.java |   6 +-
 .../NotAllowRedeliveryWhileStoppingTest.java       |   6 +-
 ...letionAndInterceptAndOnExceptionGlobalTest.java |   5 +-
 .../OnCompletionAndInterceptGlobalTest.java        |   5 +-
 .../processor/OnCompletionAndInterceptTest.java    |   5 +-
 .../camel/processor/OnCompletionAsyncTest.java     |   5 +-
 .../camel/processor/OnCompletionContainsTest.java  |   2 +-
 .../OnCompletionGlobalCustomPoolTest.java          |   8 +-
 .../camel/processor/OnCompletionGlobalTest.java    |   5 +-
 .../OnCompletionInvalidConfiguredTest.java         |   5 +-
 .../camel/processor/OnCompletionModeTest.java      |   4 +-
 .../OnCompletionMoreGlobalRouteCompletionTest.java |   5 +-
 .../processor/OnCompletionMoreGlobalTest.java      |   5 +-
 .../processor/OnCompletionOnCompleteOnlyTest.java  |   5 +-
 .../processor/OnCompletionOnFailureOnlyTest.java   |   2 +-
 .../OnCompletionParallelProcessingTest.java        |   4 +-
 ...ompletionRouteScopeOverrideGlobalScopeTest.java |   5 +-
 .../processor/OnCompletionShouldBeLastTest.java    |   2 +-
 .../OnCompletionShutdownProcessorTest.java         |   4 +-
 .../apache/camel/processor/OnCompletionTest.java   |   5 +-
 .../processor/OnCompletionUseOriginalBodyTest.java |   4 +-
 .../camel/processor/OnCompletionWhenTest.java      |   2 +-
 .../processor/OnExceptionContinueToRouteTest.java  |   2 +-
 .../camel/processor/PipelineConcurrentTest.java    |   2 +-
 .../apache/camel/processor/PipelineMEPTest.java    |   5 +-
 .../camel/processor/PipelineStepWithEventTest.java |   9 +-
 .../org/apache/camel/processor/PipelineTest.java   |  10 +-
 .../camel/processor/PolicyPerProcessorTest.java    |   8 +-
 .../apache/camel/processor/PolicyPerRouteTest.java |   6 +-
 .../camel/processor/PollEnrichNoCacheTest.java     |   5 +-
 .../ProcessorMutateExchangeRedeliverTest.java      |  14 +-
 .../ProducerTemplateDisableEventNotifierTest.java  |   4 +-
 .../RandomLoadBalanceJavaDSLBuilderTest.java       |   4 +-
 .../camel/processor/RandomLoadBalanceTest.java     |   6 +-
 .../RecipientListAggregationStrategyTest.java      |   2 +-
 .../processor/RecipientListBeanOnPrepareTest.java  |   4 +-
 .../RecipientListBeanSubUnitOfWorkTest.java        |   7 +-
 .../camel/processor/RecipientListBeanTest.java     |   4 +-
 ...pientListContextScopedOnExceptionIssueTest.java |   4 +-
 .../RecipientListDoNotStopOnExceptionTest.java     |   5 +-
 ...istExchangePropertyAggregationStrategyTest.java |   4 +-
 .../RecipientListExchangePropertyTest.java         |   6 +-
 .../RecipientListFineGrainedErrorHandlingTest.java |   5 +-
 .../processor/RecipientListFunctionalTest.java     |   2 +-
 .../RecipientListIgnoreInvalidEndpointsTest.java   |   8 +-
 ...cipientListInvalidEndpointErrorHandlerTest.java |   2 +-
 ...tInvalidEndpointIgnoreInvalidEndpointsTest.java |   2 +-
 .../camel/processor/RecipientListLeakTest.java     |   2 +-
 .../camel/processor/RecipientListMEPTest.java      |   4 +-
 .../processor/RecipientListMEPWithRawTest.java     |   2 +-
 .../camel/processor/RecipientListNoCacheTest.java  |   4 +-
 .../processor/RecipientListNoErrorHandlerTest.java |   2 +-
 .../processor/RecipientListOnPrepareTest.java      |   4 +-
 ...ntListParallelAggregateThreadPoolIssueTest.java |   6 +-
 ...ntListParallelFineGrainedErrorHandlingTest.java |   5 +-
 ...ParallelStopOnExceptionWithOnExceptionTest.java |   4 +-
 .../RecipientListParallelStreamingTest.java        |   2 +-
 .../camel/processor/RecipientListParallelTest.java |   2 +-
 .../RecipientListParallelTimeoutTest.java          |   4 +-
 .../processor/RecipientListRedeliverTest.java      |  14 +-
 .../processor/RecipientListReturnValueTest.java    |   4 +-
 .../RecipientListStopOnExceptionTest.java          |   5 +-
 ...ientListStopOnExceptionWithOnExceptionTest.java |   4 +-
 .../processor/RecipientListSubUnitOfWorkTest.java  |   7 +-
 .../apache/camel/processor/RecipientListTest.java  |   2 +-
 ...ipientListThrowExceptionFromExpressionTest.java |   2 +-
 .../RecipientListThrowExceptionSubRouteTest.java   |   2 +-
 .../RecipientListWithArrayHeaderTest.java          |   2 +-
 .../processor/RecipientListWithDelimiterTest.java  |   2 +-
 .../RecipientListWithSimpleExpressionTest.java     |   2 +-
 ...RecipientListWithStringDelimitedHeaderTest.java |   2 +-
 ...cipientListWithStringDelimitedPropertyTest.java |   2 +-
 .../camel/processor/RedeliverToSubRouteTest.java   |   2 +-
 ...tterErrorHandlerNoRedeliveryOnShutdownTest.java |   8 +-
 .../RedeliveryErrorHandlerBlockedDelayTest.java    |   2 +-
 ...veryErrorHandlerBreakoutDuringShutdownTest.java |   6 +-
 .../RedeliveryErrorHandlerLogHandledTest.java      |   5 +-
 ...veryErrorHandlerNoRedeliveryOnShutdownTest.java |   6 +-
 .../RedeliveryErrorHandlerNonBlockedDelayTest.java |   2 +-
 ...ErrorHandlerNonBlockedRedeliveryHeaderTest.java |   2 +-
 .../RedeliveryOnExceptionBlockedDelayTest.java     |   2 +-
 .../RedeliveryPolicyDelayPatternTest.java          |   7 +-
 .../RedeliveryPolicyPerExceptionTest.java          |  14 +-
 .../org/apache/camel/processor/RegExRouteTest.java |   2 +-
 .../apache/camel/processor/RemoveHeaderTest.java   |   9 +-
 .../camel/processor/RemoveHeadersExcludeTest.java  |   4 +-
 .../apache/camel/processor/RemoveHeadersTest.java  |   4 +-
 .../RemovePropertiesWithExclusionTest.java         |   9 +-
 .../RemovePropertiesWithoutExclusionTest.java      |   9 +-
 .../apache/camel/processor/RemovePropertyTest.java |   9 +-
 ...ResequenceStreamIgnoreInvalidExchangesTest.java |   2 +-
 ...equenceStreamNotIgnoreInvalidExchangesTest.java |   4 +-
 .../ResequenceStreamRejectOldExchangesTest.java    |   2 +-
 .../apache/camel/processor/ResequencerTest.java    |  14 +-
 .../camel/processor/RollbackCustomMessageTest.java |   5 +-
 .../processor/RollbackDefaultErrorHandlerTest.java |  11 +-
 .../processor/RollbackDefaultMessageTest.java      |   5 +-
 .../org/apache/camel/processor/RollbackTest.java   |   9 +-
 .../camel/processor/RoundRobinLoadBalanceTest.java |   6 +-
 .../camel/processor/RouteAutoStartupTest.java      |   4 +-
 .../camel/processor/RouteAwareProcessorTest.java   |   2 +-
 .../camel/processor/RouteAwareRouteTest.java       |   2 +-
 .../processor/RouteAwareSynchronizationTest.java   |   4 +-
 .../camel/processor/RouteContextProcessorTest.java |   6 +-
 .../camel/processor/RouteFormattedUriTest.java     |   6 +-
 .../org/apache/camel/processor/RouteIdTest.java    |   4 +-
 .../camel/processor/RouteMEPOptionalOutTest.java   |   4 +-
 .../camel/processor/RouteNoAutoStartupTest.java    |   2 +-
 .../camel/processor/RouteOneInputAllowedTest.java  |   5 +-
 .../camel/processor/RoutePerformanceCountTest.java |   4 +-
 .../camel/processor/RoutePoliciesRefTest.java      |   2 +-
 .../apache/camel/processor/RoutePoliciesTest.java  |   2 +-
 .../processor/RouteServicesStartupOrderTest.java   |   4 +-
 .../RouteShutdownNotReverseOrderTest.java          |   4 +-
 .../processor/RouteShutdownReverseOrderTest.java   |   4 +-
 .../processor/RouteStartupOrderClashTest.java      |   5 +-
 .../RouteStartupOrderDirectReverseTest.java        |   4 +-
 .../processor/RouteStartupOrderDirectTest.java     |   4 +-
 .../camel/processor/RouteStartupOrderLastTest.java |   4 +-
 .../processor/RouteStartupOrderSimpleTest.java     |   4 +-
 ...StartupOrderSuspendResumeNoAutoStartupTest.java |   4 +-
 .../RouteStartupOrderSuspendResumeTest.java        |   4 +-
 .../camel/processor/RouteStartupOrderTest.java     |   4 +-
 .../RouteStartupOrderWithDefaultTest.java          |   4 +-
 .../org/apache/camel/processor/RouteStopTest.java  |   2 +-
 .../processor/RouteTopLevelMisconfiguredTest.java  |   5 +-
 ...RouteWithConstantFieldFromExchangeFailTest.java |   9 +-
 .../RouteWithConstantFieldFromExchangeTest.java    |   2 +-
 ...utingSlipContextScopedOnExceptionIssueTest.java |   4 +-
 .../apache/camel/processor/RoutingSlipDslTest.java |   2 +-
 .../processor/RoutingSlipInOutAndInOnlyTest.java   |   4 +-
 .../camel/processor/RoutingSlipNoCacheTest.java    |   5 +-
 .../processor/RoutingSlipNoErrorHandlerTest.java   |   2 +-
 .../RoutingSlipNoSuchEndpointExceptionTest.java    |   2 +-
 .../camel/processor/RoutingSlipRedeliverTest.java  |  14 +-
 ...outingSlipThrowExceptionFromExpressionTest.java |   2 +-
 .../apache/camel/processor/SagaFailuresTest.java   |   2 +-
 .../apache/camel/processor/SagaOptionsTest.java    |   4 +-
 .../camel/processor/SagaPropagationTest.java       |  13 +-
 .../java/org/apache/camel/processor/SagaTest.java  |   8 +-
 .../apache/camel/processor/SagaTimeoutTest.java    |   2 +-
 .../camel/processor/SamplingThrottlerTest.java     |   4 +-
 .../apache/camel/processor/ScriptExternalTest.java |   6 +-
 .../org/apache/camel/processor/ScriptTest.java     |   6 +-
 .../processor/SendExchangePatternOptionTest.java   |   2 +-
 .../camel/processor/SendToNoErrorHandlerTest.java  |   2 +-
 .../processor/SendToNonExistingEndpointTest.java   |   7 +-
 .../camel/processor/SetBodyProcessorTest.java      |   2 +-
 .../camel/processor/SetExchangePatternTest.java    |   7 +-
 .../SetHeaderUsingDslExpressionsTest.java          |   6 +-
 .../apache/camel/processor/SetPropertyTest.java    |   8 +-
 .../processor/ShutdownCompleteAllTasksTest.java    |  10 +-
 .../ShutdownCompleteCurrentTaskOnlyTest.java       |  10 +-
 .../apache/camel/processor/ShutdownDeferTest.java  |   9 +-
 .../camel/processor/ShutdownNotDeferTest.java      |   9 +-
 .../ShutdownSedaAndDirectEndpointTest.java         |   2 +-
 .../apache/camel/processor/SimpleDirectTest.java   |   2 +-
 .../camel/processor/SimpleMockPlaceholderTest.java |   2 +-
 .../camel/processor/SimpleMockSampleTest.java      |   2 +-
 .../org/apache/camel/processor/SimpleMockTest.java |   4 +-
 .../camel/processor/SimpleMockTwoRoutesTest.java   |   4 +-
 .../processor/SimpleProcessorIdAwareTest.java      |   4 +-
 .../camel/processor/SimpleProcessorTest.java       |   4 +-
 .../processor/SimpleProcessorTraceableTest.java    |   4 +-
 .../camel/processor/SimpleResultTypeRouteTest.java |   2 +-
 .../processor/SimpleSingleOutputMockTest.java      |   4 +-
 .../camel/processor/SimpleTryCatchFinallyTest.java |   2 +-
 .../camel/processor/SimpleTryFinallyTest.java      |   2 +-
 .../SimpleTryThrowExceptionFinallyTest.java        |   5 +-
 .../org/apache/camel/processor/SimulatorTest.java  |   6 +-
 .../org/apache/camel/processor/SortBodyTest.java   |   4 +-
 .../apache/camel/processor/SortExpressionTest.java |   4 +-
 .../camel/processor/SplitAggregateInOutTest.java   |   4 +-
 .../camel/processor/SplitCustomExpressionTest.java |   2 +-
 .../camel/processor/SplitGroupMultiLinesTest.java  |   2 +-
 .../camel/processor/SplitGroupMultiXmlTest.java    |   6 +-
 .../processor/SplitGroupMultiXmlTokenTest.java     |   6 +-
 .../camel/processor/SplitGroupSkipFirstTest.java   |   2 +-
 .../SplitGroupWrappedMultiXmlTokenTest.java        |   6 +-
 .../camel/processor/SplitIteratorNullTest.java     |   5 +-
 .../camel/processor/SplitParallelTimeoutTest.java  |   5 +-
 .../processor/SplitRefCustomExpressionTest.java    |   2 +-
 ...ubUnitOfWorkStopOnExceptionAndParallelTest.java |   7 +-
 .../SplitSubUnitOfWorkStopOnExceptionTest.java     |   7 +-
 .../camel/processor/SplitSubUnitOfWorkTest.java    |   7 +-
 .../processor/SplitTokenizerGroupDynamicTest.java  |   2 +-
 .../camel/processor/SplitTokenizerGroupTest.java   |   2 +-
 .../processor/SplitTokenizerNamespaceTest.java     |   2 +-
 .../processor/SplitTokenizerRegexpGroupTest.java   |   2 +-
 .../apache/camel/processor/SplitTokenizerTest.java |   2 +-
 .../processor/SplitTokenizerXmlMultilineTest.java  |   2 +-
 .../camel/processor/SplitTwoSubUnitOfWorkTest.java |  10 +-
 .../apache/camel/processor/SplitWithEndTest.java   |   4 +-
 .../camel/processor/SplitterCollateTest.java       |   4 +-
 .../processor/SplitterCompletedPropertyTest.java   |   2 +-
 .../camel/processor/SplitterMethodCallTest.java    |   2 +-
 .../SplitterNoAggregationStrategyTest.java         |   5 +-
 .../processor/SplitterNoStopOnExceptionTest.java   |   5 +-
 .../camel/processor/SplitterNullBodyTest.java      |   2 +-
 .../camel/processor/SplitterOnCompletionTest.java  |   5 +-
 .../processor/SplitterOnPrepareExceptionTest.java  |   4 +-
 .../camel/processor/SplitterOnPrepareTest.java     |   4 +-
 .../processor/SplitterParallelAggregateTest.java   |   2 +-
 .../processor/SplitterParallelBigFileTest.java     |  10 +-
 .../SplitterParallelNoStopOnExceptionTest.java     |  13 +-
 .../SplitterParallelStopOnExceptionTest.java       |  12 +-
 ...ParallelStopOnExceptionWithOnExceptionTest.java |   4 +-
 .../apache/camel/processor/SplitterPojoTest.java   |   8 +-
 .../processor/SplitterPropertyContinuedTest.java   |   2 +-
 ...SplitterShareUnitOfWorkCompletionAwareTest.java |   2 +-
 .../apache/camel/processor/SplitterSkipTest.java   |   2 +-
 .../processor/SplitterStopOnExceptionTest.java     |   4 +-
 ...SplitterStopOnExceptionWithOnExceptionTest.java |   4 +-
 .../camel/processor/SplitterStreamCacheTest.java   |   6 +-
 .../SplitterStreamCachingInSubRouteTest.java       |   2 +-
 .../SplitterStreamingErrorHandlingTest.java        |   5 +-
 ...rStreamingStopOnExceptionErrorHandlingTest.java |   5 +-
 .../processor/SplitterStreamingUoWIssueTest.java   |   6 +-
 .../SplitterStreamingWithErrorHandlerTest.java     |   2 +-
 .../org/apache/camel/processor/SplitterTest.java   |  21 +--
 .../SplitterThrowExceptionFromExpressionTest.java  |   2 +-
 .../camel/processor/SplitterUoWIssueTest.java      |   6 +-
 .../processor/SplitterUseOriginalLoopTest.java     |   2 +-
 ...litterUseOriginalNotPropagateExceptionTest.java |   5 +-
 .../processor/SplitterWireTapStreamCacheTest.java  |   6 +-
 .../SplitterWithCustomThreadPoolExecutorTest.java  |   4 +-
 .../processor/SplitterWithDualMulticastTest.java   |   2 +-
 .../camel/processor/SplitterWithMulticastTest.java |   2 +-
 .../SplitterWithScannerIoExceptionTest.java        |   2 +-
 .../camel/processor/SplitterWithXqureyTest.java    |   6 +-
 .../camel/processor/StepEventNotifierTest.java     |   4 +-
 .../java/org/apache/camel/processor/StepTest.java  |   2 +-
 .../camel/processor/StickyLoadBalanceTest.java     |   6 +-
 .../StreamCachingCustomShouldSpoolRuleTest.java    |  10 +-
 .../camel/processor/StreamCachingInOutTest.java    |   7 +-
 .../processor/StreamCachingOnlyRouteTest.java      |   2 +-
 .../camel/processor/StreamCachingPerRouteTest.java |   6 +-
 .../processor/StreamCachingRecipientListTest.java  |   2 +-
 .../processor/StreamCachingRoutingSlipTest.java    |   2 +-
 .../StreamCachingSpoolDirectoryQuarkusTest.java    |  10 +-
 .../processor/StreamCachingXPathRouteTest.java     |   2 +-
 .../camel/processor/StreamResequencerTest.java     |   6 +-
 .../StreamSourceContentBasedRouterTest.java        |   6 +-
 .../ThreadsCoreAndMaxPoolInvalidTest.java          |   5 +-
 .../ThreadsCoreAndMaxPoolKeepAliveTimeTest.java    |   2 +-
 .../camel/processor/ThreadsCoreAndMaxPoolTest.java |   2 +-
 .../camel/processor/ThreadsCorePoolTest.java       |  17 ++-
 .../apache/camel/processor/ThreadsDefaultTest.java |   2 +-
 .../camel/processor/ThreadsInvalidConfigTest.java  |  22 ++-
 .../camel/processor/ThreadsMaxQueueSizeTest.java   |   2 +-
 .../processor/ThreadsRejectedExecutionTest.java    |   5 +-
 .../camel/processor/ThreadsRejectedPolicyTest.java |   2 +-
 .../camel/processor/ThreadsRequestReplyTest.java   |   7 +-
 .../processor/ThreadsZeroInCoreAndMaxPoolTest.java |   8 +-
 .../ThrottlerAsyncDelayedCallerRunsTest.java       |   2 +-
 .../camel/processor/ThrottlerAsyncDelayedTest.java |   2 +-
 .../apache/camel/processor/ThrottlerDslTest.java   |   6 +-
 .../processor/ThrottlerInvalidConfiguredTest.java  |   5 +-
 .../camel/processor/ThrottlerMethodCallTest.java   |   4 +-
 .../camel/processor/ThrottlerNullEvalTest.java     |   2 +-
 .../org/apache/camel/processor/ThrottlerTest.java  |   8 +-
 .../processor/ThrottlerThreadPoolProfileTest.java  |   2 +-
 ...xceptionRoutePolicyHalfOpenHandlerSedaTest.java |   6 +-
 ...ingExceptionRoutePolicyHalfOpenHandlerTest.java |   6 +-
 ...ThrottlingExceptionRoutePolicyHalfOpenTest.java |   6 +-
 ...lingExceptionRoutePolicyKeepOpenOnInitTest.java |   6 +-
 ...tlingExceptionRoutePolicyOpenViaConfigTest.java |   6 +-
 .../ThrottlingExceptionRoutePolicyTest.java        |   6 +-
 .../camel/processor/ThrottlingGroupingTest.java    |   8 +-
 .../ThrottlingInflightRoutePolicyTest.java         |   2 +-
 .../camel/processor/ThrowExceptionMessageTest.java |   5 +-
 .../processor/ThrowExceptionNullMessageTest.java   |   5 +-
 .../apache/camel/processor/ThrowExceptionTest.java |   5 +-
 .../ToDynamicAutoStartupComponentsTest.java        |   4 +-
 .../apache/camel/processor/ToDynamicEmptyTest.java |   2 +-
 .../camel/processor/ToDynamicIgnoreTest.java       |   2 +-
 ...DynamicLanguageSimpleAndXPathAndHeaderTest.java |   2 +-
 .../ToDynamicLanguageSimpleAndXPathTest.java       |   2 +-
 .../processor/ToDynamicLanguageXPathTest.java      |   2 +-
 .../camel/processor/ToDynamicNoCacheTest.java      |   5 +-
 .../ToDynamicPropertyPlaceholderTest.java          |   5 +-
 .../camel/processor/ToDynamicRawAndXPathTest.java  |   2 +-
 .../apache/camel/processor/ToDynamicRawTest.java   |   2 +-
 .../processor/ToDynamicSendDynamicAwareTest.java   |   6 +-
 .../org/apache/camel/processor/ToDynamicTest.java  |   4 +-
 .../camel/processor/ToEndpointPropertyTest.java    |   4 +-
 .../camel/processor/TopicLoadBalanceTest.java      |   6 +-
 .../apache/camel/processor/TraceDelayerTest.java   |   2 +-
 .../camel/processor/TraceInterceptorTest.java      |   2 +-
 .../camel/processor/TracePerRouteManualTest.java   |   2 +-
 .../camel/processor/TracerConfigurationTest.java   |   2 +-
 .../processor/TransformBeanExceptionTest.java      |   2 +-
 .../TransformProcessorWithHeaderTest.java          |   2 +-
 .../org/apache/camel/processor/TransformTest.java  |   6 +-
 .../camel/processor/TransformViaDSLTest.java       |   6 +-
 .../apache/camel/processor/TransformXpathTest.java |   4 +-
 .../processor/TripleNestedChoiceIssueTest.java     |   2 +-
 .../TryCatchCaughtExceptionFinallyTest.java        |   4 +-
 .../processor/TryCatchCaughtExceptionTest.java     |   4 +-
 .../TryCatchCaughtExceptionTwoTimesTest.java       |   4 +-
 .../processor/TryCatchContinueToRouteTest.java     |   2 +-
 .../TryCatchMustHaveExceptionConfiguredTest.java   |   5 +-
 .../camel/processor/TryCatchNestedChoiceTest.java  |   2 +-
 .../camel/processor/TryCatchRecipientListTest.java |   2 +-
 .../processor/TryFinallyCaughtExceptionTest.java   |   4 +-
 .../TryProcessorHandleWrappedExceptionTest.java    |  13 +-
 .../TryProcessorMultipleExceptionTest.java         |   2 +-
 .../camel/processor/TryProcessorOnWhenTest.java    |   5 +-
 .../apache/camel/processor/TryProcessorTest.java   |  10 +-
 .../TypeConverterRegistryStatsPerformanceTest.java |   2 +-
 .../camel/processor/UnitOfWorkProducerTest.java    |   8 +-
 .../org/apache/camel/processor/UnitOfWorkTest.java |  28 ++--
 .../processor/UnitOfWorkWithAsyncFlowTest.java     |   4 +-
 .../camel/processor/UnmarshalProcessorTest.java    |  12 +-
 .../org/apache/camel/processor/ValidateIdTest.java |   4 +-
 .../apache/camel/processor/ValidateRegExpTest.java |  10 +-
 .../apache/camel/processor/ValidateSimpleTest.java |   8 +-
 .../processor/ValidatingDomProcessorTest.java      |   8 +-
 .../ValidatingProcessorFromSourceTest.java         |   9 +-
 .../processor/ValidatingProcessorFromUrlTest.java  |   8 +-
 .../ValidatingProcessorNotUseSharedSchemaTest.java |  11 +-
 .../camel/processor/ValidatingProcessorTest.java   |  14 +-
 .../ValidationFinallyBlockNoCatchTest.java         |   8 +-
 .../processor/ValidationFinallyBlockTest.java      |   6 +-
 .../org/apache/camel/processor/ValidationTest.java |   8 +-
 .../camel/processor/VerySimpleDirectTest.java      |   2 +-
 .../processor/WeightedRandomLoadBalanceTest.java   |   9 +-
 .../WeightedRoundRobinLoadBalanceTest.java         |   9 +-
 .../camel/processor/WireTapAbortPolicyTest.java    |  13 +-
 .../processor/WireTapBeanAsProcessorTest.java      |   8 +-
 .../apache/camel/processor/WireTapBeanTest.java    |   6 +-
 .../camel/processor/WireTapCustomPool2Test.java    |  10 +-
 .../camel/processor/WireTapCustomPoolTest.java     |  10 +-
 .../camel/processor/WireTapExpressionTest.java     |   2 +-
 .../camel/processor/WireTapLogEndpointTest.java    |   2 +-
 .../org/apache/camel/processor/WireTapLogTest.java |   2 +-
 .../camel/processor/WireTapNewExchangeTest.java    |   2 +-
 .../apache/camel/processor/WireTapNoCacheTest.java |   5 +-
 .../camel/processor/WireTapOnExceptionTest.java    |   2 +-
 .../camel/processor/WireTapOnPrepareTest.java      |   8 +-
 .../camel/processor/WireTapShutdownBeanTest.java   |   4 +-
 .../camel/processor/WireTapShutdownRouteTest.java  |   4 +-
 .../camel/processor/WireTapStreamCachingTest.java  |   6 +-
 .../org/apache/camel/processor/WireTapTest.java    |   6 +-
 ...WireTapUsingFireAndForgetCopyAsDefaultTest.java |  13 +-
 .../WireTapUsingFireAndForgetCopyTest.java         |  13 +-
 .../processor/WireTapUsingFireAndForgetTest.java   |   9 +-
 .../camel/processor/WireTapUsingMulticastTest.java |   6 +-
 .../camel/processor/WireTapVoidBeanTest.java       |   3 +-
 .../apache/camel/processor/XPathChoiceTest.java    |   6 +-
 .../apache/camel/processor/XPathFilterTest.java    |   2 +-
 .../XPathWithNamespaceBuilderFilterTest.java       |   6 +-
 .../processor/XPathWithNamespacesFilterTest.java   |   6 +-
 .../aggregator/AbstractDistributedTest.java        |   9 +-
 ...ggregateAggregationStrategyIsPredicateTest.java |   2 +-
 .../AggregateClosedCorrelationKeyTest.java         |   6 +-
 .../aggregator/AggregateCompleteAllOnStopTest.java |   2 +-
 ...yBatchConsumerSendEmptyMessageWhenIdleTest.java |   2 +-
 ...gateCompletionAwareAggregationStrategyTest.java |   2 +-
 .../AggregateCompletionIntervalTest.java           |   2 +-
 ...gregateCompletionOnNewCorrelationGroupTest.java |   2 +-
 .../aggregator/AggregateCompletionOnlyOneTest.java |   4 +-
 .../aggregator/AggregateCompletionOnlyTwoTest.java |   4 +-
 .../AggregateCompletionPredicateTest.java          |   2 +-
 ...ggregateCompletionSizeAndBatchConsumerTest.java |   2 +-
 ...gateCompletionSizeExpressionAndTimeoutTest.java |   2 +-
 .../AggregateConcurrentPerCorrelationKeyTest.java  |   2 +-
 .../aggregator/AggregateControllerTest.java        |   4 +-
 .../aggregator/AggregateDiscardOnFailureTest.java  |   2 +-
 .../aggregator/AggregateDiscardOnTimeoutTest.java  |   4 +-
 .../processor/aggregator/AggregateDslTest.java     |   2 +-
 .../AggregateEagerCheckCompletionTest.java         |   2 +-
 .../AggregateExpressionSizeFallbackTest.java       |   2 +-
 .../AggregateExpressionSizeOverrideFixedTest.java  |   2 +-
 ...gateExpressionSizeOverrideFixedTimeoutTest.java |   2 +-
 .../aggregator/AggregateExpressionSizeTest.java    |   2 +-
 .../aggregator/AggregateExpressionTest.java        |   2 +-
 .../AggregateExpressionTimeoutFallbackTest.java    |   2 +-
 .../AggregateExpressionTimeoutPerGroupTest.java    |   2 +-
 .../aggregator/AggregateExpressionTimeoutTest.java |   2 +-
 ...eCompletionHeaderInAggregationStrategyTest.java |   2 +-
 .../AggregateForceCompletionHeaderTest.java        |   2 +-
 .../AggregateForceCompletionOnStopTest.java        |  20 +--
 .../aggregator/AggregateFromWireTapTest.java       |   6 +-
 .../aggregator/AggregateGroupMessageTest.java      |   4 +-
 .../AggregateGroupedExchangeBatchSizeTest.java     |   7 +-
 ...roupedExchangeCompletionExpressionSizeTest.java |   2 +-
 ...AggregateGroupedExchangeCompletionSizeTest.java |   2 +-
 ...gateGroupedExchangeMultipleCorrelationTest.java |   4 +-
 .../AggregateGroupedExchangeSizePredicateTest.java |   4 +-
 .../AggregateGroupedExchangeSizeTest.java          |   4 +-
 .../aggregator/AggregateGroupedExchangeTest.java   |   4 +-
 .../AggregateIgnoreInvalidCorrelationKeysTest.java |   5 +-
 .../aggregator/AggregateLostGroupIssueTest.java    |  35 ++++-
 .../aggregator/AggregateMultipleSourceTest.java    |   2 +-
 .../AggregateNewExchangeAndConfirmTest.java        |   3 +-
 .../AggregateParallelProcessingTest.java           |   2 +-
 .../AggregatePreCompleteAwareStrategyTest.java     |   2 +-
 ...gregatePreCompleteAwareStrategyTimeoutTest.java |   2 +-
 .../aggregator/AggregateProcessorTest.java         |  10 +-
 ...egateProcessorTimeoutCompletionRestartTest.java |   8 +-
 .../AggregateRepositoryReturnNullTest.java         |   5 +-
 .../AggregateShouldSkipFilteredExchangesTest.java  |   2 +-
 .../AggregateShutdownThreadPoolTest.java           |   4 +-
 .../AggregateSimpleExpressionIssueTest.java        |  10 +-
 .../AggregateSimplePredicateEagerTest.java         |   2 +-
 .../aggregator/AggregateSimplePredicateTest.java   |   2 +-
 .../aggregator/AggregateSimpleSizeTest.java        |   2 +-
 .../aggregator/AggregateSimpleTimeoutTest.java     |   2 +-
 .../aggregator/AggregateStrategyServiceTest.java   |   2 +-
 .../aggregator/AggregateThreadPoolProfileTest.java |   2 +-
 .../aggregator/AggregateTimeoutManualTest.java     |   2 +-
 .../aggregator/AggregateTimeoutOnlyTest.java       |   2 +-
 .../processor/aggregator/AggregateTimeoutTest.java |   5 +-
 .../AggregateTimeoutWithExecutorServiceTest.java   |   6 +-
 .../AggregateTimeoutWithNoExecutorServiceTest.java |   7 +-
 .../AggregateUnknownExecutorServiceRefTest.java    |   5 +-
 .../AggregationStrategyAsPredicateTest.java        |   2 +-
 ...trategyBeanAdapterAllowNullOldExchangeTest.java |   2 +-
 ...ggregationStrategyBeanAdapterAllowNullTest.java |   4 +-
 ...tionStrategyBeanAdapterNonStaticMethodTest.java |   2 +-
 ...ggregationStrategyBeanAdapterOneMethodTest.java |   2 +-
 ...nAdapterPollEnrichAllowNullNewExchangeTest.java |   2 +-
 ...gregationStrategyBeanAdapterPollEnrichTest.java |   2 +-
 ...gationStrategyBeanAdapterRefMethodNameTest.java |   2 +-
 .../AggregationStrategyBeanAdapterRefTest.java     |   2 +-
 ...egationStrategyBeanAdapterStaticMethodTest.java |   2 +-
 .../AggregationStrategyBeanAdapterTest.java        |   2 +-
 ...egyBeanAdapterWithHeadersAndPropertiesTest.java |   2 +-
 ...regationStrategyBeanAdapterWithHeadersTest.java |   2 +-
 .../AggregationStrategyCompleteByPropertyTest.java |   2 +-
 .../AggregationStrategyGroupedBodyTest.java        |   5 +-
 .../AggregationStrategyLifecycleTest.java          |   9 +-
 .../aggregator/AggregatorAndOnExceptionTest.java   |   2 +-
 .../aggregator/AggregatorConcurrencyTest.java      |   4 +-
 .../aggregator/AggregatorExceptionHandleTest.java  |   2 +-
 .../AggregatorExceptionInPredicateTest.java        |   2 +-
 .../aggregator/AggregatorExceptionTest.java        |   2 +-
 .../aggregator/AggregatorLockingTest.java          |   2 +-
 .../camel/processor/aggregator/AggregatorTest.java |   2 +-
 .../aggregator/AlbertoAggregatorTest.java          |   2 +-
 .../aggregator/BeanBeforeAggregateIssueTest.java   |   6 +-
 .../BodyOnlyAggregationStrategyTest.java           |   2 +-
 .../CustomAggregationStrategyServiceTest.java      |  13 +-
 .../aggregator/CustomAggregationStrategyTest.java  |   2 +-
 ...ionStrategyCompletionFromBatchConsumerTest.java |  11 +-
 ...ustomListAggregationStrategyEmptySplitTest.java |   5 +-
 .../CustomListAggregationStrategySplitTest.java    |  11 +-
 .../CustomListAggregationStrategyTest.java         |  11 +-
 .../DefaultAggregatorCollectionTest.java           |   2 +-
 .../DistributedCompletionIntervalTest.java         |   2 +-
 ...DistributedConcurrentPerCorrelationKeyTest.java |   4 +-
 .../DistributedOptimisticLockFailingTest.java      |   5 +-
 .../aggregator/DistributedTimeoutTest.java         |   4 +-
 .../EnricherRouteNumberOfProcessorTest.java        |   9 +-
 .../aggregator/OptimisticLockRetryPolicyTest.java  |  12 +-
 .../PredicateAggregatorCollectionTest.java         |   2 +-
 ...teParallelProcessingStackOverflowIssueTest.java |   3 +-
 .../SplitAggregateStackOverflowIssueTest.java      |  12 +-
 ...itParallelProcessingStackOverflowIssueTest.java |   3 +-
 .../SplitRouteNumberOfProcessorTest.java           |   9 +-
 .../aggregator/SplitStackOverflowIssueTest.java    |   2 +-
 .../aggregator/StringAggregationStrategyTest.java  |   2 +-
 ...yncDeadLetterChannelExecutorServiceRefTest.java |   2 +-
 .../async/AsyncDeadLetterChannelTest.java          |   2 +-
 .../async/AsyncDefaultErrorHandlerTest.java        |   5 +-
 .../processor/async/AsyncEndpointCBRTest.java      |   7 +-
 .../AsyncEndpointCustomAsyncInterceptorTest.java   |   7 +-
 .../async/AsyncEndpointCustomInterceptorTest.java  |   7 +-
 .../async/AsyncEndpointCustomRoutePolicyTest.java  |   7 +-
 .../processor/async/AsyncEndpointDelayUoWTest.java |   6 +-
 .../async/AsyncEndpointDoWhileLoopTest.java        |   2 +-
 .../async/AsyncEndpointDualMulticastTest.java      |   4 +-
 .../AsyncEndpointDualTopicLoadBalanceTest.java     |   2 +-
 .../async/AsyncEndpointDynamicRouterTest.java      |   4 +-
 .../processor/async/AsyncEndpointEnricherTest.java |   7 +-
 .../AsyncEndpointEventNotifierSendingTest.java     |   4 +-
 .../async/AsyncEndpointEventNotifierTest.java      |   9 +-
 ...AsyncEndpointFailOverLoadBalanceMixed2Test.java |   7 +-
 ...AsyncEndpointFailOverLoadBalanceMixed3Test.java |   7 +-
 .../AsyncEndpointFailOverLoadBalanceMixedTest.java |   7 +-
 ...ncEndpointFailOverLoadBalanceOnlyAsyncTest.java |   7 +-
 ...ncEndpointFailedAfterDeadLetterChannelTest.java |   6 +-
 ...EndpointFailedAfterOnExceptionContinueTest.java |   7 +-
 ...cEndpointFailedAfterOnExceptionHandledTest.java |   7 +-
 .../async/AsyncEndpointFailedAfterTest.java        |   6 +-
 .../AsyncEndpointFailureProcessorContinueTest.java |   7 +-
 .../async/AsyncEndpointFailureProcessorTest.java   |   7 +-
 .../processor/async/AsyncEndpointFilterTest.java   |   7 +-
 .../async/AsyncEndpointIdempotentConsumerTest.java |   6 +-
 .../processor/async/AsyncEndpointLoopTest.java     |   7 +-
 ...pointMulticastFineGrainedErrorHandlingTest.java |   4 +-
 .../async/AsyncEndpointMulticastTest.java          |   7 +-
 .../processor/async/AsyncEndpointPipelineTest.java |   4 +-
 .../processor/async/AsyncEndpointPolicyTest.java   |   9 +-
 .../async/AsyncEndpointRecipientList2Test.java     |   7 +-
 .../async/AsyncEndpointRecipientList3Test.java     |   7 +-
 .../async/AsyncEndpointRecipientList4Test.java     |   7 +-
 .../async/AsyncEndpointRecipientListBean3Test.java |   7 +-
 .../async/AsyncEndpointRecipientListBean4Test.java |   7 +-
 .../async/AsyncEndpointRecipientListBeanTest.java  |   7 +-
 ...tRecipientListFineGrainedErrorHandlingTest.java |   5 +-
 .../AsyncEndpointRecipientListParallel2Test.java   |   7 +-
 .../AsyncEndpointRecipientListParallel3Test.java   |   7 +-
 .../AsyncEndpointRecipientListParallel4Test.java   |   7 +-
 .../AsyncEndpointRecipientListParallel5Test.java   |   7 +-
 .../AsyncEndpointRecipientListParallelTest.java    |   7 +-
 .../async/AsyncEndpointRecipientListTest.java      |   7 +-
 ...RedeliveryErrorHandlerNonBlockedDelay2Test.java |   6 +-
 ...RedeliveryErrorHandlerNonBlockedDelay3Test.java |   6 +-
 ...tRedeliveryErrorHandlerNonBlockedDelayTest.java |   6 +-
 .../AsyncEndpointRoundRobinLoadBalanceTest.java    |   7 +-
 .../async/AsyncEndpointRoutingSlip2Test.java       |   4 +-
 .../async/AsyncEndpointRoutingSlip3Test.java       |   7 +-
 .../async/AsyncEndpointRoutingSlipBean2Test.java   |   4 +-
 .../async/AsyncEndpointRoutingSlipBean3Test.java   |   7 +-
 ...syncEndpointRoutingSlipBeanNonBlockingTest.java |   9 +-
 .../async/AsyncEndpointRoutingSlipBeanTest.java    |   4 +-
 .../async/AsyncEndpointRoutingSlipTest.java        |   4 +-
 .../processor/async/AsyncEndpointSamplingTest.java |   7 +-
 .../async/AsyncEndpointSedaInOnlyTest.java         |  15 +-
 .../processor/async/AsyncEndpointSedaTest.java     |   7 +-
 .../AsyncEndpointSingleTopicLoadBalanceTest.java   |   2 +-
 ...cEndpointSplitFineGrainedErrorHandlingTest.java |   4 +-
 .../processor/async/AsyncEndpointSplitTest.java    |   7 +-
 ...pointSplitUseLatestAggregationStrategyTest.java |   7 +-
 .../processor/async/AsyncEndpointStopTest.java     |   7 +-
 .../async/AsyncEndpointSynchronousFalseTest.java   |   7 +-
 .../async/AsyncEndpointSynchronousTest.java        |   7 +-
 .../camel/processor/async/AsyncEndpointTest.java   |   7 +-
 .../async/AsyncEndpointTransformTest.java          |   7 +-
 .../async/AsyncEndpointTryCatchFinally2Test.java   |  11 +-
 .../async/AsyncEndpointTryCatchFinally3Test.java   |   6 +-
 .../async/AsyncEndpointTryCatchFinally4Test.java   |   4 +-
 .../async/AsyncEndpointTryCatchFinally5Test.java   |   4 +-
 .../async/AsyncEndpointTryCatchFinallyTest.java    |   7 +-
 .../async/AsyncEndpointUoWFailedTest.java          |   6 +-
 .../processor/async/AsyncEndpointUoWTest.java      |   6 +-
 .../async/AsyncEndpointWithDelayerTest.java        |   7 +-
 .../async/AsyncEndpointWithStreamCachingTest.java  |   7 +-
 .../async/AsyncEndpointWithTracingTest.java        |   7 +-
 ...FailureProcessorWithRedeliveryAndDelayTest.java |   7 +-
 .../AsyncFailureProcessorWithRedeliveryTest.java   |   7 +-
 .../processor/async/AsyncInOnlyEndpointTest.java   |   6 +-
 .../apache/camel/processor/async/AsyncMDCTest.java |   9 +-
 .../async/AsyncNestedTripleChoiceIssueTest.java    |   2 +-
 ...xceptionFailureProcessorWithRedeliveryTest.java |   6 +-
 .../AsyncProcessorAwaitManagerInterruptTest.java   |   5 +-
 ...sorAwaitManagerInterruptWithRedeliveryTest.java |  11 +-
 .../async/AsyncProcessorAwaitManagerTest.java      |   4 +-
 .../camel/processor/async/AsyncProducerTest.java   |   7 +-
 .../processor/async/AsyncRouteWithErrorTest.java   |   9 +-
 .../async/AsyncSedaInOnlyEndpointTest.java         |   6 +-
 .../processor/async/AsyncTwoEndpointTest.java      |  11 +-
 .../DynamicRouterConcurrentPOJOTest.java           |   2 +-
 .../EnrichExpressionIgnoreInvalidEndpointTest.java |   2 +-
 .../enricher/EnrichExpressionNoCacheTest.java      |   2 +-
 .../processor/enricher/EnrichExpressionTest.java   |   2 +-
 .../enricher/EnricherAggregateOnExceptionTest.java |   5 +-
 .../enricher/EnricherAggregateStreamingTest.java   |   2 +-
 .../EnricherAsyncUnhandledExceptionTest.java       |  17 ++-
 .../EnricherDefaultAggregationStrategyTest.java    |   4 +-
 .../camel/processor/enricher/EnricherDslTest.java  |   2 +-
 .../processor/enricher/EnricherNoResourceTest.java |   2 +-
 .../camel/processor/enricher/EnricherRefTest.java  |   4 +-
 .../processor/enricher/EnricherSendEventTest.java  |  12 +-
 .../camel/processor/enricher/EnricherTest.java     |   8 +-
 .../enricher/PollEnrichBridgeErrorHandlerTest.java |   4 +-
 ...lEnrichExpressionIgnoreInvalidEndpointTest.java |   2 +-
 .../enricher/PollEnrichExpressionNoCacheTest.java  |   2 +-
 .../enricher/PollEnrichExpressionTest.java         |   2 +-
 ...ollEnrichFileCustomAggregationStrategyTest.java |  10 +-
 ...llEnrichFileDefaultAggregationStrategyTest.java |  10 +-
 .../processor/enricher/PollEnrichNullBodyTest.java |   2 +-
 .../PollEnricherAggregateOnExceptionTest.java      |   5 +-
 .../enricher/PollEnricherNoResourceTest.java       |   2 +-
 .../processor/enricher/PollEnricherRefTest.java    |   4 +-
 .../camel/processor/enricher/PollEnricherTest.java |  10 +-
 .../errorhandler/ErrorHandlerSupportTest.java      |   4 +-
 .../CustomExceptionPolicyStrategyTest.java         |   4 +-
 .../DefaultExceptionPolicyStrategyTest.java        |  10 +-
 ...ltExceptionPolicyStrategyUsingOnlyWhenTest.java |   4 +-
 ...efaultExceptionPolicyStrategyUsingWhenTest.java |   4 +-
 .../intercept/FromFileInterceptSendToIssue.java    |   2 +
 .../InterceptFromEndpointInstanceTest.java         |   2 +-
 .../intercept/InterceptFromEndpointRefTest.java    |   2 +-
 .../intercept/InterceptFromEndpointRefUriTest.java |   2 +-
 .../InterceptFromPropertyPlaceholderTest.java      |   2 +-
 .../intercept/InterceptFromSimpleLogTest.java      |   2 +-
 .../InterceptFromSimplePredicateTest.java          |   2 +-
 .../InterceptFromSimplePredicateWithStopTest.java  |   2 +-
 .../intercept/InterceptFromSimpleRouteTest.java    |   2 +-
 .../intercept/InterceptFromUriRegexTest.java       |   2 +-
 .../intercept/InterceptFromUriSimpleLogTest.java   |   2 +-
 .../InterceptFromUriWildcardHeaderUriTest.java     |   2 +-
 .../intercept/InterceptFromUriWildcardTest.java    |   2 +-
 .../intercept/InterceptFromWhenNoStopTest.java     |   2 +-
 .../processor/intercept/InterceptFromWhenTest.java |   2 +-
 .../intercept/InterceptFromWhenWithChoiceTest.java |   2 +-
 .../InterceptSendToEndpointAfterTest.java          |   2 +-
 ...nterceptSendToEndpointConditionalSkip2Test.java |   2 +-
 ...nterceptSendToEndpointConditionalSkip3Test.java |   2 +-
 ...InterceptSendToEndpointConditionalSkipTest.java |   2 +-
 .../InterceptSendToEndpointDynamicTest.java        |   6 +-
 .../InterceptSendToEndpointInOnException.java      |   2 +
 .../InterceptSendToEndpointMultipleRoutesTest.java |   2 +-
 ...nterceptSendToEndpointNormalizePatternTest.java |   2 +-
 .../intercept/InterceptSendToEndpointTest.java     |   2 +-
 .../InterceptSendToEndpointWithParametersTest.java |   2 +-
 .../InterceptSendToEndpointWithStopTest.java       |   2 +-
 .../intercept/InterceptSendToExceptionTest.java    |   5 +-
 .../processor/intercept/InterceptSendToIssue.java  |   2 +
 .../intercept/InterceptSimpleRouteStopTest.java    |   2 +-
 .../intercept/InterceptSimpleRouteTest.java        |   2 +-
 .../InterceptSimpleRouteWhenStopTest.java          |   2 +-
 .../intercept/InterceptSimpleRouteWhenTest.java    |   2 +-
 .../ParentChildInterceptStrategyTest.java          |   4 +-
 .../interceptor/AdviceWithAutoStartupTest.java     |   5 +-
 .../interceptor/AdviceWithLambdaTest.java          |   5 +-
 ...AdviceWithMockEndpointsHavingParameterTest.java |   4 +-
 .../interceptor/AdviceWithMockEndpointsTest.java   |   5 +-
 .../AdviceWithMockEndpointsWithSkipTest.java       |   4 +-
 ...dviceWithMockMultipleEndpointsWithSkipTest.java |   4 +-
 .../AdviceWithRecipientListMockEndpointsTest.java  |   2 +-
 .../interceptor/AdviceWithReplaceFromTest.java     |   4 +-
 .../interceptor/AdviceWithRouteIdTest.java         |   2 +-
 .../interceptor/AdviceWithTasksMatchTest.java      |   2 +-
 .../AdviceWithTasksOnExceptionTest.java            |   2 +-
 .../interceptor/AdviceWithTasksSelectTest.java     |   7 +-
 .../processor/interceptor/AdviceWithTasksTest.java |   9 +-
 .../AdviceWithTasksToStringPatternTest.java        |   9 +-
 .../processor/interceptor/AdviceWithTest.java      |   5 +-
 .../interceptor/AdviceWithTryCatchTest.java        |   2 +-
 .../AdviceWithTwoRoutesOnExceptionTest.java        |   2 +-
 .../interceptor/AdviceWithTwoRoutesTest.java       |   2 +-
 .../processor/interceptor/AdviceWithTypeTest.java  |   6 +-
 .../AdviceWithWeaveAfterLastSplitTest.java         |   2 +-
 .../AdviceWithWeaveByStringOnChoiceTest.java       |   2 +-
 .../AdviceWithWeaveByTypeOnExceptionTest.java      |   2 +-
 .../interceptor/AdviceWithWeaveFirstLastTest.java  |   4 +-
 .../interceptor/AdviceWithWeaveLastCBRTest.java    |   2 +-
 .../AdviceWithWeaveToUriAndAddLastTest.java        |   2 +-
 .../AuditInterceptorAsyncDelegateIssueTest.java    |   8 +-
 .../AuditInterceptorDelegateIssueTest.java         |   8 +-
 .../CustomInterceptorRouteWithChildOutputTest.java |   4 +-
 .../interceptor/DebugExceptionBreakpointTest.java  |   9 +-
 .../DebugExceptionEventBreakpointTest.java         |   9 +-
 .../interceptor/DebugSingleStepConditionTest.java  |   8 +-
 .../processor/interceptor/DebugSingleStepTest.java |   8 +-
 .../camel/processor/interceptor/DebugTest.java     |   8 +-
 .../InterceptorStrategyNotOrderedTest.java         |   2 +-
 .../InterceptorStrategyOrderedTest.java            |   2 +-
 .../processor/interceptor/NoStreamCachingTest.java |  21 ++-
 ...xtScopedOnExceptionCorrectRouteContextTest.java |   5 +-
 ...ScopedOnExceptionLoadBalancerStopRouteTest.java |   6 +-
 .../ContextScopedOnExceptionLogRouteTest.java      |   4 +-
 ...efaultErrorHandlerExchangeFormatterRefTest.java |   5 +-
 ...rorHandlerOnExceptionOccurredProcessorTest.java |   5 +-
 .../DefaultErrorHandlerRetryWhileTest.java         |   4 +-
 .../onexception/DoCatchDirectDynamicRouteTest.java |   2 +-
 .../DoCatchDirectRecipientListTest.java            |   2 +-
 .../onexception/DoCatchDirectRouteTest.java        |   2 +-
 .../onexception/OnExceptionAfterRouteTest.java     |   5 +-
 ...xceptionAndDLCErrorHandlerIssueReverseTest.java |   2 +-
 .../OnExceptionAndDLCErrorHandlerIssueTest.java    |   2 +-
 .../OnExceptionCallSubRouteNoErrorHandlerTest.java |   2 +-
 .../onexception/OnExceptionComplexRouteTest.java   |   6 +-
 ...tionComplexWithNestedErrorHandlerRouteTest.java |   2 +-
 ...rorHandlerRouteWithDefaultErrorHandlerTest.java |   4 +-
 .../OnExceptionContinuePredicateTest.java          |   4 +-
 .../OnExceptionContinueSubRouteTest.java           |   2 +-
 .../OnExceptionContinueSubSubRouteTest.java        |   2 +-
 .../onexception/OnExceptionContinueTest.java       |   2 +-
 .../OnExceptionContinueTwoPredicateTest.java       |   4 +-
 .../onexception/OnExceptionContinueTwoTest.java    |   4 +-
 .../onexception/OnExceptionFromChoiceTest.java     |   6 +-
 .../OnExceptionFromChoiceUseOriginalBodyTest.java  |   6 +-
 ...onGlobalAndDLCErrorHandlerIssueReverseTest.java |   2 +-
 ...ExceptionGlobalAndDLCErrorHandlerIssueTest.java |   2 +-
 .../OnExceptionGlobalScopedRecursionTest.java      |   5 +-
 .../OnExceptionHandleAndThrowNewExceptionTest.java |   4 +-
 .../OnExceptionHandleAndTransformTest.java         |   4 +-
 ...dleAndTransformWithDefaultErrorHandlerTest.java |   4 +-
 .../OnExceptionHandledAndContinueTest.java         |   5 +-
 .../onexception/OnExceptionHandledTest.java        |   2 +-
 .../OnExceptionHandledThrowsExceptionTest.java     |   5 +-
 .../OnExceptionLoadBalancerDoubleIssueTest.java    |   2 +-
 .../onexception/OnExceptionMisconfiguredTest.java  |   4 +-
 ...nExceptionOccurredProcessorOnExceptionTest.java |   4 +-
 .../OnExceptionOccurredProcessorTest.java          |   4 +-
 ...ceptionProcessorInspectCausedExceptionTest.java |   5 +-
 ...CausedExceptionWithDefaultErrorHandlerTest.java |   5 +-
 .../onexception/OnExceptionRecursionTest.java      |   5 +-
 .../onexception/OnExceptionRetryUntilTest.java     |   8 +-
 ...ptionRetryUntilWithDefaultErrorHandlerTest.java |   8 +-
 .../onexception/OnExceptionRouteIdTest.java        |   5 +-
 .../OnExceptionRouteScopedRecursionTest.java       |   5 +-
 .../onexception/OnExceptionRouteTest.java          |   8 +-
 ...nExceptionRouteWithDefaultErrorHandlerTest.java |   8 +-
 .../OnExceptionUseOriginalBodyTest.java            |   4 +-
 .../OnExceptionUseOriginalMessageTest.java         |   4 +-
 .../onexception/OnExceptionWhenSimpleOgnlTest.java |   2 +-
 .../OnExceptionWireTapNewExchangeBodyTest.java     |   2 +-
 .../OnExceptionWithRouteAndContinueTest.java       |   2 +-
 .../OnExceptionWrappedExceptionTest.java           |   2 +-
 .../onexception/OnExceptionsPerRouteTest.java      |   2 +-
 .../onexception/RedeliverEntireRouteTest.java      |   4 +-
 .../RouteScopedOnExceptionSameTypeTest.java        |   2 +-
 .../resequencer/ResequencerBatchOrderTest.java     |   6 +-
 .../resequencer/ResequencerEngineTest.java         |  30 ++--
 .../resequencer/ResequencerFileNameTest.java       |   6 +-
 .../camel/processor/resequencer/SequenceTest.java  |  15 +-
 .../processor/resequencer/TestComparatorTest.java  |  16 ++-
 .../DynamicRouterEventNotifierTest.java            |   8 +-
 .../RecipientListEventNotifierTest.java            |   8 +-
 .../RoutingSlipCreateProducerFailedTest.java       |   5 +-
 .../RoutingSlipDataModificationTest.java           |  10 +-
 .../routingslip/RoutingSlipEventNotifierTest.java  |   8 +-
 .../RoutingSlipIgnoreInvalidEndpointsTest.java     |   8 +-
 .../processor/routingslip/RoutingSlipPOJOTest.java |   2 +-
 .../processor/routingslip/RoutingSlipTest.java     |   2 +-
 .../routingslip/RoutingSlipWithExceptionTest.java  |  10 +-
 .../DefaultValidationErrorHandlerTest.java         |   4 +-
 .../camel/reifier/DataFormatReifierTest.java       |  10 +-
 .../apache/camel/reifier/ProcessorReifierTest.java |   4 +-
 .../DefaultCamelContextEndpointCacheLimitTest.java |   6 +-
 .../DefaultCamelContextEndpointCacheTest.java      |   6 +-
 .../apache/camel/support/DefaultEndpointTest.java  |   4 +-
 .../apache/camel/support/DefaultRegistryTest.java  |  12 +-
 .../camel/support/DefaultTimeoutMapTest.java       |  12 +-
 .../camel/support/GroupTokenIteratorTest.java      |  12 +-
 .../camel/support/InputStreamIteratorTest.java     |   4 +-
 .../camel/support/IntrospectionSupportTest.java    |   4 +-
 ...opertyBindingSupportAutowireNestedDeepTest.java |   5 +-
 .../PropertyBindingSupportAutowireNestedTest.java  |   4 +-
 .../PropertyBindingSupportAutowireTest.java        |   5 +-
 .../PropertyBindingSupportConfigurerTest.java      |  10 +-
 .../support/PropertyBindingSupportListTest.java    |   4 +-
 .../support/PropertyBindingSupportMapTest.java     |   4 +-
 .../camel/support/PropertyBindingSupportTest.java  |  18 ++-
 .../apache/camel/support/ServiceSupportTest.java   |   4 +-
 .../camel/support/TimerListenerManagerTest.java    |   6 +-
 .../support/builder/RecordableInputStreamTest.java |   7 +-
 .../support/builder/RecordableReaderTest.java      |   7 +-
 .../support/component/ApiMethodHelperTest.java     |  84 ++++++-----
 .../component/ApiMethodPropertiesHelperTest.java   |   4 +-
 .../component/ArgumentSubstitutionParserTest.java  |   4 +-
 ...ndiCamelSingletonInitialContextFactoryTest.java |   6 +-
 .../org/apache/camel/support/jndi/JndiTest.java    |  15 +-
 .../camel/support/jsse/FilterParametersTest.java   |   4 +-
 .../support/jsse/KeyManagersParametersTest.java    |  10 +-
 .../camel/support/jsse/KeyStoreParametersTest.java |   5 +-
 .../support/jsse/SSLContextParametersTest.java     |  23 +--
 .../support/jsse/SecureRandomParametersTest.java   |   5 +-
 .../support/jsse/TrustManagersParametersTest.java  |   7 +-
 .../processor/DefaultExchangeFormatterTest.java    |  10 +-
 .../processor/DefaultMaskingFormatterTest.java     |  35 ++---
 .../support/processor/ThroughPutLoggerTest.java    |   9 +-
 .../FileIdempotentStoreOrderingTest.java           |  17 ++-
 .../apache/camel/util/CamelContextHelperTest.java  |   9 +-
 .../apache/camel/util/CaseInsensitiveMapTest.java  |  11 +-
 .../apache/camel/util/CreateModelFromXmlTest.java  |   3 +-
 .../util/DumpModelAsXmlAggregateRouteTest.java     |   5 +-
 ...mlChoiceFilterRoutePropertyPlaceholderTest.java |   5 +-
 .../util/DumpModelAsXmlChoiceFilterRouteTest.java  |   5 +-
 .../util/DumpModelAsXmlDanishCharactersTest.java   |   5 +-
 .../camel/util/DumpModelAsXmlNamespaceTest.java    |   5 +-
 .../camel/util/DumpModelAsXmlPlaceholdersTest.java |   4 +-
 .../util/DumpModelAsXmlRouteExpressionTest.java    |   5 +-
 .../util/DumpModelAsXmlRoutePredicateTest.java     |   5 +-
 .../util/DumpModelAsXmlSplitBodyRouteTest.java     |   9 +-
 ...umpModelAsXmlSplitNestedChoiceEndRouteTest.java |   5 +-
 .../DumpModelAsXmlTransformRouteConstantTest.java  |   9 +-
 .../DumpModelAsXmlTransformRouteLanguageTest.java  |   8 +-
 .../util/DumpModelAsXmlTransformRouteTest.java     |   9 +-
 .../org/apache/camel/util/EndpointHelperTest.java  |  28 ++--
 .../org/apache/camel/util/EventHelperTest.java     |   4 +-
 .../org/apache/camel/util/ExchangeHelperTest.java  |  10 +-
 .../camel/util/ExpressionListComparatorTest.java   |   4 +-
 .../apache/camel/util/FilePathResolverTest.java    |   7 +-
 .../java/org/apache/camel/util/FileUtilTest.java   |  21 +--
 .../java/org/apache/camel/util/GZIPHelperTest.java |  12 +-
 .../org/apache/camel/util/IOHelperCharsetTest.java |   7 +-
 .../java/org/apache/camel/util/IOHelperTest.java   |   7 +-
 .../org/apache/camel/util/InetAddressUtilTest.java |   7 +-
 .../org/apache/camel/util/KeyValueHolderTest.java  |  23 +--
 .../org/apache/camel/util/MessageHelperTest.java   |  23 ++-
 .../NoClassDefFoundErrorWrapExceptionTest.java     |   5 +-
 .../org/apache/camel/util/ObjectHelperTest.java    | 118 ++++++++--------
 .../java/org/apache/camel/util/OgnlHelperTest.java |   7 +-
 .../apache/camel/util/OrderedComparatorTest.java   |   7 +-
 .../org/apache/camel/util/PackageHelperTest.java   |   9 +-
 .../org/apache/camel/util/PlatformHelperTest.java  |   7 +-
 .../camel/util/PredicateAssertHelperTest.java      |   3 +-
 .../org/apache/camel/util/ReferenceCountTest.java  |  21 +--
 .../org/apache/camel/util/ResourceHelperTest.java  |   4 +-
 .../apache/camel/util/StingQuoteHelperTest.java    |   7 +-
 .../org/apache/camel/util/StringHelperTest.java    |  44 +++---
 .../camel/util/UnsafeCharactersEncoderTest.java    |   9 +-
 .../toolbox/FlexibleAggregationStrategiesTest.java |   4 +-
 core/camel-endpointdsl/pom.xml                     |   6 +-
 .../camel/builder/endpoint/CustomSedaTest.java     |   4 +-
 .../camel/builder/endpoint/EndpointInjectTest.java |   2 +-
 .../endpoint/FileAbsolutePathIssueTest.java        |   6 +-
 .../endpoint/FileBatchConsumerMemoryLeakTest.java  |  10 +-
 .../builder/endpoint/FileConsumeCharsetTest.java   |  10 +-
 .../camel/builder/endpoint/FileDelayTest.java      |   6 +-
 .../builder/endpoint/FtpRawParameterTest.java      |   6 +-
 .../endpoint/LanguageEndpointScriptRouteTest.java  |   2 +-
 .../endpoint/LanguageEndpointStaticTest.java       |   2 +-
 .../builder/endpoint/LanguageHeaderRouteTest.java  |   2 +-
 .../camel/builder/endpoint/LogAdvancedTest.java    |   4 +-
 .../camel/builder/endpoint/LogToDAdvancedTest.java |   4 +-
 .../NormalizedUriPropertyPlaceholderTest.java      |   6 +-
 .../camel/builder/endpoint/NormalizedUriTest.java  |   6 +-
 .../apache/camel/builder/endpoint/PahoTest.java    |   5 +-
 .../endpoint/ProcessorDefinitionDslTest.java       |   2 +-
 .../builder/endpoint/RabbitMQMultiValueTest.java   |   5 +-
 .../camel/builder/endpoint/TimerAdvancedTest.java  |   4 +-
 .../builder/endpoint/TimerNegativeDelayTest.java   |   2 +-
 core/camel-health/pom.xml                          |   4 +-
 .../health/DefaultHealthCheckRegistryTest.java     |  81 ++++++-----
 .../apache/camel/impl/health/HealthCheckTest.java  |  62 +++++----
 .../impl/health/ReadinessAndLivenessTest.java      |  29 ++--
 .../camel/impl/health/RouteHealthCheckTest.java    |   2 +-
 core/camel-main/pom.xml                            |  16 +--
 .../org/apache/camel/main/BaseMainSupport.java     |   4 +
 .../org/apache/camel/main/ContextEventsTest.java   |   7 +-
 .../java/org/apache/camel/main/MainBeansTest.java  |   9 +-
 .../camel/main/MainComponentConfigurationTest.java |   9 +-
 .../org/apache/camel/main/MainIoCAutowireTest.java |  11 +-
 .../MainIoCBeanConfigInjectConfigurerTest.java     |   7 +-
 .../camel/main/MainIoCBeanConfigInjectMapTest.java |   8 +-
 .../MainIoCBeanConfigInjectPropertiesTest.java     |   8 +-
 .../camel/main/MainIoCBeanConfigInjectTest.java    |   6 +-
 .../main/MainIoCNewRouteBuilderComplexTest.java    |   6 +-
 .../camel/main/MainIoCNewRouteBuilderTest.java     |   7 +-
 .../java/org/apache/camel/main/MainIoCTest.java    |  18 ++-
 .../org/apache/camel/main/MainListenerTest.java    |   7 +-
 .../apache/camel/main/MainLogPlaceholderTest.java  |   6 +-
 .../camel/main/MainPropertyPlaceholderTest.java    |  14 +-
 .../main/MainPropertyPlaceholderWithEnvTest.java   | 155 +++++++++++++++------
 .../MainPropertyPlaceholderWithSystemTest.java     |   6 +-
 .../apache/camel/main/MainRouteOrderedTest.java    |   6 +-
 .../main/MainRoutesCollectorPackageScanTest.java   |   7 +-
 .../apache/camel/main/MainRoutesCollectorTest.java |   7 +-
 .../java/org/apache/camel/main/MainSedaTest.java   |   8 +-
 .../apache/camel/main/MainSedaWildcardTest.java    |   8 +-
 ...gRouteControllerFilterFailToStartRouteTest.java |   7 +-
 .../main/MainSupervisingRouteControllerTest.java   |   8 +-
 .../camel/main/MainSupportCommandLineTest.java     |   3 +-
 .../test/java/org/apache/camel/main/MainTest.java  |  17 ++-
 .../org/apache/camel/main/MainThreadPoolTest.java  |   7 +-
 .../java/org/apache/camel/main/MainVetoTest.java   |   6 +-
 .../apache/camel/main/MainWithRestConfigTest.java  |   6 +-
 .../camel/main/ServicesAutoConfigurationTest.java  |   7 +-
 .../org/apache/camel/main/xml/MainXmlTest.java     |   7 +-
 core/camel-management/pom.xml                      |   4 +-
 .../component/controlbus/ControlBusStatsTest.java  |   5 +-
 .../LanguageLoadScriptFromFileCachedTest.java      |   6 +-
 .../component/xslt/ManagedXsltOutputBytesTest.java |   4 +-
 .../camel/component/xslt/XsltContentCacheTest.java |   6 +-
 .../DynamicRouterConvertBodyToIssueTest.java       |   6 +-
 .../camel/management/AddEventNotifierTest.java     |   8 +-
 .../camel/management/BacklogDebuggerTest.java      |  75 +++++-----
 .../camel/management/BacklogTracerFilterTest.java  |   9 +-
 .../management/BacklogTracerIdOnAllNodesTest.java  |   9 +-
 .../management/BacklogTracerPatternRouteTest.java  |   9 +-
 .../camel/management/BacklogTracerPatternTest.java |   9 +-
 .../management/BacklogTracerStreamCachingTest.java |  10 +-
 .../apache/camel/management/BacklogTracerTest.java |  26 ++--
 .../org/apache/camel/management/BigRouteTest.java  |   2 +-
 .../management/CamelChoiceWithManagementTest.java  |   6 +-
 .../management/CamelContextDisableJmxTest.java     |   7 +-
 .../management/DefaultManagementAgentMockTest.java |   6 +-
 .../DualManagedThreadPoolProfileTest.java          |   4 +-
 .../DualManagedThreadPoolWithIdTest.java           |   4 +-
 .../management/ExceptionWithManagementTest.java    |   2 +-
 .../JmxInstrumentationCustomMBeanTest.java         |  14 +-
 ...mxInstrumentationDisableOnCamelContextTest.java |  14 +-
 .../management/JmxInstrumentationDisableTest.java  |  14 +-
 ...ationOnlyRegisterProcessorWithCustomIdTest.java |  16 ++-
 .../JmxInstrumentationUsingDefaultsTest.java       |  75 +++++-----
 .../JmxInstrumentationUsingPlatformMBSTest.java    |  11 +-
 .../JmxInstrumentationUsingPropertiesTest.java     |   8 +-
 .../JmxNotificationEventNotifierTest.java          |   9 +-
 .../camel/management/JmxRecipientListTest.java     |  25 ++--
 .../org/apache/camel/management/LoadTimerTest.java |   4 +-
 .../apache/camel/management/LoadTripletTest.java   |  10 +-
 .../camel/management/LoggingEventNotifierTest.java |   4 +-
 .../management/ManagedAggregateControllerTest.java |   6 +-
 .../management/ManagedBeanIntrospectionTest.java   |  11 +-
 .../ManagedBrowsableEndpointAsXmlFileTest.java     |  11 +-
 .../ManagedBrowsableEndpointAsXmlTest.java         |   6 +-
 .../ManagedBrowsableEndpointEmptyTest.java         |   4 +-
 .../management/ManagedBrowsableEndpointTest.java   |   6 +-
 .../apache/camel/management/ManagedCBRTest.java    |  20 +--
 .../ManagedCamelContextAutoStartupTest.java        |   9 +-
 .../ManagedCamelContextDumpRoutesAsXmlTest.java    |   5 +-
 ...ManagedCamelContextDumpRoutesCoverageAsXml.java |   3 +
 .../ManagedCamelContextDumpStatsAsXmlTest.java     |   5 +-
 .../ManagedCamelContextNewProxyTest.java           |   4 +-
 .../ManagedCamelContextPropertiesTest.java         |   7 +-
 .../management/ManagedCamelContextRestartTest.java |  12 +-
 .../ManagedCamelContextSuspendResumeTest.java      |   8 +-
 .../ManagedCamelContextSuspendStartTest.java       |   8 +-
 .../camel/management/ManagedCamelContextTest.java  |  20 ++-
 ...ManagedCamelContextUpdateRoutesFromXmlTest.java |   4 +-
 ...RoutesWithPropertyPlaceholdersFromXmlPTest.java |   4 +-
 .../ManagedCanekContextExchangeStatisticsTest.java |   4 +-
 .../apache/camel/management/ManagedChoiceTest.java |   5 +-
 .../camel/management/ManagedComponentTest.java     |  12 +-
 .../camel/management/ManagedConsumerCacheTest.java |  10 +-
 .../camel/management/ManagedConvertBodyTest.java   |   4 +-
 .../camel/management/ManagedCustomBeanTest.java    |   4 +-
 .../management/ManagedCustomComponentNameTest.java |  12 +-
 .../management/ManagedCustomLoadBalancerTest.java  |   4 +-
 .../camel/management/ManagedCustomPolicyTest.java  |  11 +-
 .../management/ManagedCustomProcessorTest.java     |   4 +-
 .../camel/management/ManagedDataFormatTest.java    |   5 +-
 .../ManagedDefaultReactiveExecutorTest.java        |   7 +-
 .../camel/management/ManagedDelayerTest.java       |  14 +-
 .../management/ManagedDualCamelContextTest.java    |   9 +-
 .../camel/management/ManagedDuplicateIdTest.java   |   5 +-
 .../camel/management/ManagedDynamicRouterTest.java |   5 +-
 .../management/ManagedEndpointBaseUriTest.java     |   5 +-
 .../management/ManagedEndpointExplainTest.java     |   4 +-
 .../management/ManagedEndpointRegistryTest.java    |   8 +-
 .../camel/management/ManagedEndpointTest.java      |   4 +-
 .../ManagedEndpointUtilizationStatisticsTest.java  |   5 +-
 .../camel/management/ManagedEnricherTest.java      |   5 +-
 .../management/ManagedErrorHandlerOptionsTest.java |   6 +-
 .../ManagedErrorHandlerRedeliveryTest.java         |   7 +-
 .../camel/management/ManagedErrorHandlerTest.java  |   9 +-
 .../ManagedFailoverLoadBalancerTest.java           |   5 +-
 .../management/ManagedFileIdempotentClearTest.java |  12 +-
 .../ManagedFileIdempotentConsumerTest.java         |  12 +-
 .../apache/camel/management/ManagedFilterTest.java |   4 +-
 .../ManagedFromRestGetEmbeddedRouteTest.java       |   6 +-
 .../camel/management/ManagedFromRestGetTest.java   |   6 +-
 .../management/ManagedFromRestPlaceholderTest.java |   6 +-
 .../camel/management/ManagedHealthCheckTest.java   |   6 +-
 .../ManagedInflightRepositoryBrowseTest.java       |   5 +-
 .../management/ManagedInflightRepositoryTest.java  |   4 +-
 .../management/ManagedInflightStatisticsTest.java  |   6 +-
 .../management/ManagedInlinedProcessorTest.java    |   5 +-
 .../camel/management/ManagedInterceptFromTest.java |   2 +-
 .../camel/management/ManagedInterceptTest.java     |   4 +-
 .../camel/management/ManagedLoadBalancerTest.java  |   4 +-
 .../camel/management/ManagedLogEndpointTest.java   |   7 +-
 .../apache/camel/management/ManagedLoopTest.java   |   4 +-
 .../camel/management/ManagedMarshalTest.java       |   4 +-
 .../ManagedMemoryIdempotentClearTest.java          |  14 +-
 .../ManagedMemoryIdempotentConsumerTest.java       |  14 +-
 .../management/ManagedMessageHistoryTest.java      |  10 +-
 .../camel/management/ManagedMulticastTest.java     |   4 +-
 .../management/ManagedNamePatternFixedTest.java    |   7 +-
 .../ManagedNamePatternIncludeHostNameTest.java     |   6 +-
 .../ManagedNamePatternJvmSystemPropertyTest.java   |  15 +-
 .../camel/management/ManagedNamePatternTest.java   |   6 +-
 .../management/ManagedNonManagedServiceTest.java   |   4 +-
 .../camel/management/ManagedPollEnricherTest.java  |   5 +-
 .../camel/management/ManagedProcessTest.java       |   4 +-
 ...gedProducerRecipientListRegisterAlwaysTest.java |  11 +-
 .../ManagedProducerRecipientListTest.java          |   4 +-
 ...edProducerRouteAddRemoveRegisterAlwaysTest.java |   5 +-
 .../camel/management/ManagedProducerTest.java      |  11 +-
 .../management/ManagedRandomLoadBalancerTest.java  |   5 +-
 .../camel/management/ManagedRecipientListTest.java |   5 +-
 .../management/ManagedRedeliverRouteOnlyTest.java  |   4 +-
 .../camel/management/ManagedRedeliverTest.java     |   4 +-
 .../camel/management/ManagedRefProducerTest.java   |  15 +-
 .../ManagedRegisterCamelContextTest.java           |   4 +-
 .../management/ManagedRegisterEndpointTest.java    |   4 +-
 .../ManagedRegisterExchangeStatisticsTest.java     |   4 +-
 .../camel/management/ManagedRegisterRouteTest.java |  12 +-
 .../management/ManagedRegisterTwoRoutesTest.java   |   5 +-
 .../ManagedRemoveRouteAggregateThreadPoolTest.java |   9 +-
 .../camel/management/ManagedResequencerTest.java   |   4 +-
 .../ManagedResetIncludeProcessorsTest.java         |   4 +-
 .../management/ManagedResetIncludeRoutesTest.java  |   4 +-
 .../camel/management/ManagedResourceTest.java      |  23 +--
 .../camel/management/ManagedRestRegistryTest.java  |   9 +-
 .../ManagedRoundRobinLoadBalancerTest.java         |   4 +-
 .../management/ManagedRouteAddFromRouteTest.java   |   8 +-
 .../management/ManagedRouteAddRemoveTest.java      |   9 +-
 ...outeAddSecondRouteNotRegisterNewRoutesTest.java |   9 +-
 .../management/ManagedRouteAddSecondRouteTest.java |   8 +-
 .../management/ManagedRouteAutoStartupTest.java    |   7 +-
 .../ManagedRouteDirectWhileIssueLeakTest.java      |   5 +-
 .../ManagedRouteDumpRouteAsXmlPlaceholderTest.java |   6 +-
 .../management/ManagedRouteDumpRouteAsXmlTest.java |   6 +-
 ...DumpStatsAsXmlAndResetWithCustomDomainTest.java |   5 +-
 ...ManagedRouteDumpStatsAsXmlCustomDomainTest.java |   5 +-
 .../management/ManagedRouteDumpStatsAsXmlTest.java |   5 +-
 .../management/ManagedRouteGetPropertiesTest.java  |   6 +-
 .../management/ManagedRouteLoadstatisticsTest.java |   6 +-
 .../management/ManagedRouteNoAutoStartupTest.java  |  15 +-
 .../ManagedRoutePerformanceCounterTest.java        |  14 +-
 ...edRouteRemoveContextScopedErrorHandlerTest.java |  11 +-
 ...emoveRouteAndContextScopedErrorHandlerTest.java |  17 ++-
 ...agedRouteRemoveRouteScopedErrorHandlerTest.java |  11 +-
 .../camel/management/ManagedRouteRemoveTest.java   |  15 +-
 ...edRouteRemoveWireTapExplicitThreadPoolTest.java |  17 ++-
 .../management/ManagedRouteRemoveWireTapTest.java  |  16 ++-
 .../camel/management/ManagedRouteRestartTest.java  |  14 +-
 .../ManagedRouteShutdownAndStartTest.java          |  13 +-
 .../ManagedRouteStopAndStartCleanupTest.java       |  21 +--
 .../management/ManagedRouteStopAndStartTest.java   |  14 +-
 .../camel/management/ManagedRouteStopTest.java     |  14 +-
 .../ManagedRouteStopUsingMBeanAPITest.java         |   8 +-
 .../ManagedRouteStopWithAbortAfterTimeoutTest.java |  20 +--
 .../ManagedRouteSuspendAndResumeTest.java          |  15 +-
 .../ManagedRouteUpdateRouteFromXmlTest.java        |   5 +-
 .../ManagedRouteWithOnExceptionTest.java           |   5 +-
 .../camel/management/ManagedRoutingSlipTest.java   |   5 +-
 .../camel/management/ManagedSanitizeTest.java      |   7 +-
 .../ManagedScheduledPollConsumerTest.java          |  10 +-
 .../camel/management/ManagedSedaEndpointTest.java  |   7 +-
 .../management/ManagedSedaRouteRemoveTest.java     |  16 ++-
 .../ManagedSendDynamicProcessorTest.java           |   7 +-
 .../camel/management/ManagedSendProcessorTest.java |   5 +-
 ...ManagedSetAndRemoveHeaderAndPropertiesTest.java |  19 +--
 .../management/ManagedShutdownStrategyTest.java    |   4 +-
 .../camel/management/ManagedSplitterTest.java      |   5 +-
 .../camel/management/ManagedStartupFailedTest.java |   7 +-
 .../management/ManagedStatisticsDisabledTest.java  |   4 +-
 .../management/ManagedStatisticsLevelOffTest.java  |   4 +-
 .../ManagedStatisticsLevelRoutesOnlyTest.java      |   4 +-
 .../camel/management/ManagedStatisticsTest.java    |   5 +-
 .../ManagedStatisticsWithSplitterTest.java         |   4 +-
 .../apache/camel/management/ManagedStepTest.java   |   6 +-
 .../management/ManagedStickyLoadBalancerTest.java  |   7 +-
 .../ManagedStreamCachingStrategyTest.java          |   7 +-
 .../ManagedSupervisingRouteControllerTest.java     |   5 +-
 .../management/ManagedSuspendedServiceTest.java    |  14 +-
 .../management/ManagedThreadPoolProfileTest.java   |   4 +-
 .../camel/management/ManagedThreadPoolTest.java    |   6 +-
 .../management/ManagedThreadPoolWithIdTest.java    |   4 +-
 .../camel/management/ManagedThreadsTest.java       |   4 +-
 .../camel/management/ManagedThrottlerTest.java     |  10 +-
 .../ManagedThrottlingExceptionRoutePolicyTest.java |   8 +-
 .../ManagedThrottlingInflightRoutePolicyTest.java  |  12 +-
 .../apache/camel/management/ManagedTimerTest.java  |   8 +-
 .../management/ManagedTopicLoadBalancerTest.java   |   4 +-
 .../apache/camel/management/ManagedTracerTest.java |  10 +-
 .../management/ManagedTransformerRegistryTest.java |   9 +-
 .../ManagedTypeConverterRegistryTest.java          |  18 ++-
 .../camel/management/ManagedUnmarshalTest.java     |   4 +-
 .../ManagedUnregisterCamelContextTest.java         |  12 +-
 .../management/ManagedUnregisterComponentTest.java |  12 +-
 .../management/ManagedUnregisterConsumerTest.java  |  10 +-
 .../management/ManagedUnregisterEndpointTest.java  |  12 +-
 .../management/ManagedUnregisterProcessorTest.java |   7 +-
 .../management/ManagedUnregisterProducerTest.java  |  10 +-
 .../management/ManagedUnregisterRouteTest.java     |  10 +-
 .../management/ManagedValidatorRegistryTest.java   |   8 +-
 .../ManagedWeightedLoadBalancerTest.java           |   4 +-
 .../camel/management/ManagedWireTapTest.java       |   6 +-
 .../management/MultiInstanceProcessorTest.java     |  12 +-
 .../camel/management/PublishEventNotifierTest.java |   4 +-
 .../PublishEventNotifierToRouteTest.java           |   4 +-
 .../camel/management/RemoveEventNotifierTest.java  |   8 +-
 .../management/RemoveRouteDefinitionTest.java      |  11 +-
 ...nagedCamelContextAutoAssignedNameClashTest.java |  18 +--
 .../TwoManagedCamelContextClashTest.java           |  33 +++--
 .../management/TwoManagedCamelContextTest.java     |  17 ++-
 .../management/TwoManagedNamePatternTest.java      |  17 ++-
 .../apache/camel/processor/NoErrorHandlerTest.java |   8 +-
 ...StacksNeededDuringRoutingSendProcessorTest.java |   2 +-
 .../ReduceStacksNeededDuringRoutingTest.java       |   2 +-
 .../processor/async/AsyncEndpointWithJMXTest.java  |   7 +-
 .../org/apache/camel/support/ResourceHelper.java   |   4 +-
 core/camel-util/pom.xml                            |   4 +-
 .../org/apache/camel/util/AntPathMatcherTest.java  |   9 +-
 .../org/apache/camel/util/CamelURIParserTest.java  |  10 +-
 .../apache/camel/util/CollectionHelperTest.java    |   8 +-
 .../camel/util/CollectionStringBufferTest.java     |   8 +-
 .../java/org/apache/camel/util/IOHelperTest.java   |   8 +-
 .../java/org/apache/camel/util/OgnlHelperTest.java |   9 +-
 .../apache/camel/util/OrderedPropertiesTest.java   |   7 +-
 .../org/apache/camel/util/StringHelperTest.java    |   7 +-
 .../java/org/apache/camel/util/URISupportTest.java |  18 +--
 .../java/org/apache/camel/util/UnitUtilsTest.java  |   6 +-
 .../org/apache/camel/util/backoff/BackOffTest.java |  45 +++---
 .../camel/util/backoff/BackOffTimerTest.java       |  42 +++---
 .../concurrent/AsyncCompletionServiceTest.java     |  17 ++-
 .../SizedScheduledExecutorServiceTest.java         |  13 +-
 .../SubmitOrderedCompletionServiceTest.java        |  16 ++-
 .../concurrent/SynchronousExecutorServiceTest.java |  12 +-
 .../apache/camel/util/function/PredicatesTest.java |  17 ++-
 core/camel-xml-io/pom.xml                          |   4 +-
 .../org/apache/camel/xml/in/ModelParserTest.java   |   4 +-
 core/camel-xml-jaxp/pom.xml                        |   4 +-
 .../language/xtokenizer/AttributedQNameTest.java   |   8 +-
 .../XMLTokenExpressionIteratorCharsetTest.java     |  11 +-
 .../XMLTokenExpressionIteratorGroupingTest.java    |  15 +-
 .../XMLTokenExpressionIteratorInvalidXMLTest.java  |  12 +-
 .../xtokenizer/XMLTokenExpressionIteratorTest.java |  15 +-
 .../camel/util/xml/XmlLineNumberParserTest.java    |   8 +-
 .../interceptor/AdviceWithMockEndpointsTest.java   |   5 +-
 ...dviceWithMockMultipleEndpointsWithSkipTest.java |   4 +-
 .../apache/camel/spring/patterns/FilterTest.java   |   2 +-
 .../org/apache/camel/processor/FilterTest.java     |   2 +-
 .../management/ManagedCustomProcessorTest.java     |   4 +-
 tooling/camel-util-json/pom.xml                    |   6 +-
 .../camel/util/json/JsonSimpleOrderedTest.java     |  14 +-
 .../generator/openapi/RestDslGeneratorTest.java    |   2 -
 .../generator/openapi/RestDslGeneratorV3Test.java  |   2 -
 2954 files changed, 11765 insertions(+), 7307 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[camel] 01/21: Remove unused imports in tests

gnodet
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit d497a94a1657960cf6dcafd76fce7230eb2ad023
Author: Guillaume Nodet <[hidden email]>
AuthorDate: Thu May 28 23:02:42 2020 +0200

    Remove unused imports in tests
---
 .../apache/camel/component/freemarker/FreemarkerSetHeaderTest.java    | 1 -
 .../faulttolerance/FaultToleranceRefConfigurationTest.java            | 3 ---
 .../faulttolerance/FaultToleranceRouteBulkheadFallbackTest.java       | 1 -
 .../faulttolerance/FaultToleranceTimeoutWithFallbackTest.java         | 1 -
 .../spring/security/AbstractSpringSecurityBearerTokenTest.java        | 1 -
 .../component/undertow/UndertowComponentVerifierExtensionTest.java    | 1 -
 .../camel/component/undertow/UndertowComponentVerifierTest.java       | 1 -
 .../camel/component/undertow/spi/AbstractSecurityProviderTest.java    | 1 -
 .../component/undertow/spi/SecurityProviderNoAcceptanceTest.java      | 1 -
 .../org/apache/camel/component/velocity/VelocitySetHeaderTest.java    | 1 -
 .../camel/component/zookeepermaster/MasterEndpointFailoverTest.java   | 1 -
 .../java/org/apache/camel/component/timer/TimerDelaySecondsTest.java  | 1 -
 .../java/org/apache/camel/component/vm/AbstractVmTestSupport.java     | 1 -
 .../test/java/org/apache/camel/processor/WireTapAbortPolicyTest.java  | 1 -
 .../apache/camel/processor/aggregator/AbstractDistributedTest.java    | 1 -
 .../processor/aggregator/SplitAggregateStackOverflowIssueTest.java    | 1 -
 .../src/test/java/org/apache/camel/util/MessageHelperTest.java        | 4 ----
 .../org/apache/camel/management/ManagedRouteWithOnExceptionTest.java  | 1 -
 .../java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java | 2 --
 .../org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java    | 2 --
 20 files changed, 27 deletions(-)

diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerSetHeaderTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerSetHeaderTest.java
index 27f98a0..487eb0c 100644
--- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerSetHeaderTest.java
+++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerSetHeaderTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.freemarker;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationTest.java b/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationTest.java
index 21c44c9..ada8e28 100644
--- a/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationTest.java
+++ b/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRefConfigurationTest.java
@@ -20,11 +20,8 @@ import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.FaultToleranceConfigurationDefinition;
-import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spi.CircuitBreakerConstants;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
diff --git a/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadFallbackTest.java b/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadFallbackTest.java
index d183858..9fb13ed 100644
--- a/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadFallbackTest.java
+++ b/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceRouteBulkheadFallbackTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.microprofile.faulttolerance;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.CircuitBreakerConstants;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class FaultToleranceRouteBulkheadFallbackTest extends CamelTestSupport {
diff --git a/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutWithFallbackTest.java b/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutWithFallbackTest.java
index 3185225..43f954f 100644
--- a/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutWithFallbackTest.java
+++ b/components/camel-microprofile-fault-tolerance/src/test/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceTimeoutWithFallbackTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.microprofile.faulttolerance;
 import org.apache.camel.RoutesBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java b/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java
index 3102ffd..2d5b68a 100644
--- a/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java
+++ b/components/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java
@@ -32,7 +32,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.component.spring.security.keycloak.KeycloakRealmRoleConverter;
 import org.apache.camel.component.spring.security.keycloak.KeycloakUsernameSubClaimAdapter;
 import org.apache.camel.component.undertow.UndertowComponent;
-import org.apache.camel.component.undertow.spi.UndertowSecurityProvider;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.BeforeClass;
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtensionTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtensionTest.java
index 973fa0a..606f0a6 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtensionTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtensionTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.undertow;
 
 import java.net.UnknownHostException;
-import java.nio.channels.UnresolvedAddressException;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierTest.java
index bc24a39..9ef541b 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.undertow;
 
 import java.net.UnknownHostException;
-import java.nio.channels.UnresolvedAddressException;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/AbstractSecurityProviderTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/AbstractSecurityProviderTest.java
index 86abde6..030a374 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/AbstractSecurityProviderTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/AbstractSecurityProviderTest.java
@@ -20,7 +20,6 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.Writer;
 import java.net.URL;
-import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java
index dbb0763..45d0d96 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
 import org.apache.camel.http.base.HttpOperationFailedException;
-import org.junit.Assert;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java
index d208e87..24ccfd3 100644
--- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java
+++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.velocity;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
index 0e8bcea..c5d7072 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.support.service.ServiceHelper;
 import org.apache.curator.framework.CuratorFramework;
 import org.junit.After;
 import org.junit.Before;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerDelaySecondsTest.java b/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerDelaySecondsTest.java
index dd777c8..8148f42 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerDelaySecondsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerDelaySecondsTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.timer;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class TimerDelaySecondsTest extends ContextTestSupport {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/vm/AbstractVmTestSupport.java b/core/camel-core/src/test/java/org/apache/camel/component/vm/AbstractVmTestSupport.java
index 04a3208..d2899b5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/vm/AbstractVmTestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/vm/AbstractVmTestSupport.java
@@ -22,7 +22,6 @@ import org.apache.camel.ProducerTemplate;
 import org.apache.camel.Service;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.service.ServiceHelper;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapAbortPolicyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapAbortPolicyTest.java
index 80cbd90..6673754 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapAbortPolicyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapAbortPolicyTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.processor;
 
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.RejectedExecutionException;
 
 import org.apache.camel.ContextTestSupport;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AbstractDistributedTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AbstractDistributedTest.java
index 62d9d7c..0476066 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AbstractDistributedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AbstractDistributedTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.service.ServiceHelper;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java
index efb97dd..c67979f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.GroupedBodyAggregationStrategy;
-import org.junit.Ignore;
 import org.junit.Test;
 
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java b/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
index 34ed925..ed64e23 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
@@ -18,12 +18,8 @@ package org.apache.camel.util;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.StringReader;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteWithOnExceptionTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteWithOnExceptionTest.java
index ca1b841..0ce9238 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteWithOnExceptionTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteWithOnExceptionTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.management;
 
 import org.apache.camel.CamelExecutionException;
-import org.apache.camel.api.management.JmxSystemPropertyKeys;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java
index 3bd3f3b..334bec2 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java
@@ -16,10 +16,8 @@
  */
 package org.apache.camel.generator.openapi;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java
index 98e137e..45ad5c6 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java
@@ -16,10 +16,8 @@
  */
 package org.apache.camel.generator.openapi;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;

Reply | Threaded
Open this post in threaded view
|

[camel] 02/21: [CAMEL-11807] Upgrade camel-core to junit5

gnodet
In reply to this post by gnodet
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 20d531fac30d2a3e89d4b588e4dc37a97d6b1e5d
Author: Guillaume Nodet <[hidden email]>
AuthorDate: Fri May 29 09:09:59 2020 +0200

    [CAMEL-11807] Upgrade camel-core to junit5
---
 core/camel-core/pom.xml                            |  21 ++--
 .../java/org/apache/camel/AutoCloseableTest.java   |   2 +-
 .../java/org/apache/camel/CamelExceptionsTest.java |   6 +-
 .../java/org/apache/camel/ContextTestSupport.java  |  22 ++--
 .../java/org/apache/camel/ExchangeTestSupport.java |   6 +-
 .../org/apache/camel/InjectorDefaultsTest.java     |   4 +-
 .../java/org/apache/camel/LanguageTestSupport.java |   7 +-
 .../java/org/apache/camel/LoggingLevelTest.java    |   8 +-
 .../apache/camel/PropertyBindingExceptionTest.java |  12 +--
 .../org/apache/camel/SuspendableServiceTest.java   |   7 +-
 .../test/java/org/apache/camel/TestSupport.java    |  91 +++++++++-------
 .../apache/camel/ThreadPoolRejectedPolicyTest.java |   6 +-
 .../camel/builder/AddRoutesAtRuntimeTest.java      |   4 +-
 .../camel/builder/BuilderWithScopesTest.java       |   4 +-
 .../camel/builder/ContextErrorHandlerTest.java     |  18 ++--
 .../org/apache/camel/builder/ErrorHandlerTest.java |  34 +++---
 .../apache/camel/builder/ExceptionBuilderTest.java |  23 ++--
 .../ExceptionBuilderWithHandledExceptionTest.java  |   8 +-
 .../apache/camel/builder/ExchangeBuilderTest.java  |   7 +-
 .../camel/builder/ExpressionBuilderTest.java       |  23 ++--
 .../camel/builder/ExpressionFunctionTest.java      |   2 +-
 .../camel/builder/FluentProducerTemplateTest.java  |  13 ++-
 .../camel/builder/NotifyBuilderFromRouteTest.java  |   4 +-
 .../apache/camel/builder/NotifyBuilderTest.java    |   5 +-
 .../builder/NotifyBuilderWhenDoneByIndexTest.java  |   4 +-
 .../builder/PredicateBinaryCoerceRouteTest.java    |   2 +-
 .../builder/PredicateBinaryCoerceTypeTest.java     |   6 +-
 .../builder/PredicateBuilderConcurrentTest.java    |   8 +-
 .../apache/camel/builder/PredicateBuilderTest.java |   7 +-
 .../ProxyBuilderSkipJavaLangObjectMethodsTest.java |   4 +-
 .../org/apache/camel/builder/ProxyBuilderTest.java |   6 +-
 .../RouteBuilderAddRoutesOnlyInterceptTest.java    |   2 +-
 .../camel/builder/RouteBuilderAddRoutesTest.java   |   2 +-
 .../org/apache/camel/builder/RouteBuilderTest.java |  68 ++++++------
 .../apache/camel/builder/SimpleBuilderTest.java    |   4 +-
 .../camel/builder/ThreadPoolBuilderTest.java       |   5 +-
 .../camel/builder/TransformerBuilderTest.java      |   5 +-
 .../org/apache/camel/builder/ValueBuilderTest.java |   2 +-
 .../builder/xml/DefaultNamespaceContextTest.java   |   4 +-
 .../builder/xml/ExtractXPathWithNamespaceTest.java |   4 +-
 .../builder/xml/XPathContentBasedRouterTest.java   |   2 +-
 .../apache/camel/builder/xml/XPathFeatureTest.java |  17 +--
 .../camel/builder/xml/XPathFunctionsTest.java      |   2 +-
 .../XPathHeaderNameResultTypeAndNamespaceTest.java |   2 +-
 .../camel/builder/xml/XPathHeaderNameTest.java     |   2 +-
 .../apache/camel/builder/xml/XPathHeaderTest.java  |   2 +-
 .../apache/camel/builder/xml/XPathMockTest.java    |   2 +-
 .../camel/builder/xml/XPathNamespaceTest.java      |   2 +-
 .../builder/xml/XPathNestedNamespaceTest.java      |   2 +-
 .../org/apache/camel/builder/xml/XPathTest.java    |   3 +-
 .../camel/builder/xml/XPathTransformRouteTest.java |   2 +-
 .../camel/builder/xml/XPathTransformTest.java      |  14 ++-
 .../xml/XPathWithNamespacesFromDomTest.java        |   9 +-
 .../apache/camel/builder/xml/XsltBuilderTest.java  |  14 +--
 .../camel/builder/xml/XsltOutputFileTest.java      |   4 +-
 .../org/apache/camel/builder/xml/XsltTest.java     |   2 +-
 .../camel/builder/xml/XsltUriResolverTest.java     |   8 +-
 .../camel/catalog/RuntimeCamelCatalogTest.java     |  10 +-
 .../camel/cluster/ClusterServiceSelectorTest.java  |  62 +++++------
 .../camel/cluster/ClusterServiceViewTest.java      |  65 ++++++------
 ...AmbiguousMethodCallExceptionSimplifiedTest.java |   2 +-
 .../component/bean/BeanByteArrayBodyTest.java      |   2 +-
 ...seMethodWithMatchingTypeAndSkipSettersTest.java |   6 +-
 .../bean/BeanComponentMissingParenthesisTest.java  |   5 +-
 ...entWithPropertiesLookupSetFromEndpointTest.java |   2 +-
 .../camel/component/bean/BeanConcurrentTest.java   |   4 +-
 .../bean/BeanCreateBodyExceptionTest.java          |   4 +-
 .../camel/component/bean/BeanEndpointTest.java     |   5 +-
 .../BeanExchangeAsReturnTypeNotAllowedTest.java    |   8 +-
 .../component/bean/BeanExcludedMethodTest.java     |   6 +-
 .../bean/BeanExplicitMethodAmbiguousTest.java      |   5 +-
 .../component/bean/BeanExplicitMethodTest.java     |   2 +-
 .../bean/BeanExpressionConcurrentTest.java         |   4 +-
 .../bean/BeanHandlerMethodPredicateTest.java       |   2 +-
 .../component/bean/BeanHandlerMethodTest.java      |   4 +-
 .../component/bean/BeanImplicitMethodTest.java     |   4 +-
 .../camel/component/bean/BeanInPipelineTest.java   |   4 +-
 .../bean/BeanInfoAMoreComplexOverloadedTest.java   |   5 +-
 .../component/bean/BeanInfoInheritanceTest.java    |   4 +-
 .../component/bean/BeanInfoOverloadedTest.java     |   4 +-
 .../BeanInfoOverloadedWithSubTypeParamTest.java    |   7 +-
 .../component/bean/BeanInfoSelectMethodTest.java   |   4 +-
 .../apache/camel/component/bean/BeanInfoTest.java  |  33 +++---
 .../bean/BeanInfoWithBridgedMethodTest.java        |   5 +-
 .../camel/component/bean/BeanInvokeAsyncTest.java  |  19 ++--
 .../BeanInvokeSimpleOgnlToStringMethodTest.java    |   2 +-
 .../bean/BeanInvokeSingleMethodNoBodyTest.java     |   2 +-
 .../camel/component/bean/BeanInvokeStaticTest.java |   5 +-
 .../camel/component/bean/BeanInvokeTest.java       |   2 +-
 .../bean/BeanInvokeToStringMethodTest.java         |   2 +-
 .../component/bean/BeanInvokeWithNullBodyTest.java |   2 +-
 .../camel/component/bean/BeanLifecycleTest.java    |  12 ++-
 .../bean/BeanLookupUsingJndiRegistryIssueTest.java |   7 +-
 .../camel/component/bean/BeanMapPutTest.java       |   4 +-
 .../camel/component/bean/BeanMethodBeanTest.java   |   5 +-
 .../bean/BeanMethodNameHeaderIssueTest.java        |   2 +-
 .../bean/BeanMethodValueWithCommaTest.java         |   2 +-
 .../bean/BeanMethodValueWithExchangeTest.java      |   2 +-
 ...rameterAndNoMethodWithNoParameterIssueTest.java |   5 +-
 .../bean/BeanMethodWithStringParameterTest.java    |   2 +-
 .../camel/component/bean/BeanNoCacheTest.java      |   2 +-
 .../bean/BeanNoTypeConvertionPossibleTest.java     |   4 +-
 ...BeanNoTypeConvertionPossibleWhenHeaderTest.java |   4 +-
 .../BeanOgnlBodyMethodReturnNullValueTest.java     |   4 +-
 .../component/bean/BeanOgnlPerformanceTest.java    |   2 +-
 .../component/bean/BeanOnglStaticMethodTest.java   |   2 +-
 .../bean/BeanOverloadedCovariantMethodTest.java    |   2 +-
 .../bean/BeanOverloadedMethodFQNTest.java          |   5 +-
 .../BeanOverloadedMethodParameterValueTest.java    |   2 +-
 .../component/bean/BeanOverloadedMethodTest.java   |   5 +-
 .../bean/BeanOverloadsWithAssignableParamTest.java |   2 +-
 .../bean/BeanPackageScopeOutsideTest.java          |   2 +-
 .../camel/component/bean/BeanPackageScopeTest.java |   2 +-
 .../BeanParameterBindingStreamCachingTest.java     |   2 +-
 .../component/bean/BeanParameterInfoTest.java      |   4 +-
 .../bean/BeanParameterInvalidSyntaxTest.java       |   5 +-
 .../bean/BeanParameterInvalidValueTest.java        |   4 +-
 .../BeanParameterMethodCallThreeBodyOgnlTest.java  |   4 +-
 .../bean/BeanParameterNoBeanBindingTest.java       |   5 +-
 .../bean/BeanParameterThreeBodyOgnlTest.java       |   4 +-
 .../component/bean/BeanParameterValueOgnlTest.java |   2 +-
 .../bean/BeanParameterValueOverloadedTest.java     |   2 +-
 .../component/bean/BeanParameterValueTest.java     |   2 +-
 .../camel/component/bean/BeanPerformanceTest.java  |   4 +-
 .../camel/component/bean/BeanPipelineTest.java     |   5 +-
 .../BeanPrivateClassWithInterfaceMethodTest.java   |   2 +-
 .../component/bean/BeanPropagateHeaderTest.java    |   4 +-
 .../component/bean/BeanProxyNoBindingTest.java     |   4 +-
 .../apache/camel/component/bean/BeanProxyTest.java |   4 +-
 .../component/bean/BeanRefMethodNotFoundTest.java  |   5 +-
 .../camel/component/bean/BeanRefNoCacheTest.java   |   2 +-
 .../camel/component/bean/BeanRefNotFoundTest.java  |   5 +-
 .../camel/component/bean/BeanRegistryBeanTest.java |   4 +-
 .../bean/BeanReturnCallableReturnNullTest.java     |   2 +-
 .../component/bean/BeanReturnCallableTest.java     |   2 +-
 .../camel/component/bean/BeanReturnNullTest.java   |   4 +-
 .../BeanSimpleLanguageStaticMethodIssueTest.java   |   2 +-
 .../camel/component/bean/BeanStaticMethodTest.java |   2 +-
 .../bean/BeanWithAnnotationAndExchangeTest.java    |   4 +-
 .../bean/BeanWithAnnotationInheritedTest.java      |   2 +-
 .../BeanWithExchangeExceptionAnnotationTest.java   |   5 +-
 ...ngeExceptionAnnotationWrappedExceptionTest.java |   3 +
 .../BeanWithExpressionInjectionPredicateTest.java  |   4 +-
 .../bean/BeanWithExpressionInjectionTest.java      |   8 +-
 .../camel/component/bean/BeanWithHeaderTest.java   |   2 +-
 .../bean/BeanWithHeadersAndBodyInject2Test.java    |  10 +-
 .../bean/BeanWithHeadersAndBodyInject3Test.java    |   5 +-
 .../bean/BeanWithHeadersAndBodyInjectionTest.java  |  12 ++-
 .../bean/BeanWithInputStreamBodyTest.java          |   2 +-
 .../component/bean/BeanWithMethodHeaderTest.java   |   6 +-
 ...thPropertiesAndHeadersAndBodyInjectionTest.java |  21 ++--
 .../BeanWithPropertiesAndHeadersInjectionTest.java |  17 +--
 ...BeanWithXPathInjectionUsingHeaderValueTest.java |  10 +-
 .../BeanWithXPathInjectionUsingResultTypeTest.java |   8 +-
 .../BodyAnnotationToDisambiguateMethodsTest.java   |   7 +-
 .../ClassComponentInvalidConfigurationTest.java    |   4 +-
 .../camel/component/bean/ClassComponentTest.java   |   2 +-
 ...entWithPropertiesLookupSetFromEndpointTest.java |   2 +-
 ...ComponentWithPropertiesSetFromEndpointTest.java |   2 +-
 .../bean/CustomParameterMappingStrategyTest.java   |   2 +-
 .../bean/DefaultParameterMappingStrategyTest.java  |   5 +-
 ...ressionAnnotationToDisambiguateMethodsTest.java |   9 +-
 .../bean/FileBeanParameterBindingTest.java         |  12 ++-
 .../bean/MethodCallBeanRefMethodNotFoundTest.java  |   5 +-
 .../bean/MethodCallBeanRefNotFoundTest.java        |   5 +-
 .../bean/MethodCallMissingParenthesisTest.java     |   5 +-
 .../bean/MethodCallRefOrBeanPrefixTest.java        |   2 +-
 .../component/bean/MethodCallStaticMethodTest.java |   2 +-
 .../MethodNotFoundExceptionSimplifiedTest.java     |   2 +-
 .../component/bean/MyAuditServiceProxyTest.java    |   2 +-
 .../camel/component/bean/MyCurrencyBeanTest.java   |   2 +-
 .../camel/component/bean/MyServiceProxyTest.java   |   9 +-
 .../camel/component/bean/NewInstanceTest.java      |   2 +-
 .../camel/component/bean/PredicateAsBeanTest.java  |   6 +-
 .../bean/ProxyReturnFutureExceptionTest.java       |   5 +-
 .../component/bean/ProxyReturnFutureListTest.java  |  11 +-
 .../component/bean/ProxyReturnFutureTest.java      |   4 +-
 .../bean/RequestScopedBeanComponentTest.java       |   2 +-
 .../component/bean/RouteMethodCallStaticTest.java  |   2 +-
 .../SimpleLanguageBeanBodyParenthesisTest.java     |   2 +-
 ...nguageBeanFunctionMethodValueWithCommaTest.java |   2 +-
 ...BeanFunctionMethodValueWithParenthesisTest.java |   2 +-
 .../bean/issues/BeanAbstractMethodIssueTest.java   |   2 +-
 .../issues/BeanInfoSingleMethodServiceTest.java    |   4 +-
 .../BeanParameterBestTypeMatchIssueTest.java       |   2 +-
 .../bean/issues/BeanRouteToDerivedClassTest.java   |  18 ++--
 .../bean/issues/BeanThisAdviceWithIssueTest.java   |   2 +-
 .../issues/BeanVsProcessorPerformanceTest.java     |   4 +-
 ...efaultMethodCalledFromSimpleExpressionTest.java |   2 +-
 .../issues/FilterBeanLanguageNonRegistryTest.java  |   2 +-
 .../bean/issues/FilterBeanNonRegistryTest.java     |   2 +-
 .../bean/issues/FilterBeanRegistryTest.java        |   2 +-
 .../component/bean/issues/FilterPojoIssueTest.java |   2 +-
 .../bean/issues/TransformerIssueTest.java          |   2 +-
 .../pojomessage/PojoProxyHelperOneWayTest.java     |   4 +-
 .../PojoProxyHelperRequestReplyTest.java           |   4 +-
 .../camel/component/browse/BrowseEndpointTest.java |   4 +-
 .../component/browse/BrowseRouteConsumeTest.java   |   2 +-
 .../camel/component/browse/BrowseRouteTest.java    |   2 +-
 .../apache/camel/component/browse/BrowseTest.java  |   8 +-
 .../ControlBusLanguageSimpleStartRouteTest.java    |   4 +-
 .../controlbus/ControlBusRestartRouteTest.java     |   4 +-
 .../controlbus/ControlBusStartRouteAsyncTest.java  |   7 +-
 .../controlbus/ControlBusStartRouteTest.java       |   5 +-
 .../camel/component/dataset/BigDataSetTest.java    |   6 +-
 .../camel/component/dataset/CustomDataSetTest.java |   2 +-
 .../component/dataset/DataSetConsumerTest.java     |  10 +-
 .../component/dataset/DataSetEndpointTest.java     |  23 ++--
 .../component/dataset/DataSetPreloadTest.java      |   9 +-
 .../component/dataset/DataSetProducerTest.java     |  13 +--
 .../camel/component/dataset/DataSetSedaTest.java   |   2 +-
 .../camel/component/dataset/DataSetTest.java       |   2 +-
 .../component/dataset/DataSetTestAnyOrderTest.java |   2 +-
 .../component/dataset/DataSetTestEndpointTest.java |   2 +-
 .../dataset/DataSetTestFileSplitTest.java          |  10 +-
 .../component/dataset/DataSetTestFileTest.java     |  10 +-
 .../component/dataset/DataSetTestSedaTest.java     |   2 +-
 .../component/dataset/FileDataSetConsumerTest.java |  11 +-
 .../dataset/FileDataSetConsumerWithSplitTest.java  |  11 +-
 .../component/dataset/FileDataSetProducerTest.java |  27 ++---
 .../dataset/FileDataSetProducerWithSplitTest.java  |  27 ++---
 .../component/dataset/ListDataSetConsumerTest.java |   6 +-
 .../component/dataset/ListDataSetProducerTest.java |   6 +-
 .../component/dataset/RoutePerformanceTest.java    |   2 +-
 .../direct/DirectEndpointRouteInlinedTest.java     |   5 +-
 .../camel/component/direct/DirectEndpointTest.java |   2 +-
 .../component/direct/DirectNoConsumerTest.java     |   4 +-
 .../direct/DirectNoMultipleConsumersTest.java      |   4 +-
 .../camel/component/direct/DirectNoToTypeTest.java |   4 +-
 .../direct/DirectProducerBlockingTest.java         |   5 +-
 .../camel/component/direct/DirectQueueTest.java    |   2 +-
 .../camel/component/direct/DirectRouteTest.java    |   9 +-
 .../direct/DirectShouldUseSameThreadTest.java      |   4 +-
 .../SendToNonExistingDirectEndpointTest.java       |   5 +-
 ...SendingToAlotOfDifferentDirectEndpointTest.java |   2 +-
 .../direct/TwoCamelContextDirectEndpointTest.java  |  15 +--
 .../directvm/AbstractDirectVmTestSupport.java      |   8 +-
 .../directvm/DirectVmConsumerExpressionTest.java   |  10 +-
 .../directvm/DirectVmHeaderFilterStrategyTest.java |   5 +-
 .../component/directvm/DirectVmNoConsumerTest.java |   4 +-
 ...DirectVmNoPropertyPropagationComponentTest.java |   4 +-
 .../DirectVmNoPropertyPropagationTest.java         |   5 +-
 .../directvm/DirectVmProducerBlockingTest.java     |   5 +-
 .../directvm/DirectVmShouldUseSameThreadTest.java  |   4 +-
 .../DirectVmTwoCamelContextAdviceWithTest.java     |   2 +-
 ...rectVmTwoCamelContextDuplicateConsumerTest.java |   5 +-
 .../directvm/DirectVmTwoCamelContextTest.java      |   4 +-
 .../extension/verifier/ComponentVerifierTest.java  |  23 ++--
 .../file/AntPathMatcherGenericFileFilterTest.java  |   6 +-
 .../camel/component/file/BeanToFileTest.java       |   2 +-
 .../file/ConsumerTemplateFileShutdownTest.java     |   5 +-
 .../component/file/DirectoryCreateIssueTest.java   |   8 +-
 .../file/FileAbsoluteAndRelativeConsumerTest.java  |   6 +-
 .../component/file/FileAbsolutePathIssueTest.java  |   6 +-
 .../file/FileBatchConsumerMemoryLeakTest.java      |  10 +-
 .../file/FileBeginFailureOneTimeTest.java          |  10 +-
 .../component/file/FileBrowsableEndpointTest.java  |  20 ++--
 .../FileConcurrentWriteAppendSameFileTest.java     |  13 ++-
 .../camel/component/file/FileConfigureTest.java    |  36 ++++---
 .../FileConsumeAlterFileNameHeaderIssueTest.java   |  21 ++--
 .../file/FileConsumeBackoffMultiplierTest.java     |   6 +-
 .../component/file/FileConsumeCharsetTest.java     |  10 +-
 .../file/FileConsumeDoneFileIssueTest.java         |  37 ++++---
 ...eConsumeDynamicDoneFileNameWithTwoDotsTest.java |  13 ++-
 .../file/FileConsumeFilesAndDeleteTest.java        |  10 +-
 .../file/FileConsumeMaxMessagesPerPollTest.java    |   6 +-
 .../file/FileConsumeMoveRelativeNameTest.java      |   6 +-
 .../file/FileConsumeMultipleDirectoriesTest.java   |   8 +-
 .../FileConsumeNoopIdempotentDisabledTest.java     |   6 +-
 .../file/FileConsumeNoopIdempotentEnabledTest.java |   6 +-
 .../FileConsumeNotEagerMaxMessagesPerPollTest.java |   6 +-
 .../file/FileConsumePollEnrichFileTest.java        |   6 +-
 ...ileConsumePollEnrichFileUsingProcessorTest.java |   6 +-
 .../file/FileConsumeRootDirManualTest.java         |   6 +-
 .../file/FileConsumeRunLoggingLevelTest.java       |   6 +-
 ...ileConsumeSimpleAbsoluteMoveToAbsoluteTest.java |   6 +-
 ...ileConsumeSimpleAbsoluteMoveToRelativeTest.java |   6 +-
 ...meSimpleDynamicDoneFileNameWithTwoDotsTest.java |  13 ++-
 ...ileConsumeSimpleRelativeMoveToAbsoluteTest.java |   6 +-
 ...ileConsumeSimpleRelativeMoveToRelativeTest.java |   6 +-
 .../file/FileConsumeSingleDirectoryOnlyTest.java   |   6 +-
 .../component/file/FileConsumeTemplateTest.java    |   9 +-
 .../file/FileConsumeWithDollarInPathTest.java      |   6 +-
 .../FileConsumerAbsolutePathDefaultMoveTest.java   |   6 +-
 .../file/FileConsumerAbsolutePathTest.java         |   6 +-
 ...leConsumerAbsolutePathWithAbsoluteMoveTest.java |   6 +-
 ...leConsumerAbsolutePathWithRelativeMoveTest.java |   6 +-
 ...ileConsumerAbsoluteRootPathDefaultMoveTest.java |   2 +-
 .../file/FileConsumerAutoCreateDirectoryTest.java  |  20 ++--
 .../component/file/FileConsumerBatchTest.java      |   6 +-
 ...BeginAndCommitExpressionRenameStrategyTest.java |   8 +-
 ...leConsumerBeginAndCommitRenameStrategyTest.java |   8 +-
 ...eConsumerBeginExpressionRenameStrategyTest.java |   9 +-
 .../file/FileConsumerBeginRenameStrategyTest.java  |   9 +-
 ...ileConsumerBridgeRouteExceptionHandlerTest.java |   6 +-
 ...nsumerCommitRenameAbsolutePathStrategyTest.java |   6 +-
 .../file/FileConsumerCommitRenameStrategyTest.java |  10 +-
 .../file/FileConsumerConsumedFileNameTest.java     |   6 +-
 .../FileConsumerCustomExceptionHandlerTest.java    |   6 +-
 .../file/FileConsumerCustomSchedulerTest.java      |   8 +-
 .../file/FileConsumerDeleteAndFailureTest.java     |   6 +-
 .../file/FileConsumerDirectoryFilterTest.java      |  11 +-
 ...erDirectoryMustExistBridgeErrorHandlerTest.java |   4 +-
 .../file/FileConsumerDirectoryNotMatchedTest.java  |   6 +-
 .../file/FileConsumerExcludeNameTest.java          |   2 +-
 .../file/FileConsumerExtendedAttributesTest.java   |   8 +-
 .../file/FileConsumerFailureHandledTest.java       |  14 ++-
 .../file/FileConsumerFileExpressionTest.java       |   6 +-
 ...leConsumerFileExpressionThrowExceptionTest.java |   7 +-
 .../component/file/FileConsumerFileFilterTest.java |   6 +-
 .../file/FileConsumerFilterDirectoryTest.java      |   6 +-
 .../component/file/FileConsumerFilterFileTest.java |   6 +-
 ...FileConsumerIdempotentKeyChangedIssue2Test.java |   2 +-
 .../FileConsumerIdempotentKeyChangedIssueTest.java |   2 +-
 .../FileConsumerIdempotentKeyNameAndSizeTest.java  |   2 +-
 ...leConsumerIdempotentOnExceptionHandledTest.java |   6 +-
 .../file/FileConsumerIdempotentRefTest.java        |  11 +-
 .../component/file/FileConsumerIdempotentTest.java |  11 +-
 .../file/FileConsumerIdleMessageTest.java          |   4 +-
 .../FileConsumerIncludeAndExcludeNameTest.java     |   6 +-
 .../file/FileConsumerIncludeNameTest.java          |   6 +-
 .../file/FileConsumerInterceptEmptyFileTest.java   |   6 +-
 .../file/FileConsumerMoveAndMoveFailureTest.java   |   6 +-
 .../file/FileConsumerMoveExpressionTest.java       |  12 ++-
 .../FileConsumerMoveFailureOnCompletionTest.java   |   6 +-
 .../file/FileConsumerMoveFailureTest.java          |   6 +-
 .../camel/component/file/FileConsumerNoopTest.java |   8 +-
 .../file/FileConsumerPathWithAmpersandTest.java    |   6 +-
 .../file/FileConsumerPollStrategyNotBeginTest.java |   8 +-
 ...FileConsumerPollStrategyPolledMessagesTest.java |   9 +-
 ...umerPollStrategyRollbackThrowExceptionTest.java |   7 +-
 ...FileConsumerPollStrategyStopOnRollbackTest.java |   8 +-
 .../file/FileConsumerPollStrategyTest.java         |   8 +-
 .../file/FileConsumerPreMoveDeleteTest.java        |  15 +--
 .../file/FileConsumerPreMoveIssueTest.java         |  10 +-
 .../file/FileConsumerPreMoveLastModifiedTest.java  |   8 +-
 .../file/FileConsumerPreMoveNoopTest.java          |  14 +--
 .../component/file/FileConsumerPreMoveTest.java    |  10 +-
 ...ileConsumerPreMoveWithProbeContentTypeTest.java |   6 +-
 .../file/FileConsumerProducerRouteTest.java        |   6 +-
 .../file/FileConsumerRelativeFileNameTest.java     |   6 +-
 .../file/FileConsumerRestartNotLeakThreadTest.java |  10 +-
 .../FileConsumerSharedThreadPollStopRouteTest.java |   2 +-
 .../file/FileConsumerSharedThreadPollTest.java     |   6 +-
 .../file/FileConsumerSkipDotFilesTest.java         |   6 +-
 .../file/FileConsumerSpringSchedulerTest.java      |   5 +-
 ...onsumerStartingDirectoryMustHaveAccessTest.java |   9 +-
 .../file/FileConsumerSuspendAndResumeTest.java     |  13 ++-
 .../component/file/FileConsumerSuspendTest.java    |  11 +-
 .../component/file/FileConsumerTemplateTest.java   |  12 ++-
 .../FileConsumerThreadsInProgressIssueTest.java    |   6 +-
 .../component/file/FileContentBasedRouterTest.java |   6 +-
 .../component/file/FileConvertBodyToUTF8Test.java  |  10 +-
 .../file/FileEagerDeleteTargetFileTest.java        |  15 +--
 .../file/FileExclusiveReadLockCopyTest.java        |   6 +-
 .../file/FileExclusiveReadManuelTest.java          |   6 +-
 .../file/FileExclusiveReadNoneStrategyTest.java    |  10 +-
 .../file/FileHeaderFileNameProducedTest.java       |   2 +-
 .../file/FileIdempotentReadSameFileAgainTest.java  |   6 +-
 .../file/FileInvalidStartingPathTest.java          |   5 +-
 .../component/file/FileKeepLastModifiedTest.java   |  15 +--
 .../camel/component/file/FileLanguageCBRTest.java  |   6 +-
 .../camel/component/file/FileMEPInOutTest.java     |   2 +-
 .../file/FileMarkerFileDeleteOldLockFilesTest.java |   6 +-
 ...eMarkerFileRecursiveDeleteOldLockFilesTest.java |   6 +-
 ...erFileRecursiveDoNotDeleteOldLockFilesTest.java |   6 +-
 ...cursiveFilterDeleteOldLockFilesIncludeTest.java |   6 +-
 ...rFileRecursiveFilterDeleteOldLockFilesTest.java |   6 +-
 .../file/FileMoveAndMoveFailedIssueTest.java       |   6 +-
 .../FileMoveErrorOnExceptionNotHandledTest.java    |   6 +-
 .../component/file/FileMulticastDeleteTest.java    |   6 +-
 .../camel/component/file/FileNoOpLockFileTest.java |  10 +-
 .../component/file/FilePollEnrichNoWaitTest.java   |  10 +-
 .../camel/component/file/FilePollEnrichTest.java   |  10 +-
 .../component/file/FilePollingConsumerTest.java    |  10 +-
 .../component/file/FileProduceAppendCharsTest.java |   6 +-
 .../component/file/FileProduceAppendTest.java      |   6 +-
 .../file/FileProduceGeneratedFileNameTest.java     |   6 +-
 .../file/FileProduceOverruleExpressionTest.java    |   6 +-
 .../file/FileProduceOverruleOnlyOnceTest.java      |   6 +-
 .../component/file/FileProduceOverruleTest.java    |   6 +-
 .../file/FileProduceTempFileNameTest.java          |  14 +--
 .../component/file/FileProduceTempPrefixTest.java  |  10 +-
 ...ProducerAllowNullBodyFileAlreadyExistsTest.java |   6 +-
 .../file/FileProducerAllowNullBodyTest.java        |  10 +-
 .../file/FileProducerCharsetUTFOptimizedTest.java  |  13 ++-
 .../FileProducerCharsetUTFtoISOConfiguredTest.java |  13 ++-
 ...leProducerCharsetUTFtoISOConvertBodyToTest.java |  13 ++-
 .../file/FileProducerCharsetUTFtoISOTest.java      |  13 ++-
 .../file/FileProducerCharsetUTFtoUTFTest.java      |  13 ++-
 .../file/FileProducerChmodOptionTest.java          |   9 +-
 .../file/FileProducerDirectoryChmodOptionTest.java |   8 +-
 .../component/file/FileProducerExpressionTest.java |   6 +-
 .../file/FileProducerFileBodyGetsMovedTest.java    |  12 ++-
 ...ileProducerFileExistAppendNoFileBeforeTest.java |   6 +-
 .../file/FileProducerFileExistAppendTest.java      |   6 +-
 .../file/FileProducerFileExistFailTest.java        |   9 +-
 .../file/FileProducerFileExistIgnoreTest.java      |   6 +-
 ...eProducerFileExistOverrideNoFileBeforeTest.java |   6 +-
 .../file/FileProducerFileExistOverrideTest.java    |   6 +-
 .../file/FileProducerFileExistTryRenameTest.java   |   6 +-
 .../file/FileProducerFilenameConstantTest.java     |  10 +-
 .../FileProducerJailStartingDirectoryTest.java     |   9 +-
 .../file/FileProducerMoveExistingStrategyTest.java |   8 +-
 .../file/FileProducerMoveExistingTest.java         |   8 +-
 .../file/FileProducerNoForcedWritesTest.java       |   8 +-
 .../file/FileProducerRenameUsingCopyTest.java      |  13 ++-
 .../component/file/FileProducerStreamTest.java     |   6 +-
 .../file/FileProducerTempFileExistsIssueTest.java  |   8 +-
 .../file/FileProducerToDMoveExistingTest.java      |   4 +-
 .../component/file/FileRecursiveDepthTest.java     |   6 +-
 .../component/file/FileRecursiveNoopTest.java      |   6 +-
 .../file/FileRenameFileOnCommitIssueTest.java      |   6 +-
 .../FileRenameReadLockMustUseMarkerFileTest.java   |  13 ++-
 .../file/FileRouteOnDosWithNoVolTest.java          |   6 +-
 .../component/file/FileSortByExpressionTest.java   |   6 +-
 .../file/FileSortByIgnoreCaseExpressionTest.java   |   6 +-
 .../file/FileSortByNestedExpressionTest.java       |   6 +-
 .../camel/component/file/FileSorterRefTest.java    |   6 +-
 .../camel/component/file/FileSplitInSplitTest.java |  13 ++-
 .../component/file/FileSplitXPathCharsetTest.java  |   6 +-
 .../component/file/FileToFileNioLowBufferTest.java |   6 +-
 .../component/file/FileToFileWithFlattenTest.java  |  10 +-
 .../camel/component/file/FileURLDecodingTest.java  |  12 ++-
 .../file/FilerConsumerDoneFileNameDeleteTest.java  |  12 ++-
 .../file/FilerConsumerDoneFileNamePrefixTest.java  |  10 +-
 .../FilerConsumerDoneFileNameSimplePrefixTest.java |  10 +-
 .../file/FilerConsumerDoneFileNameSuffixTest.java  |  10 +-
 .../file/FilerConsumerDoneFileNameTest.java        |  13 ++-
 .../file/FilerConsumerDoneFileNoopTest.java        |  12 ++-
 .../file/FilerConsumerDualDoneFileNameTest.java    |   6 +-
 .../FilerConsumerMoveFailedDoneFileNameTest.java   |  13 ++-
 .../file/FilerConsumerPreMoveDoneFileNameTest.java |  10 +-
 .../file/FilerConsumerRetryDoneFileNameTest.java   |  15 +--
 .../FilerConsumerShouldSkipDoneFilePrefixTest.java |  13 ++-
 .../FilerConsumerShouldSkipDoneFileSuffixTest.java |  13 ++-
 .../file/FilerConsumerShouldSkipDoneFileTest.java  |  13 ++-
 .../component/file/FilerProducerAbsoluteTest.java  |   6 +-
 .../file/FilerProducerDoneFileNameRouteTest.java   |  13 ++-
 .../file/FilerProducerDoneFileNameTest.java        |  32 +++---
 .../component/file/FilerProducerFileNamesTest.java |  12 ++-
 .../FromFileDoNotDeleteFileIfProcessFailsTest.java |  10 +-
 .../FromFileDoNotMoveFileIfProcessFailsTest.java   |  10 +-
 .../file/FromFileMoveDoneCustomHeaderTest.java     |   6 +-
 .../file/FromFileMoveFileIfProcessFailsTest.java   |   6 +-
 .../file/FromFileMulticastToFilesTest.java         |   6 +-
 .../file/FromFilePollThirdTimeOkTest.java          |  12 ++-
 .../component/file/GenericFileConverterTest.java   |   6 +-
 .../component/file/GenericFileMessageTest.java     |   9 +-
 ...kerFileExclusiveReadLockStrategyUnlockTest.java |  10 +-
 .../camel/component/file/NewFileConsumeTest.java   |   9 +-
 .../camel/component/file/NewFileConsumerTest.java  |   6 +-
 .../camel/component/file/NewFileProduceTest.java   |  10 +-
 .../camel/component/file/ToFileRouteTest.java      |   2 +-
 .../camel/component/file/XPathToFileTest.java      |  13 ++-
 .../FileLockClusteredRoutePolicyFactoryTest.java   |  10 +-
 .../cluster/FileLockClusteredRoutePolicyTest.java  |  10 +-
 .../FileChangedReadLockMinAgeShortCircuitTest.java |   6 +-
 .../strategy/FileChangedReadLockMinAgeTest.java    |  10 +-
 .../file/strategy/FileChangedReadLockTest.java     |  10 +-
 .../FileChangedReadLockZeroTimeoutTest.java        |   8 +-
 .../FileChangedZeroLengthReadLockTest.java         |   6 +-
 .../FileIdempotentChangedReadLockTest.java         |   2 +
 .../FileIdempotentReadLockDelayedAsyncTest.java    |   9 +-
 .../FileIdempotentReadLockDelayedTest.java         |   9 +-
 .../file/strategy/FileIdempotentReadLockTest.java  |   9 +-
 .../strategy/FileIdempotentRenameReadLockTest.java |   2 +
 .../GenericFileDeleteProcessStrategyTest.java      |  13 ++-
 .../MarkerFileExclusiveReadLockStrategyTest.java   |  11 +-
 .../file/stress/FileAsyncStressFileDropper.java    |   4 +-
 .../file/stress/FileAsyncStressManually.java       |   4 +-
 .../FileAsyncStressReadLockLockFileTest.java       |   4 +-
 .../stress/FileAsyncStressReadLockNoneTest.java    |   4 +-
 .../stress/FileAsyncStressReadLockRenameTest.java  |   4 +-
 .../component/file/stress/FileAsyncStressTest.java |  10 +-
 .../file/stress/FileConsumerPollManyFilesTest.java |  10 +-
 .../FileProducerAppendManyMessagesFastTest.java    |  10 +-
 .../stress/FileProducerAppendManyMessagesTest.java |  10 +-
 .../language/LanguageCacheScriptTest.java          |   5 +-
 .../language/LanguageEndpointScriptRouteTest.java  |   2 +-
 .../language/LanguageHeaderRouteTest.java          |   2 +-
 .../LanguageLoadScriptFromClasspathHeaderTest.java |   2 +-
 .../LanguageLoadScriptFromClasspathTest.java       |   2 +-
 .../LanguageLoadScriptFromFileUpdateTest.java      |   6 +-
 .../language/LanguageNoCacheScriptTest.java        |   5 +-
 ...guageResourceLoadConstantFromClasspathTest.java |   2 +-
 .../language/LanguageRouteConvertBodyTest.java     |   2 +-
 .../language/LanguageRouteNoTransformTest.java     |   2 +-
 .../component/language/LanguageRouteTest.java      |   2 +-
 ...guageScriptInHeaderRouteTakePrecedenceTest.java |   2 +-
 .../language/LanguageScriptInHeaderRouteTest.java  |   2 +-
 .../language/LanguageScriptRouteTest.java          |   2 +-
 .../component/language/LanguageXPathRouteTest.java |   2 +-
 .../log/DefaultExchangeFormatterTest.java          |   4 +-
 .../component/log/LogBodyWithNewLineTest.java      |   8 +-
 .../component/log/LogComponentOptionsTest.java     |  14 +--
 .../component/log/LogCustomFormatterTest.java      |   8 +-
 .../camel/component/log/LogCustomLoggerTest.java   |   7 +-
 .../component/log/LogEndpointOptionsTest.java      |   6 +-
 .../camel/component/log/LogEndpointTest.java       |  15 ++-
 .../camel/component/log/LogInputStreamTest.java    |   2 +-
 .../camel/component/log/LogListenerTest.java       |   9 +-
 .../apache/camel/component/log/LogMaskTest.java    |   7 +-
 .../apache/camel/component/log/LogRouteTest.java   |   4 +-
 .../camel/component/log/ThroughputLoggerTest.java  |   2 +-
 .../camel/component/mock/MockAsBeanTest.java       |   2 +-
 .../component/mock/MockAssertionClauseTest.java    |   2 +-
 .../camel/component/mock/MockEndpointTest.java     |   4 +-
 .../component/mock/MockEndpointTimeClauseTest.java |   5 +-
 .../mock/MockEndpointWithParametersTest.java       |   2 +-
 .../mock/MockExpectedBodiesAsListTest.java         |   2 +-
 .../camel/component/mock/MockPredicateTest.java    |   2 +-
 .../component/mock/MockStreamCachingTest.java      |   2 +-
 .../camel/component/mock/MockThroughtputTest.java  |   2 +-
 .../apache/camel/component/mock/MockXpathTest.java |   2 +-
 .../org/apache/camel/component/mock/TimeTest.java  |   7 +-
 .../apache/camel/component/pojo/PojoRouteTest.java |   7 +-
 .../ComponentResolvePropertyPlaceholdersTest.java  |   5 +-
 .../OptionalPropertiesDslInvalidSyntaxTest.java    |   5 +-
 .../properties/OptionalPropertiesDslTest.java      |   4 +-
 ...onentAdviceWithInterceptSendToEndpointTest.java |   2 +-
 ...opertiesComponentConcatenatePropertiesTest.java |  10 +-
 .../PropertiesComponentDefaultFunctionsTest.java   |   2 +-
 .../PropertiesComponentDisableDefaultsTest.java    |   2 +-
 ...pertiesComponentEIPChoiceConvertBodyToTest.java |   2 +-
 .../PropertiesComponentEIPChoiceSimpleTest.java    |   2 +-
 .../PropertiesComponentEIPConvertBodyToTest.java   |   2 +-
 .../PropertiesComponentEIPRoutingSlipTest.java     |   2 +-
 .../PropertiesComponentEncodingTest.java           |   2 +-
 .../PropertiesComponentEndpointTest.java           |   2 +-
 .../PropertiesComponentFunctionTest.java           |   2 +-
 .../PropertiesComponentInitialPropertiesTest.java  |   2 +-
 .../PropertiesComponentInterceptFromTest.java      |   2 +-
 ...ertiesComponentInterceptSendToEndpointTest.java |   2 +-
 ...ponentLoadPropertiesFromFileTrimValuesTest.java |   8 +-
 .../PropertiesComponentLoadPropertiesTest.java     |   5 +-
 ...ertiesComponentOnExceptionDelayPatternTest.java |   2 +-
 .../PropertiesComponentOnExceptionTest.java        |   4 +-
 ...ropertiesComponentOnlyUseDefaultValuesTest.java |   4 +-
 ...esComponentOverridePropertiesNonStringTest.java |   2 +-
 .../PropertiesComponentOverridePropertiesTest.java |   2 +-
 .../PropertiesComponentPropertiesSourceTest.java   |   2 +-
 .../PropertiesComponentRegistryTest.java           |   4 +-
 .../PropertiesComponentServiceHostPortTest.java    |   2 +-
 .../PropertiesComponentServiceHostTest.java        |   2 +-
 .../PropertiesComponentServicePortTest.java        |   2 +-
 .../properties/PropertiesComponentServiceTest.java |   2 +-
 .../PropertiesComponentSetHeaderSimpleTest.java    |   2 +-
 ...rtiesComponentSomethingElseBoundToJndiTest.java |   6 +-
 .../properties/PropertiesRouteFromTest.java        |   5 +-
 .../properties/PropertiesRouteIdTest.java          |   7 +-
 .../properties/XPathPropertyPlaceholderTest.java   |   2 +-
 .../camel/component/ref/RefComponentTest.java      |   2 +-
 .../camel/component/ref/RefFileEndpointTest.java   |   8 +-
 .../apache/camel/component/ref/RefInvalidTest.java |   5 +-
 .../component/rest/FromRestAdviceWithTest.java     |   4 +-
 .../camel/component/rest/FromRestApiTest.java      |   5 +-
 .../component/rest/FromRestConfigurationTest.java  |   5 +-
 .../component/rest/FromRestDefaultValueTest.java   |   2 +-
 .../component/rest/FromRestDuplicateTest.java      |   5 +-
 .../component/rest/FromRestGetContentTypeTest.java |   5 +-
 .../rest/FromRestGetCorsAllowCredentialsTest.java  |   5 +-
 .../component/rest/FromRestGetCorsCustomTest.java  |   5 +-
 .../camel/component/rest/FromRestGetCorsTest.java  |   5 +-
 .../rest/FromRestGetEmbeddedRouteTest.java         |   5 +-
 .../component/rest/FromRestGetEndPathTest.java     |   5 +-
 .../rest/FromRestGetHttpErrorCodeTest.java         |   5 +-
 .../component/rest/FromRestGetInterceptTest.java   |   4 +-
 .../component/rest/FromRestGetOnExceptionTest.java |   4 +-
 .../rest/FromRestGetPlaceholderParamTest.java      |   5 +-
 .../component/rest/FromRestGetPolicyTest.java      |   4 +-
 .../camel/component/rest/FromRestGetTest.java      |   5 +-
 .../rest/FromRestIdAndDescriptionTest.java         |   4 +-
 .../component/rest/FromRestUriPrefixTest.java      |   5 +-
 .../camel/component/rest/RestComponentTest.java    |  13 +--
 .../rest/RestComponentVerifierExtensionTest.java   |  18 ++--
 .../component/rest/RestComponentVerifierTest.java  |  18 ++--
 .../camel/component/rest/RestEndpointTest.java     |   7 +-
 .../rest/RestProducerBindingProcessorTest.java     |  14 ++-
 .../camel/component/rest/RestProducerPathTest.java |  28 ++---
 .../camel/component/rest/RestProducerTest.java     |   6 +-
 .../camel/component/saga/SagaComponentTest.java    |   7 +-
 .../scheduler/SchedulerNoPolledMessagesTest.java   |   2 +-
 .../scheduler/SchedulerRepeatCountTest.java        |   2 +-
 .../component/scheduler/SchedulerRouteTest.java    |   6 +-
 .../TwoSchedulerConcurrentTasksOneRouteTest.java   |   2 +-
 .../scheduler/TwoSchedulerConcurrentTasksTest.java |   2 +-
 .../component/scheduler/TwoSchedulerTest.java      |   4 +-
 .../seda/DirectRequestReplyAndSedaInOnlyTest.java  |   4 +-
 .../seda/FileSedaShutdownCompleteAllTasksTest.java |  10 +-
 ...meSedaQueueMultipleConsumersDifferenceTest.java |   8 +-
 .../seda/SameSedaQueueSizeAndNoSizeTest.java       |   5 +-
 .../component/seda/SedaAsyncProducerTest.java      |   8 +-
 .../camel/component/seda/SedaAsyncRouteTest.java   |   4 +-
 .../SedaBlockWhenFullInvalidConfigurationTest.java |   5 +-
 .../component/seda/SedaBlockWhenFullTest.java      |   6 +-
 .../camel/component/seda/SedaComplexInOutTest.java |   4 +-
 .../seda/SedaComponentReferenceEndpointTest.java   |   5 +-
 .../seda/SedaConcurrentConsumersNPEIssueTest.java  |   5 +-
 .../seda/SedaConcurrentConsumersTest.java          |   2 +-
 .../camel/component/seda/SedaConcurrentTest.java   |   5 +-
 .../camel/component/seda/SedaConfigureTest.java    |  18 ++--
 .../seda/SedaConsumerSuspendResumeTest.java        |   3 +-
 .../seda/SedaDefaultBlockWhenFullTest.java         |   6 +-
 .../seda/SedaDefaultDiscardWhenFullTest.java       |   2 +-
 .../seda/SedaDefaultUnboundedQueueSizeTest.java    |   5 +-
 .../seda/SedaDiscardIfNoConsumerTest.java          |   4 +-
 .../component/seda/SedaDiscardWhenFullTest.java    |   2 +-
 .../camel/component/seda/SedaEndpointTest.java     |   4 +-
 .../apache/camel/component/seda/SedaErrorTest.java |   2 +-
 .../camel/component/seda/SedaFromRouteIdTest.java  |   4 +-
 .../component/seda/SedaInOnlyChainedTest.java      |   2 +-
 .../camel/component/seda/SedaInOnlyTest.java       |   2 +-
 .../component/seda/SedaInOutBigChainedTest.java    |   4 +-
 .../camel/component/seda/SedaInOutChainedTest.java |   4 +-
 .../seda/SedaInOutChainedTimeoutTest.java          |   6 +-
 .../seda/SedaInOutChainedWithOnCompletionTest.java |   4 +-
 .../apache/camel/component/seda/SedaInOutTest.java |   4 +-
 .../SedaInOutWithErrorDeadLetterChannelTest.java   |   2 +-
 .../component/seda/SedaInOutWithErrorTest.java     |   5 +-
 .../component/seda/SedaMultipleConsumersTest.java  |   2 +-
 .../camel/component/seda/SedaNoConsumerTest.java   |   5 +-
 .../component/seda/SedaPurgeWhenStoppingTest.java  |   2 +-
 .../camel/component/seda/SedaQueueFactoryTest.java |   8 +-
 .../apache/camel/component/seda/SedaQueueTest.java |   7 +-
 .../seda/SedaRemoveRouteThenAddAgainTest.java      |   2 +-
 .../apache/camel/component/seda/SedaRouteTest.java |  12 ++-
 .../seda/SedaShouldNotUseSameThreadTest.java       |   7 +-
 .../camel/component/seda/SedaSimpleSizeTest.java   |   2 +-
 .../seda/SedaSuspendConsumerStopRouteTest.java     |   8 +-
 .../component/seda/SedaTimeoutDisabledTest.java    |   4 +-
 .../camel/component/seda/SedaTimeoutTest.java      |   8 +-
 .../camel/component/seda/SedaUnitOfWorkTest.java   |   8 +-
 .../seda/SedaWaitForTaskAsPropertyTest.java        |   4 +-
 .../SedaWaitForTaskCompleteOnCompletionTest.java   |   5 +-
 .../seda/SedaWaitForTaskCompleteTest.java          |   4 +-
 .../seda/SedaWaitForTaskIfReplyExpectedTest.java   |   4 +-
 .../seda/SedaWaitForTaskNewerOnCompletionTest.java |   5 +-
 .../component/seda/SedaWaitForTaskNewerTest.java   |   4 +-
 .../camel/component/seda/TracingWithDelayTest.java |   2 +-
 .../apache/camel/component/stub/StubAwsTest.java   |   2 +-
 .../camel/component/stub/StubConsumerTest.java     |   2 +-
 .../camel/component/stub/StubInOnlyTest.java       |   2 +-
 .../apache/camel/component/stub/StubInOutTest.java |   2 +-
 .../org/apache/camel/component/stub/StubTest.java  |   2 +-
 .../camel/component/timer/TimerAsyncTest.java      |   9 +-
 .../component/timer/TimerDelaySecondsTest.java     |   2 +-
 .../camel/component/timer/TimerDelayTest.java      |   2 +-
 .../camel/component/timer/TimerEndpointTest.java   |   4 +-
 .../camel/component/timer/TimerFiredTimeTest.java  |   5 +-
 .../component/timer/TimerGracefulShutdownTest.java |  10 +-
 .../timer/TimerMultipleConsumerStopRouteTest.java  |   2 +-
 .../component/timer/TimerMultipleConsumerTest.java |   2 +-
 .../camel/component/timer/TimerNameTest.java       |   4 +-
 .../component/timer/TimerNegativeDelayTest.java    |   2 +-
 .../timer/TimerNegativeNoRepeatCountDelayTest.java |   5 +-
 .../timer/TimerReferenceConfigurationTest.java     |   4 +-
 .../component/timer/TimerRepeatCountTest.java      |   2 +-
 .../camel/component/timer/TimerRestartTest.java    |   2 +-
 .../camel/component/timer/TimerRouteTest.java      |   6 +-
 .../timer/TimerSuspendCamelContextTest.java        |   2 +-
 .../component/timer/TimerWithTimeOptionTest.java   |   4 +-
 .../validator/CustomSchemaFactoryFeatureTest.java  |   2 +-
 .../validator/FileValidatorRouteTest.java          |  12 ++-
 .../component/validator/ValidatorBeanCallTest.java |   6 +-
 .../validator/ValidatorDtdAccessAbstractTest.java  |   4 +-
 .../validator/ValidatorDtdAccessOffTest.java       |   2 +-
 .../validator/ValidatorDtdAccessOnTest.java        |   2 +-
 .../ValidatorEndpointClearCachedSchemaTest.java    |   2 +-
 .../validator/ValidatorIllegalImportTest.java      |   5 +-
 .../ValidatorIncludeEncodingRouteTest.java         |   6 +-
 .../ValidatorIncludeRelativeRouteTest.java         |   2 +-
 .../validator/ValidatorIncludeRouteTest.java       |   6 +-
 .../validator/ValidatorLazyStartProducerTest.java  |   4 +-
 .../ValidatorResourceResolverFactoryTest.java      |   9 +-
 .../component/validator/ValidatorRootPathTest.java |   6 +-
 .../component/validator/ValidatorRouteTest.java    |  18 ++--
 .../ValidatorWithResourceResolverRouteTest.java    |   6 +-
 .../camel/component/vm/AbstractVmTestSupport.java  |   8 +-
 .../component/vm/ConsumerCamelContextAware.java    |   3 +
 .../component/vm/SameVmQueueSizeAndNoSizeTest.java |   5 +-
 .../apache/camel/component/vm/VMSplitterTest.java  |   2 +-
 .../vm/VmComponentReferenceEndpointTest.java       |   5 +-
 .../component/vm/VmConcurrentConsumersTest.java    |   2 +-
 ...mDifferentOptionsOnConsumerAndProducerTest.java |   6 +-
 .../component/vm/VmDiscardIfNoConsumerTest.java    |   4 +-
 .../camel/component/vm/VmInOnlyChainedTest.java    |   2 +-
 .../apache/camel/component/vm/VmInOnlyTest.java    |   2 +-
 .../camel/component/vm/VmInOutChainedTest.java     |   4 +-
 .../component/vm/VmInOutChainedTimeoutTest.java    |   6 +-
 .../org/apache/camel/component/vm/VmInOutTest.java |   4 +-
 .../camel/component/vm/VmInOutWithErrorTest.java   |   5 +-
 .../component/vm/VmMultipleConsumersIssueTest.java |   2 +-
 .../vm/VmMultipleConsumersKeepRouteTest.java       |   5 +-
 .../vm/VmMultipleConsumersMultipleContextTest.java |   2 +-
 .../vm/VmMultipleConsumersRemoteRouteTest.java     |   5 +-
 .../vm/VmMultipleContextsStartStopTest.java        |   2 +-
 .../org/apache/camel/component/vm/VmQueueTest.java |   2 +-
 .../component/vm/VmShouldNotUseSameThreadTest.java |   7 +-
 .../component/vm/VmShouldUseConsumerContext.java   |   2 +
 .../camel/component/vm/VmTimeoutIssueTest.java     |   5 +-
 .../camel/component/vm/VmUseSameQueueTest.java     |   2 +-
 .../component/vm/VmWaitForTaskCompleteTest.java    |   4 +-
 .../vm/VmWaitForTaskIfReplyExpectedTest.java       |   5 +-
 .../camel/component/vm/VmWaitForTaskNewerTest.java |   5 +-
 .../camel/component/xslt/InvalidXsltFileTest.java  |   4 +-
 .../org/apache/camel/component/xslt/MyXPath.java   |   1 +
 .../xslt/XsltCustomErrorListenerTest.java          |   8 +-
 .../xslt/XsltCustomizeEntityResolverTest.java      |   2 +-
 .../xslt/XsltCustomizeURIResolverTest.java         |   2 +-
 .../apache/camel/component/xslt/XsltDTDTest.java   |  14 ++-
 .../camel/component/xslt/XsltFeatureRouteTest.java |  11 +-
 .../camel/component/xslt/XsltFileNotFoundTest.java |   4 +-
 .../component/xslt/XsltFromFileExceptionTest.java  |  17 +--
 .../XsltIncludeClasspathDotInDirectoryTest.java    |  14 +--
 .../component/xslt/XsltIncludeClasspathTest.java   |   2 +-
 .../xslt/XsltIncludeRelativeFileSchemeTest.java    |   2 +-
 .../xslt/XsltIncludeRelativeNestedTest.java        |   2 +-
 .../xslt/XsltIncludeRelativeOtherTest.java         |   2 +-
 .../component/xslt/XsltIncludeRelativeTest.java    |   2 +-
 .../camel/component/xslt/XsltIncludeTest.java      |   2 +-
 .../component/xslt/XsltMessageTerminateTest.java   |   5 +-
 .../camel/component/xslt/XsltOutputBytesTest.java  |   2 +-
 .../camel/component/xslt/XsltOutputDOMTest.java    |   2 +-
 .../component/xslt/XsltOutputFileDeleteTest.java   |   6 +-
 .../camel/component/xslt/XsltOutputFileTest.java   |   5 +-
 .../camel/component/xslt/XsltOutputStringTest.java |   2 +-
 .../apache/camel/component/xslt/XsltRouteTest.java |   8 +-
 .../component/xslt/XsltRouteXsltWithErrorTest.java |   4 +-
 .../xslt/XsltTransformingExceptionTest.java        |  11 +-
 .../component/xslt/XsltUriResolverFactoryTest.java |   7 +-
 .../apache/camel/converter/CamelConverterTest.java |   3 +-
 .../camel/converter/CollectionConverterTest.java   |   7 +-
 .../camel/converter/ConverterBenchmarkTest.java    |   8 +-
 .../org/apache/camel/converter/ConverterTest.java  |  75 ++++++-------
 .../camel/converter/DateTimeConverterTest.java     |   5 +-
 .../camel/converter/DurationConverterTest.java     |  11 +-
 .../apache/camel/converter/EnumConverterTest.java  |   5 +-
 .../camel/converter/FallbackPromoteTest.java       |   8 +-
 .../camel/converter/FutureConverterTest.java       |   4 +-
 .../apache/camel/converter/IOConverterTest.java    |  36 ++-----
 .../converter/InstanceFallbackConverterTest.java   |   4 +-
 .../java/org/apache/camel/converter/JaxpTest.java  |  21 ++--
 .../apache/camel/converter/NIOConverterTest.java   |   7 +-
 .../camel/converter/ObjectConverterNaNTest.java    |   8 +-
 .../camel/converter/ObjectConverterTest.java       |   7 +-
 .../converter/PrimitiveTypeConverterIssueTest.java |   4 +-
 .../PropertyEditorTypeConverterIssueTest.java      |   4 +-
 .../apache/camel/converter/SQLConverterTest.java   |   4 +-
 .../converter/StaticFallbackConverterTest.java     |   4 +-
 .../apache/camel/converter/StringSourceTest.java   |  25 +++--
 .../converter/TimePatternTypeConversionTest.java   |   4 +-
 .../TimerDrivenTimePatternConverterTest.java       |   6 +-
 .../camel/converter/jaxp/BytesSourceTest.java      |   4 +-
 .../camel/converter/jaxp/DomConverterTest.java     |   9 +-
 .../camel/converter/jaxp/StAX2SAXSourceTest.java   |   5 +-
 .../camel/converter/jaxp/StaxConverterTest.java    |   6 +-
 .../converter/jaxp/StreamSourceConverterTest.java  |   5 +-
 .../camel/converter/jaxp/XmlConverterTest.java     |   8 +-
 .../stream/ByteArrayInputStreamCacheTest.java      |   4 +-
 .../converter/stream/CachedOutputStreamTest.java   |  90 +++++++++-------
 .../converter/stream/FileInputStreamCacheTest.java |   5 +-
 .../converter/stream/InputStreamCacheTest.java     |   4 +-
 .../camel/converter/stream/ReaderCacheTest.java    |   4 +-
 .../camel/converter/stream/SourceCacheTest.java    |   4 +-
 .../converter/stream/StreamCacheConverterTest.java |  12 ++-
 .../converter/stream/StreamSourceCacheTest.java    |   4 +-
 .../camel/impl/BeanInjectRouteBuilderTest.java     |   2 +-
 .../impl/BindToRegistryBeanPostProcessorTest.java  |   5 +-
 .../CamelContextAddRestDefinitionsFromXmlTest.java |  12 ++-
 ...CamelContextAddRouteDefinitionsFromXmlTest.java |  24 +++--
 .../camel/impl/CamelContextDeadlockTest.java       |   6 +-
 .../apache/camel/impl/CamelContextTrackerTest.java |   7 +-
 .../CamelCustomDefaultThreadPoolProfileTest.java   |   4 +-
 .../CamelProduceInterfaceEventNotifierTest.java    |  15 ++-
 .../camel/impl/CamelProduceInterfaceTest.java      |   4 +-
 .../camel/impl/ConsumerCacheOneCapacityTest.java   |  11 +-
 .../impl/CustomHeadersMapFactoryRouteTest.java     |   4 +-
 .../org/apache/camel/impl/CustomIdFactoryTest.java |   8 +-
 .../camel/impl/CustomUnitOfWorkFactoryTest.java    |   2 +-
 .../camel/impl/DataFormatContextAwareTest.java     |   4 +-
 .../DefaultAsyncProcessorAwaitManagerTest.java     |   4 +-
 ...efaultCamelBeanPostProcessorFieldFirstTest.java |   9 +-
 .../impl/DefaultCamelBeanPostProcessorTest.java    |   8 +-
 ...melContextAllowUseOriginalMessageFalseTest.java |   2 +-
 ...amelContextAllowUseOriginalMessageTrueTest.java |   2 +-
 .../impl/DefaultCamelContextAutoStartupTest.java   |   4 +-
 .../impl/DefaultCamelContextResolverTest.java      |  66 ++++++------
 .../camel/impl/DefaultCamelContextRestartTest.java |   4 +-
 .../impl/DefaultCamelContextStopFailureTest.java   |   4 +-
 ...lContextSuspendResumeRouteStartupOrderTest.java |   5 +-
 .../DefaultCamelContextSuspendResumeRouteTest.java |   5 +-
 ...melContextWithLifecycleStrategyRestartTest.java |   4 +-
 .../camel/impl/DefaultClassResolverTest.java       |   8 +-
 .../DefaultComponentReferencePropertiesTest.java   |   4 +-
 .../apache/camel/impl/DefaultComponentTest.java    |   6 +-
 .../impl/DefaultComponentValidateURITest.java      |   7 +-
 .../camel/impl/DefaultConsumerCacheTest.java       |  10 +-
 .../camel/impl/DefaultConsumerTemplateTest.java    |  29 ++---
 ...ConsumerTemplateWithCustomCacheMaxSizeTest.java |  10 +-
 .../camel/impl/DefaultEndpointRegistryTest.java    |   4 +-
 .../camel/impl/DefaultExchangeHolderTest.java      |   4 +-
 .../org/apache/camel/impl/DefaultExchangeTest.java |   8 +-
 .../impl/DefaultExecutorServiceManagerTest.java    |  16 +--
 .../impl/DefaultHeaderFilterStrategyTest.java      |   4 +-
 .../camel/impl/DefaultHeadersMapFactoryTest.java   |   7 +-
 .../camel/impl/DefaultInflightRepositoryTest.java  |   4 +-
 .../org/apache/camel/impl/DefaultInjectorTest.java |   7 +-
 .../camel/impl/DefaultMessageHeaderTest.java       |  12 +--
 .../camel/impl/DefaultProducerCacheTest.java       |  30 +++---
 .../impl/DefaultProducerTemplateAsyncTest.java     |  24 +++--
 ...efaultProducerTemplateNonBlockingAsyncTest.java |  14 +--
 .../camel/impl/DefaultProducerTemplateTest.java    |  36 ++++---
 ...ProducerTemplateWithCustomCacheMaxSizeTest.java |  10 +-
 .../camel/impl/DefaultUuidGeneratorTest.java       |   8 +-
 .../camel/impl/DurationRoutePolicyFactoryTest.java |   4 +-
 .../impl/DurationRoutePolicyMaxMessagesTest.java   |   4 +-
 .../impl/DurationRoutePolicyMaxSecondsTest.java    |   4 +-
 .../apache/camel/impl/EndpointPrototypeTest.java   |   4 +-
 ...outeEndpointsRemoteRouteSharedEndpointTest.java |   4 +-
 ...tRegistryKeepRouteEndpointsRemoteRouteTest.java |   4 +-
 .../EndpointRegistryKeepRouteEndpointsTest.java    |   6 +-
 .../camel/impl/EndpointShutdownOnceTest.java       |  15 +--
 .../EventDrivenPollingConsumerQueueSizeTest.java   |   8 +-
 .../apache/camel/impl/ExpressionAdapterTest.java   |   5 +-
 .../apache/camel/impl/ExpressionSupportTest.java   |   5 +-
 .../impl/ExtendedStartupListenerComponentTest.java |   5 +-
 .../apache/camel/impl/FileStateRepositoryTest.java |  28 ++---
 .../org/apache/camel/impl/FromEndpointTest.java    |   9 +-
 .../camel/impl/FromHasNoOutputRouteTest.java       |   5 +-
 .../camel/impl/FromMultipleEndpointTest.java       |   8 +-
 .../apache/camel/impl/GetRegistryAsTypeTest.java   |   8 +-
 .../GracefulShutdownNoAutoStartOrderClashTest.java |   7 +-
 .../impl/HashMapHeadersMapFactoryRouteTest.java    |   2 +-
 .../impl/HeaderFilterStrategyComponentTest.java    |   8 +-
 .../InflightRepositoryBrowseFromRouteTest.java     |   5 +-
 .../camel/impl/InflightRepositoryBrowseTest.java   |   5 +-
 .../camel/impl/InflightRepositoryRouteTest.java    |   4 +-
 ...erceptSendToMockEndpointStrategyCustomTest.java |   7 +-
 .../InterceptSendToMockEndpointStrategyTest.java   |   5 +-
 .../camel/impl/LanguageCamelContextAwareTest.java  |   4 +-
 .../apache/camel/impl/LazyStartProducerTest.java   |   4 +-
 .../camel/impl/LifecycleStrategyDiscoveryTest.java |   3 +-
 .../impl/LifecycleStrategyFailOnStartupTest.java   |   5 +-
 .../camel/impl/LifecycleStrategyServiceTest.java   |   4 +-
 .../LimitedPollingConsumerPollStrategyTest.java    |  68 ++++++------
 .../camel/impl/LogDebugBodyMaxCharsOffTest.java    |  11 +-
 .../camel/impl/LogDebugBodyMaxCharsTest.java       |  13 ++-
 .../apache/camel/impl/LogDebugBodyStreamsTest.java |   4 +-
 .../camel/impl/MemoryStateRepositoryTest.java      |   4 +-
 .../org/apache/camel/impl/MessageSupportTest.java  |   4 +-
 .../apache/camel/impl/ModelCamelContextTest.java   |   4 +-
 .../camel/impl/MultipleConsumersSupportTest.java   |   5 +-
 .../camel/impl/MultipleLifecycleStrategyTest.java  |   6 +-
 ...ingExchangesAsyncDelayShutdownGracefulTest.java |   6 +-
 .../impl/PendingExchangesShutdownGracefulTest.java |   7 +-
 ...ndingExchangesTwoRouteShutdownGracefulTest.java |   9 +-
 .../impl/PojoProduceInterceptEndpointTest.java     |   7 +-
 .../PojoProduceProxyInterceptEndpointTest.java     |   7 +-
 .../camel/impl/ProducerCacheNonSingletonTest.java  |  12 ++-
 .../impl/ProxyInstantiationExceptionTest.java      |   4 +-
 .../org/apache/camel/impl/RefDataFormatTest.java   |   2 +-
 .../RegistryLookupTypeClassCastExceptionTest.java  |   7 +-
 .../camel/impl/RemoveRouteStopEndpointTest.java    |  28 ++---
 .../camel/impl/RouteDirectSuspendResumeTest.java   |   5 +-
 .../camel/impl/RouteIdRestDefinitionTest.java      |   4 +-
 .../impl/RouteMustHaveOutputOnExceptionTest.java   |   4 +-
 .../org/apache/camel/impl/RouteNoOutputTest.java   |   9 +-
 .../RoutePolicyAutoStartupCancelledOnInitTest.java |   7 +-
 .../apache/camel/impl/RoutePolicyCallbackTest.java |   5 +-
 .../apache/camel/impl/RoutePolicyFactoryTest.java  |   2 +-
 .../apache/camel/impl/RoutePolicySupportTest.java  |   4 +-
 .../org/apache/camel/impl/RoutePolicyTest.java     |   5 +-
 .../org/apache/camel/impl/RouteRemoveTest.java     |   4 +-
 .../apache/camel/impl/RouteSedaStopStartTest.java  |   4 +-
 .../camel/impl/RouteSedaSuspendResumeTest.java     |   3 +-
 .../camel/impl/RouteSetRouteIdTwoTimesTest.java    |   4 +-
 .../camel/impl/RouteSuspendResumeWarmUpTest.java   |   4 +-
 .../impl/RouteWithMistypedComponentNameTest.java   |   4 +-
 .../camel/impl/RuntimeEndpointRegistryTest.java    |   4 +-
 .../impl/ScheduledPollConsumerBackoffTest.java     |   4 +-
 .../impl/ScheduledPollConsumerGreedyTest.java      |   4 +-
 .../camel/impl/ScheduledPollConsumerTest.java      |   8 +-
 .../ShutdownGracefulNoAutoStartedRoutesTest.java   |   8 +-
 .../impl/ShutdownGracefulTimeoutTriggerTest.java   |   6 +-
 ...ownStrategyNotSuppressLoggingOnTimeoutTest.java |   6 +-
 ...utdownStrategySuppressLoggingOnTimeoutTest.java |   6 +-
 .../org/apache/camel/impl/SimpleRegistryTest.java  |  11 +-
 .../apache/camel/impl/SimpleRegistryWrapTest.java  |  11 +-
 .../SimpleShutdownGracefulNoAtuoStartedTest.java   |   6 +-
 .../camel/impl/SimpleShutdownGracefulTest.java     |   6 +-
 .../apache/camel/impl/SimpleUuidGeneratorTest.java |   7 +-
 .../apache/camel/impl/StartAndStopRoutesTest.java  |   2 +-
 .../camel/impl/StartStopAndShutdownRouteTest.java  |   5 +-
 .../StartupListenerComponentFromRegistryTest.java  |   5 +-
 .../camel/impl/StartupListenerComponentTest.java   |   5 +-
 .../org/apache/camel/impl/StartupListenerTest.java |   4 +-
 .../camel/impl/StopRouteAbortAfterTimeoutTest.java |  14 +--
 .../camel/impl/TwoRouteSuspendResumeTest.java      |   3 +-
 .../camel/impl/TypeConverterAllowNullTest.java     |   7 +-
 .../TypeConverterRegistryMissesThenAddTest.java    |   7 +-
 .../impl/TypeConverterRegistryPerformanceTest.java |   7 +-
 ...TypeConverterRegistryStatisticsEnabledTest.java |   6 +-
 .../camel/impl/TypeConverterRegistryTest.java      |  11 +-
 .../camel/impl/VetoCamelContextStartTest.java      |   4 +-
 .../camel/impl/converter/TypeConvertersTest.java   |   7 +-
 .../camel/impl/converter/UriTypeConverterTest.java |  10 +-
 ...melPostProcessorHelperConsumePredicateTest.java |   2 +-
 ...amelPostProcessorHelperConsumePropertyTest.java |   4 +-
 ...ostProcessorHelperSedaConsumePredicateTest.java |   2 +-
 .../impl/engine/CamelPostProcessorHelperTest.java  |  13 ++-
 .../impl/engine/CustomThreadPoolFactoryTest.java   |   6 +-
 .../camel/impl/engine/DefaultCamelContextTest.java |  18 ++--
 .../engine/DefaultComponentNameResolverTest.java   |   5 +-
 .../impl/engine/DefaultFactoryFinderTest.java      |  18 +---
 .../DefaultPackageScanResourceResolverTest.java    |   2 +-
 .../DefaultSupervisingRouteControllerTest.java     |   7 +-
 .../camel/impl/engine/EmptyProducerCacheTest.java  |  14 +--
 .../apache/camel/impl/engine/RouteRemove2Test.java |  22 ++--
 .../camel/impl/event/EventNotifierEventsTest.java  |   9 +-
 .../event/EventNotifierExchangeCompletedTest.java  |  10 +-
 .../EventNotifierExchangeSentParallelTest.java     |  10 +-
 .../impl/event/EventNotifierExchangeSentTest.java  |  16 +--
 .../EventNotifierFailureHandledEventsTest.java     |  32 +++---
 .../event/EventNotifierRedeliveryEventsTest.java   |   9 +-
 ...ventNotifierServiceStoppingFailedEventTest.java |   8 +-
 .../event/MultipleEventNotifierEventsTest.java     |   9 +-
 .../camel/impl/lw/EnricherLightweightTest.java     |   6 +-
 .../camel/impl/lw/LightweightContextTest.java      |   6 +-
 .../camel/impl/lw/PollEnricherLightweightTest.java |  10 +-
 .../camel/impl/lw/SplitterLightweightTest.java     |  25 +++--
 .../camel/impl/model/RouteIdFactoryTest.java       |   4 +-
 .../impl/transformer/TransformerContractTest.java  |   4 +-
 .../impl/transformer/TransformerRouteTest.java     |   6 +-
 .../validator/BeanValidatorInputValidateTest.java  |   2 +-
 .../validator/BeanValidatorOutputValidateTest.java |   5 +-
 ...InflightRepositoryWithFailedValidationTest.java |   5 +-
 .../impl/validator/ValidatorContractTest.java      |   4 +-
 .../camel/impl/validator/ValidatorRouteTest.java   |   4 +-
 .../impl/validator/ValidatorXmlSchemaTest.java     |   4 +-
 .../verifier/DefaultComponentVerifierTest.java     |  30 +++---
 .../camel/impl/verifier/ResultErrorHelperTest.java |   6 +-
 .../org/apache/camel/issues/AdviceWithCBRTest.java |   2 +-
 ...viceWithContextScopedErrorHandlerIssueTest.java |   2 +-
 .../issues/AdviceWithErrorHandlerRemoveTest.java   |   5 +-
 .../issues/AdviceWithInterceptFromRemoveTest.java  |   2 +-
 .../issues/AdviceWithInterceptRemoveTest.java      |   2 +-
 ...dviceWithInterceptSendToEndpointRemoveTest.java |   2 +-
 ...nterceptSendToEndpointWithLoadbalancerTest.java |   2 +-
 .../camel/issues/AdviceWithInterceptTest.java      |   2 +-
 .../issues/AdviceWithInvalidConfiguredTest.java    |   5 +-
 .../apache/camel/issues/AdviceWithIssueTest.java   |   5 +-
 .../issues/AdviceWithOnCompletionRemoveTest.java   |   2 +-
 .../camel/issues/AdviceWithOnCompletionTest.java   |   2 +-
 .../AdviceWithOnExceptionAndInterceptTest.java     |   2 +-
 .../AdviceWithOnExceptionMultipleIssueTest.java    |   2 +-
 .../issues/AdviceWithOnExceptionRemoveTest.java    |   5 +-
 .../camel/issues/AdviceWithOnExceptionTest.java    |   2 +-
 .../apache/camel/issues/AdviceWithPolicyTest.java  |   2 +-
 .../camel/issues/AdviceWithRoutePolicyTest.java    |   2 +-
 ...AdviceWithRouteScopedErrorHandlerIssueTest.java |   2 +-
 .../issues/AdviceWithStartTargetIssueTest.java     |   2 +-
 .../camel/issues/AdviceWithTransactedTest.java     |   2 +-
 .../AdviceWithTwoRoutesOnExceptionIssueTest.java   |   4 +-
 .../camel/issues/AdviceWithUrlIssueTest.java       |   2 +-
 .../issues/AdviceWithWeaveByToUriCBRTest.java      |   2 +-
 .../camel/issues/AdviceWithWeaveByTypeCBRTest.java |   2 +-
 .../AggregatorWithBatchConsumingIssueTest.java     |   2 +-
 .../apache/camel/issues/AmahDeadLetterTest.java    |   2 +-
 .../camel/issues/CBRConcurrencyIssueTest.java      |   2 +-
 .../apache/camel/issues/CBRContainsIssueTest.java  |   2 +-
 .../issues/CBRCustomPredicateAsFilterTest.java     |   4 +-
 .../CacheInputStreamInDeadLetterIssue520Test.java  |  10 +-
 .../apache/camel/issues/Camel4857UriIssueTest.java |  13 ++-
 .../camel/issues/ChangeHeaderCaseIssueTest.java    |   4 +-
 .../CharlesSplitAndTryCatchRollbackIssueTest.java  |   5 +-
 ...CharlesSplitUseBeanAsErrorHandlerIssueTest.java |   4 +-
 .../issues/ChoiceEndOrEndChoiceIssueTest.java      |   7 +-
 .../issues/ChoicePredicateSimpleHeaderTest.java    |   2 +-
 .../camel/issues/ComponentUseRawUriTest.java       |  11 +-
 .../issues/ConsumerTemplateSedaQueueIssueTest.java |   4 +-
 ...tScopedOnExceptionErrorHandlerRefIssueTest.java |   2 +-
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |   2 +-
 ...ScopedOnExceptionMultipleRouteBuildersTest.java |   2 +-
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |   5 +-
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   5 +-
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   5 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   5 +-
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   2 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   2 +-
 .../camel/issues/CustomFailveOverProcessor.java    |   2 +
 .../org/apache/camel/issues/DavidSiefertTest.java  |   4 +-
 .../issues/DoCatchCaughExceptionIssueTest.java     |   4 +-
 .../issues/DynamicRouterWithInterceptorTest.java   |   8 +-
 .../issues/EndpointWithRawUriParameterTest.java    |   4 +-
 .../camel/issues/ErrorHandlerAdviceIssueTest.java  |   2 +-
 .../camel/issues/ExceptionCamel4022Test.java       |   5 +-
 .../camel/issues/ExceptionPolicyIssueTest.java     |   2 +-
 .../org/apache/camel/issues/ExceptionTest.java     |   4 +-
 ...tionThrownFromOnExceptionNoEndlessLoopTest.java |  11 +-
 .../issues/ExceptionThrownFromOnExceptionTest.java |  29 ++---
 .../camel/issues/FilePollingConsumerIssueTest.java |   9 +-
 .../issues/FileSplitStreamingWithChoiceTest.java   |   6 +-
 .../issues/FilterCustomPredicateAsFilterTest.java  |   4 +-
 .../org/apache/camel/issues/GertJBIIssueTest.java  |   6 +-
 .../InterceptCustomPredicateAsFilterTest.java      |   3 +-
 .../apache/camel/issues/InterceptFromLogTest.java  |   2 +-
 .../InterceptFromPredicateProceedAndStopTest.java  |   2 +-
 .../java/org/apache/camel/issues/Issue170Test.java |   2 +-
 .../java/org/apache/camel/issues/Issue3Test.java   |  10 +-
 .../camel/issues/MethodClassByTypeIssueTest.java   |   2 +-
 .../MockExpectedHeaderNoMessageSentTest.java       |   5 +-
 .../camel/issues/MockExpectedHeadersIssueTest.java |   2 +-
 .../camel/issues/MockValueBuilderIssueTest.java    |   5 +-
 ...ticastAggregationStrategyInputExchangeTest.java |   5 +-
 ...icastAggregationStrategyThrowExceptionTest.java |   2 +-
 ...essageBodyAndEnrichedHeadersClaimCheckTest.java |   2 +-
 ...xOriginalMessageBodyAndEnrichedHeadersTest.java |   2 +-
 ...eBodyAndEnrichedHeadersUseOriginalBodyTest.java |   2 +-
 ...lelStopOnExceptionWithOnExceptionIssueTest.java |   4 +-
 ...thAggregationStrategyThrowingExceptionTest.java |   2 +-
 .../MulticastPipelineAggregateIssueTest.java       |   2 +-
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   5 +-
 .../issues/MulticastSingleAggregateIssueTest.java  |   2 +-
 ...astStopOnExceptionWithOnExceptionIssueTest.java |   4 +-
 .../issues/MulticastWithOnExceptionIssueTest.java  |   4 +-
 .../MultipleErrorHandlerOnExceptionIssueTest.java  |   2 +-
 .../org/apache/camel/issues/MultipleFromTest.java  |   2 +-
 .../org/apache/camel/issues/NeilSplitterTest.java  |   6 +-
 ...derExactlyDoneSplitterWhereSentToIssueTest.java |   4 +-
 ...tifyBuilderOnFailureShutdownCamelIssueTest.java |   4 +-
 .../apache/camel/issues/OnCompletionIssueTest.java |   5 +-
 .../OnExceptionBeforeErrorHandlerIssueTest.java    |   2 +-
 .../issues/OnExceptionContinuedIssueTest.java      |   2 +-
 ...OnExceptionContinuedNoFailureProcessorTest.java |   2 +-
 ...tionErrorHandlerNoRouteOnExchangeIssueTest.java |   4 +-
 .../OnExceptionErrorHandlerRefIssueTest.java       |   2 +-
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |   2 +-
 .../OnExceptionHandledNoFailureProcessorTest.java  |   2 +-
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |   5 +-
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   5 +-
 ...nExceptionNotHandledNoFailureProcessorTest.java |   2 +-
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   5 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   5 +-
 .../camel/issues/OnExceptionProcessIssueTest.java  |   5 +-
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   2 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   2 +-
 .../camel/issues/OnExceptionWithTwoBeansTest.java  |   2 +-
 .../issues/PropertiesAvailableEverywhereTest.java  |   2 +-
 .../camel/issues/ProxyReturnNullIssueTest.java     |   4 +-
 ...ntListAggregationStrategyInputExchangeTest.java |   5 +-
 .../RecipientListDirectNoConsumerIssueTest.java    |   2 +-
 .../RecipientListErrorHandlingIssueTest.java       |   2 +-
 ...thAggregationStrategyThrowingExceptionTest.java |   2 +-
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   5 +-
 ...eOriginalMessageEndpointExceptionIssueTest.java |   6 +-
 .../RecipientListUseOriginalMessageIssueTest.java  |   8 +-
 .../issues/RecipientListWithInterceptorTest.java   |   8 +-
 ...andlerAsyncDelayedTwoCamelContextIssueTest.java |  14 +--
 ...olicyOnExceptionWhileRedeliveringIssueTest.java |   2 +-
 .../camel/issues/RegExPredicateIssueTest.java      |   2 +-
 ...etryRouteScopedUntilRecipientListIssueTest.java |   5 +-
 .../RetryWhilePredicateExpressionIssueTest.java    |   3 +-
 .../RetryWhileSimpleExpressionIssueTest.java       |   4 +-
 .../apache/camel/issues/RomeksExceptionTest.java   |   7 +-
 .../issues/RouteIdAnonymousAndFixedClashTest.java  |   9 +-
 .../camel/issues/RouteIdAutoAssignClashIssue.java  |   3 +
 .../RouteScopedErrorHandlerAndOnExceptionTest.java |   5 +-
 ...ScopedOnExceptionMultipleRouteBuildersTest.java |   2 +-
 ...eptionWithInterceptSendToEndpointIssueTest.java |   5 +-
 ...erceptSendToEndpointIssueWithPredicateTest.java |   4 +-
 .../RouteStartupFailShouldStopAlsoIssueTest.java   |   4 +-
 .../apache/camel/issues/RouteWithCustomIdTest.java |   4 +-
 .../camel/issues/RoutingSlipMemoryLeakTest.java    |   8 +-
 .../issues/RoutingSlipNotStopErrorHandlerTest.java |   2 +-
 .../issues/RoutingSlipWithInterceptorTest.java     |   8 +-
 ...RouteAndContextScopedErrorHandlerIssueTest.java |   4 +-
 .../camel/issues/SedaFileIdempotentIssueTest.java  |  13 ++-
 .../issues/SentExchangeEventNotifierIssueTest.java |   4 +-
 .../SentExchangeEventNotifierTwoIssueTest.java     |   4 +-
 .../camel/issues/SetBodyTryCatchIssueTest.java     |   4 +-
 .../camel/issues/SetHeaderInDoCatchIssueTest.java  |   4 +-
 .../camel/issues/SplitContinuedLogIssueTest.java   |   4 +-
 .../camel/issues/SplitListListIssueTest.java       |   4 +-
 .../camel/issues/SplitPropertiesFileIssueTest.java |   6 +-
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   5 +-
 .../issues/SplitStopOnExceptionIssueTest.java      |   4 +-
 .../SplitWithCustomAggregationStrategyTest.java    |   2 +-
 .../camel/issues/SplitWithInterceptorTest.java     |   8 +-
 ...litterAggregationStrategyInputExchangeTest.java |   5 +-
 .../issues/SplitterCorrelationIdIssueTest.java     |   5 +-
 .../camel/issues/SplitterParallelIssueTest.java    |   2 +-
 ...arallelRuntimeExceptionInHasNextOrNextTest.java |   4 +-
 ...thAggregationStrategyThrowingExceptionTest.java |   2 +-
 ...rParallelWithIteratorThrowingExceptionTest.java |   5 +-
 .../SplitterThrowExceptionInExpressionTest.java    |   2 +-
 .../SplitterThrowExceptionInExpressionTwoTest.java |   2 +-
 ...terUsingBeanReturningCloseableIteratorTest.java |   7 +-
 .../SplitterUsingBeanReturningMessageTest.java     |   4 +-
 .../camel/issues/StopCamelFromRouteTest.java       |   7 +-
 .../camel/issues/StopRouteFromRouteTest.java       |  15 +--
 .../issues/StopRouteImpactsErrorHandlerTest.java   |   2 +-
 ...dNotStopContextScopedErrorHandlerIssueTest.java |   2 +-
 ...uldNotStopRouteScopedErrorHandlerIssueTest.java |   2 +-
 ...ryCatchInterceptSendToAllEndpointIssueTest.java |   2 +-
 ...ThreadsRejectedExecutionWithDeadLetterTest.java |   2 +-
 .../issues/TimerAndErrorHandlerIssueTest.java      |   2 +-
 .../TransactedPropertyPlaceholderIssueTest.java    |   2 +-
 .../TryCatchFinallyOnExceptionIssueTest.java       |   2 +-
 .../camel/issues/TryCatchSetHeaderIssueTest.java   |   2 +-
 .../camel/issues/TryCatchWithSplitIssueTest.java   |   2 +-
 ...erceptSendToEndpointIssueWithPredicateTest.java |   4 +-
 .../apache/camel/issues/TwoTimerWithJMXIssue.java  |   7 +-
 .../issues/TypeConverterConcurrencyIssueTest.java  |   7 +-
 .../apache/camel/issues/XPathSplitStreamTest.java  |   6 +-
 .../language/BeanAnnotationParameterTest.java      |   2 +-
 .../language/BeanAnnotationParameterTwoTest.java   |   2 +-
 .../language/BeanLanguageInvalidOGNLTest.java      |   5 +-
 .../BeanLanguageMethodMissingParenthesisTest.java  |   5 +-
 .../camel/language/BeanLanguageOGNLTest.java       |   4 +-
 ...LWithDotInParameterPropertyPlaceholderTest.java |   2 +-
 .../BeanLanguageOGNLWithDotInParameterTest.java    |   2 +-
 .../java/org/apache/camel/language/BeanTest.java   |   4 +-
 .../ConstantLanguageBinaryResourceTest.java        |   5 +-
 .../org/apache/camel/language/ConstantTest.java    |   2 +-
 .../camel/language/FileLanguageExtSingleTest.java  |   2 +-
 .../apache/camel/language/FileLanguageTest.java    |   4 +-
 .../java/org/apache/camel/language/HeaderTest.java |   4 +-
 .../apache/camel/language/LanguageServiceTest.java |   4 +-
 .../apache/camel/language/NoSuchLanguageTest.java  |   5 +-
 .../PropertyInjectAnnotationParameterTest.java     |   2 +-
 .../org/apache/camel/language/PropertyTest.java    |   4 +-
 .../apache/camel/language/RefPredicateTest.java    |   2 +-
 .../java/org/apache/camel/language/RefTest.java    |   5 +-
 .../camel/language/SimpleLanguageRouteTest.java    |   2 +-
 .../SimpleLanguageTransformRandomTest.java         |   4 +-
 .../camel/language/SimpleOgnlMapIssueTest.java     |   2 +-
 ...okenPairIteratorSplitChoicePerformanceTest.java |  23 ++--
 .../camel/language/TokenPairPredicateTest.java     |  13 ++-
 .../TokenXMLPairMultiNamespaceSplitTest.java       |   6 +-
 .../TokenXMLPairNamespaceMultilineSplitTest.java   |   2 +-
 ...kenXMLPairNamespaceSplitChildNamespaceTest.java |   6 +-
 .../language/TokenXMLPairNamespaceSplitTest.java   |   6 +-
 .../org/apache/camel/language/TokenizerTest.java   |   5 +-
 .../apache/camel/language/XMLTokenSplitTest.java   |   6 +-
 .../language/XPathAnotherRouteConcurrentTest.java  |   2 +-
 .../camel/language/XPathFromFileExceptionTest.java |  17 +--
 .../apache/camel/language/XPathFunctionTest.java   |   9 +-
 .../language/XPathLanguageSingleNodeListTest.java  |   5 +-
 .../apache/camel/language/XPathResourceTest.java   |   2 +-
 .../language/XPathRouteConcurrentBigTest.java      |   2 +-
 .../camel/language/XPathRouteConcurrentTest.java   |   2 +-
 .../language/XPathSplitChoicePerformanceTest.java  |  23 ++--
 .../java/org/apache/camel/language/XPathTest.java  |   4 +-
 .../simple/SimpleBackwardsCompatibleTest.java      |   8 +-
 .../camel/language/simple/SimpleDecHeaderTest.java |   2 +-
 .../camel/language/simple/SimpleIncHeaderTest.java |   2 +-
 .../SimpleMessageHistoryNotDetailedTest.java       |   4 +-
 .../language/simple/SimpleMessageHistoryTest.java  |   5 +-
 .../camel/language/simple/SimpleOperatorTest.java  |   5 +-
 .../language/simple/SimpleOverrideMethodTest.java  |   2 +-
 .../simple/SimpleParserExpressionInvalidTest.java  |   5 +-
 .../simple/SimpleParserExpressionTest.java         |   5 +-
 .../simple/SimpleParserPredicateInvalidTest.java   |   5 +-
 .../language/simple/SimpleParserPredicateTest.java |  55 +++++-----
 .../simple/SimpleParserRegexpPredicateTest.java    |   5 +-
 .../language/simple/SimpleResourceDynamicTest.java |   2 +-
 .../camel/language/simple/SimpleResourceTest.java  |   2 +-
 .../SimpleRouteExpressionAsPredicateTest.java      |   2 +-
 .../simple/SimpleSetHeaderPredicateTest.java       |   2 +-
 .../apache/camel/language/simple/SimpleTest.java   |  16 +--
 .../language/simple/SimpleWhiteSpaceTest.java      |   2 +-
 .../language/tokenizer/TokenizeLanguageTest.java   |   2 +-
 .../tokenizer/TokenizeWrapLanguageTest.java        |   2 +-
 .../tokenizer/XMLTokenizeLanguageGroupingTest.java |   2 +-
 .../XMLTokenizeLanguageStreamingFileTest.java      |   6 +-
 .../tokenizer/XMLTokenizeLanguageTest.java         |   2 +-
 .../XMLTokenizeWrapLanguageGroupingTest.java       |   2 +-
 .../tokenizer/XMLTokenizeWrapLanguageTest.java     |   2 +-
 .../apache/camel/model/ChoiceDefinitionTest.java   |   4 +-
 .../model/GatherAllStaticEndpointUrisTest.java     |   5 +-
 .../model/GenerateXmFromCamelContextTest.java      |   8 +-
 .../org/apache/camel/model/GenerateXmlTest.java    |   8 +-
 .../camel/model/GlobalOptionsDefinitionTest.java   |  36 ++++---
 .../apache/camel/model/LoadRestFromXmlTest.java    |   9 +-
 .../apache/camel/model/LoadRouteFromXmlTest.java   |   9 +-
 .../model/LoadRouteFromXmlWithInterceptTest.java   |   7 +-
 .../model/LoadRouteFromXmlWithNamespaceTest.java   |   6 +-
 .../model/LoadRouteFromXmlWithOnExceptionTest.java |   7 +-
 .../model/LoadRouteFromXmlWithPolicyTest.java      |  11 +-
 .../model/ModelRouteFilterPatternExcludeTest.java  |   4 +-
 .../ModelRouteFilterPatternIncludeExcludeTest.java |   4 +-
 .../model/ModelRouteFilterPatternIncludeTest.java  |   4 +-
 .../apache/camel/model/ModelSanityCheckerTest.java |  21 ++--
 .../camel/model/OnFallbackDefinitionTest.java      |   4 +-
 .../camel/model/ProcessDefinitionSetBodyTest.java  |   2 +-
 .../camel/model/ProcessorDefinitionHelperTest.java |   4 +-
 .../model/ProcessorTypeConfigurationTest.java      |   5 +-
 .../org/apache/camel/model/RouteGroupTest.java     |   4 +-
 .../apache/camel/model/RoutePropertiesTest.java    |   4 +-
 .../model/StartingRoutesErrorReportedTest.java     |   5 +-
 .../java/org/apache/camel/model/XmlParseTest.java  |  49 +++++----
 .../org/apache/camel/model/XmlRestParseTest.java   |   4 +-
 .../apache/camel/model/XmlRestParseToDTest.java    |   4 +-
 .../org/apache/camel/model/XmlRouteGroupTest.java  |   4 +-
 .../apache/camel/model/XmlRoutePropertiesTest.java |   6 +-
 .../org/apache/camel/model/XmlTestSupport.java     |   6 +-
 .../model/dataformat/Any23DataFormatTest.java      |   2 +-
 .../apache/camel/processor/AsyncLoopCopyTest.java  |   7 +-
 .../org/apache/camel/processor/AsyncLoopTest.java  |   8 +-
 .../BatchResequencerAllowDuplicatesTest.java       |   2 +-
 .../processor/BatchResequencerJMSPriorityTest.java |   2 +-
 .../BatchResequencerWithDuplicateTest.java         |   2 +-
 .../camel/processor/BeanCachedProcessorTest.java   |   7 +-
 .../org/apache/camel/processor/BeanCachedTest.java |   7 +-
 .../BeanInvocationThrowsExceptionTest.java         |  10 +-
 .../BeanOgnMethodWithXPathInjectionTest.java       |  16 +--
 .../BeanProcessorSpecializedMessageTest.java       |   2 +-
 .../camel/processor/BeanRecipientListTest.java     |  10 +-
 .../processor/BeanRecipientListTimeoutTest.java    |   5 +-
 .../org/apache/camel/processor/BeanRouteTest.java  |  14 +--
 .../apache/camel/processor/BeanSingletonTest.java  |   7 +-
 .../camel/processor/BeanWithExceptionTest.java     |   9 +-
 .../processor/BeanWithXPathInjectionTest.java      |  16 +--
 .../camel/processor/BreadcrumbDisabledTest.java    |   6 +-
 .../org/apache/camel/processor/BreadcrumbTest.java |   2 +
 .../camel/processor/CBRHeaderPredicateTest.java    |   2 +-
 .../CBRPredicateBeanThrowExceptionTest.java        |   5 +-
 .../processor/CBRSimplePredicateEmptyBodyTest.java |   2 +-
 .../apache/camel/processor/CBRSimpleTypeTest.java  |   2 +-
 .../camel/processor/CBRWithLoadBalancerTest.java   |   2 +-
 .../camel/processor/CBRWithMulticastTest.java      |   2 +-
 .../camel/processor/CBRWithRecipientListTest.java  |   2 +-
 .../apache/camel/processor/CBRWithWireTapTest.java |   2 +-
 .../processor/Camel715ThreadProcessorTest.java     |   8 +-
 .../CamelCaseInsentiveHeadersFalseTest.java        |   2 +-
 .../CamelCaseInsentiveHeadersTrueTest.java         |   2 +-
 .../CamelContextLogExhaustedMessageBodyTest.java   |   4 +-
 .../org/apache/camel/processor/ChannelTest.java    |   2 +-
 .../apache/camel/processor/ChoiceAsyncTest.java    |   6 +-
 .../processor/ChoiceCompoundPredicateTest.java     |   2 +-
 .../apache/camel/processor/ChoiceNoActionTest.java |   2 +-
 .../camel/processor/ChoiceNoErrorHandlerTest.java  |   4 +-
 .../org/apache/camel/processor/ChoiceTest.java     |   6 +-
 .../processor/ChoiceWhenBeanExpressionTest.java    |   6 +-
 .../ChoiceWhenBeanExpressionWithExceptionTest.java |   8 +-
 .../processor/ChoiceWhenNotPredicateTest.java      |   2 +-
 .../apache/camel/processor/ChoiceWithEndTest.java  |   4 +-
 .../camel/processor/ChoiceWithTranfromTest.java    |   4 +-
 .../ClaimCheckEipDynamicKeyGetSetTest.java         |   2 +-
 .../ClaimCheckEipGetAndRemoveSetTest.java          |   2 +-
 .../camel/processor/ClaimCheckEipGetSetTest.java   |   2 +-
 .../processor/ClaimCheckEipPushPopBodyTest.java    |   2 +-
 .../ClaimCheckEipPushPopExcludeBodyTest.java       |   2 +-
 .../ClaimCheckEipPushPopHeadersPatternTest.java    |   2 +-
 .../processor/ClaimCheckEipPushPopHeadersTest.java |   2 +-
 .../ClaimCheckEipPushPopRemoveHeaderTest.java      |   2 +-
 .../camel/processor/ClaimCheckEipPushPopTest.java  |   2 +-
 .../org/apache/camel/processor/ClaimCheckTest.java |   2 +-
 .../processor/ComposedMessageProcessorTest.java    |   4 +-
 .../camel/processor/ConsumerRouteIdAwareTest.java  |   2 +-
 .../apache/camel/processor/ConvertBodyTest.java    |   8 +-
 .../apache/camel/processor/CorrectRouteIdTest.java |   2 +-
 .../CreateRouteWithNonExistingEndpointTest.java    |  11 +-
 .../CustomConsumerExceptionHandlerTest.java        |   6 +-
 .../camel/processor/CustomLoadBalanceTest.java     |   6 +-
 .../processor/CustomProcessorFactoryTest.java      |   2 +-
 .../camel/processor/CustomRoutePolicyTest.java     |   6 +-
 .../processor/CustomScheduledRoutePolicyTest.java  |   2 +-
 .../camel/processor/DataFormatServiceTest.java     |   5 +-
 .../DeadLetterChannelAlwaysHandledTest.java        |   6 +-
 ...ChannelBuilderWithInvalidDeadLetterUriTest.java |   4 +-
 .../DeadLetterChannelCatchThrowableTest.java       |   2 +-
 ...dLetterChannelExceptionCausePropagatedTest.java |   4 +-
 .../DeadLetterChannelFailureRouteIdTest.java       |   2 +-
 .../DeadLetterChannelHandleNewExceptionTest.java   |   2 +-
 .../DeadLetterChannelHandledExampleTest.java       |   4 +-
 ...etterChannelLogExhaustedMessageHistoryTest.java |   2 +-
 ...nnelLogExhaustedMessageHistoryWithBodyTest.java |   2 +-
 .../DeadLetterChannelNewExceptionTest.java         |   2 +-
 .../DeadLetterChannelNoRedeliveryTest.java         |   6 +-
 ...DeadLetterChannelNotHandleNewExceptionTest.java |   5 +-
 ...adLetterChannelOnExceptionOnRedeliveryTest.java |   6 +-
 .../processor/DeadLetterChannelOnPrepareTest.java  |   2 +-
 .../DeadLetterChannelOnRedeliveryTest.java         |   8 +-
 ...dLetterChannelPropagateCausedExceptionTest.java |   5 +-
 ...etterChannelRedeliverWithDelayBlockingTest.java |   2 +-
 ...LetterChannelRedeliveringWhileShutdownTest.java |   2 +-
 ...eadLetterChannelRedeliveryDelayPatternTest.java |   7 +-
 .../processor/DeadLetterChannelRedeliveryTest.java |  22 ++--
 .../DeadLetterChannelRestartFromBeginningTest.java |   2 +-
 .../processor/DeadLetterChannelSetHeaderTest.java  |   2 +-
 .../camel/processor/DeadLetterChannelTest.java     |  18 ++--
 .../DeadLetterChannelUnmarshalSetHeaderTest.java   |   2 +-
 .../DeadLetterChannelUseOriginalInBodyTest.java    |   4 +-
 ...LetterChannelUseOriginalInBodyWithFileTest.java |   8 +-
 ...tConsumerBridgeErrorHandlerOnExceptionTest.java |   5 +-
 ...ltConsumerBridgeErrorHandlerRedeliveryTest.java |   5 +-
 .../DefaultConsumerBridgeErrorHandlerTest.java     |   5 +-
 .../DefaultErrorHandlerCatchThrowableTest.java     |   5 +-
 .../DefaultErrorHandlerFailureRouteIdTest.java     |   4 +-
 ...ErrorHandlerLogExhaustedMessageHistoryTest.java |   4 +-
 .../DefaultErrorHandlerLogStackTraceTest.java      |   4 +-
 .../DefaultErrorHandlerOnExceptionTest.java        |   2 +-
 .../DefaultErrorHandlerOnPrepareTest.java          |   6 +-
 .../DefaultErrorHandlerRedeliveryTest.java         |  14 ++-
 .../camel/processor/DefaultErrorHandlerTest.java   |   7 +-
 ...cheduledPollConsumerBridgeErrorHandlerTest.java |   5 +-
 .../DefinitionPolicyPerProcessorTest.java          |   6 +-
 .../camel/processor/DelayInterceptorTest.java      |   8 +-
 .../camel/processor/DelayerAsyncDelayedTest.java   |   2 +-
 .../camel/processor/DelayerPerRouteTest.java       |   2 +-
 .../org/apache/camel/processor/DelayerTest.java    |   2 +-
 .../camel/processor/DelayerWhileShutdownTest.java  |   2 +-
 .../org/apache/camel/processor/DetourTest.java     |   2 +-
 .../processor/DoTryCatchWithSplitterTest.java      |   2 +-
 .../DoubleLoadBalancerMisconfigurationTest.java    |   5 +-
 .../apache/camel/processor/DualPipelineTest.java   |   4 +-
 .../apache/camel/processor/DynamicRouter2Test.java |   2 +-
 .../apache/camel/processor/DynamicRouter3Test.java |   2 +-
 .../apache/camel/processor/DynamicRouter4Test.java |   2 +-
 .../processor/DynamicRouterAnnotationTest.java     |   4 +-
 .../DynamicRouterExchangeHeaders2Test.java         |   4 +-
 .../DynamicRouterExchangeHeadersTest.java          |   4 +-
 .../DynamicRouterExchangePropertiesTest.java       |   4 +-
 .../camel/processor/DynamicRouterNoCacheTest.java  |   5 +-
 .../processor/DynamicRouterOnExceptionTest.java    |   2 +-
 .../apache/camel/processor/DynamicRouterTest.java  |   4 +-
 ...amicRouterThrowExceptionFromExpressionTest.java |   2 +-
 ...point2MustBeStartedBeforeSendProcessorTest.java |   4 +-
 ...dpointMustBeStartedBeforeSendProcessorTest.java |   4 +-
 .../apache/camel/processor/EnrichNoCacheTest.java  |   5 +-
 .../camel/processor/EnrichSubUnitOfWorkTest.java   |   7 +-
 ...HandlerOnExceptionRedeliveryAndHandledTest.java |   5 +-
 .../apache/camel/processor/ErrorHandlerTest.java   |   2 +-
 .../processor/ErrorHandlerWrappedEachNodeTest.java |   4 +-
 .../processor/EvaluateExpressionProcessorTest.java |   5 +-
 .../EventNotifierExchangeSentExampleTest.java      |   2 +-
 .../processor/EventNotifierExchangeSentTest.java   |   4 +-
 .../processor/ExceptionHandlerStreamCacheTest.java |  12 ++-
 .../processor/ExchangeCreatedTimestampTest.java    |   4 +-
 .../processor/ExchangeIdempotentConsumerTest.java  |  11 +-
 .../processor/FailOverAllFailedExceptionTest.java  |   9 +-
 .../FailOverLoadBalanceAutoStartupFalseTest.java   |   2 +-
 .../FailOverLoadBalanceMultipleExceptionTest.java  |   6 +-
 ...verLoadBalanceNotInheritedErrorHandlerTest.java |   2 +-
 .../camel/processor/FailOverLoadBalanceTest.java   |  11 +-
 .../FailOverLoadBalanceWithRedeliveryTest.java     |   2 +-
 ...lOverLoadBalanceWrappedExceptionNoLuckTest.java |   9 +-
 .../FailOverLoadBalanceWrappedExceptionTest.java   |   6 +-
 .../FailOverLoadBalancerSetFaultTest.java          |   4 +-
 .../processor/FailOverNotCatchedExceptionTest.java |   9 +-
 ...overLoadBalancerBreakoutDuringShutdownTest.java |   6 +-
 .../FailoverMaximumFailoverAttemptsTest.java       |   5 +-
 .../processor/FailoverRoundRobinGoodBadTest.java   |   2 +-
 .../processor/FailoverRoundRobinStickyTest.java    |   2 +-
 .../camel/processor/FailoverRoundRobinTest.java    |   2 +-
 .../apache/camel/processor/FailoverStickyTest.java |   2 +-
 .../camel/processor/FileIdempotentClearTest.java   |   8 +-
 .../FileIdempotentConsumerCreateRepoTest.java      |  10 +-
 .../FileIdempotentConsumerLoadStoreTest.java       |   9 +-
 .../processor/FileIdempotentConsumerTest.java      |   9 +-
 .../camel/processor/FileIdempotentRemoveTest.java  |   8 +-
 .../processor/FileIdempotentTrunkStoreTest.java    |  12 ++-
 .../processor/FileRollbackOnCompletionTest.java    |  14 +--
 .../camel/processor/FilterBeforeSplitTest.java     |   2 +-
 .../camel/processor/FilterNotMatchedTest.java      |   2 +-
 .../org/apache/camel/processor/FilterNotTest.java  |   2 +-
 .../org/apache/camel/processor/FilterTest.java     |   2 +-
 .../camel/processor/FlipRoutePolicyTest.java       |   2 +-
 .../apache/camel/processor/FromToInOutTest.java    |   4 +-
 .../camel/processor/FromToInOutUsingToTest.java    |   4 +-
 .../camel/processor/GenericXmlTokenizeTest.java    |   2 +-
 .../processor/IdempotentConsumerAsyncTest.java     |   6 +-
 .../IdempotentConsumerCompletionEagerTest.java     |   6 +-
 .../IdempotentConsumerConcurrentTest.java          |  10 +-
 .../camel/processor/IdempotentConsumerDslTest.java |   2 +-
 .../processor/IdempotentConsumerEagerTest.java     |  13 ++-
 .../IdempotentConsumerNoMessageIdTest.java         |   6 +-
 .../IdempotentConsumerRemoveOnFailureTest.java     |   6 +-
 .../IdempotentConsumerRepoExceptionTest.java       |   2 +-
 .../camel/processor/IdempotentConsumerTest.java    |   6 +-
 ...dempotentConsumerUsingCustomRepositoryTest.java |   9 +-
 .../processor/InheritErrorHandlerDefaultTest.java  |   4 +-
 .../processor/InheritErrorHandlerFalseTest.java    |   5 +-
 .../processor/InheritErrorHandlerTrueTest.java     |   4 +-
 .../camel/processor/InlinedProcessorIdTest.java    |   4 +-
 .../org/apache/camel/processor/JoinRoutesTest.java |   6 +-
 .../camel/processor/LanguageBuilderTest.java       |   2 +-
 .../apache/camel/processor/LogEipListenerTest.java |   9 +-
 .../org/apache/camel/processor/LogEipMaskTest.java |   7 +-
 .../processor/LogEipPropagateExceptionTest.java    |   2 +-
 .../apache/camel/processor/LogProcessorTest.java   |   2 +-
 .../LogProcessorWithProvidedLoggerTest.java        |  11 +-
 .../apache/camel/processor/LoopAsyncCopyTest.java  |   2 +-
 .../camel/processor/LoopAsyncNoCopyTest.java       |   2 +-
 .../apache/camel/processor/LoopCopyErrorTest.java  |   5 +-
 .../org/apache/camel/processor/LoopCopyTest.java   |   2 +-
 .../apache/camel/processor/LoopDoWhileTest.java    |   2 +-
 .../apache/camel/processor/LoopExceptionTest.java  |   2 +-
 .../org/apache/camel/processor/LoopNoCopyTest.java |   2 +-
 .../java/org/apache/camel/processor/LoopTest.java  |   8 +-
 .../camel/processor/LoopWithAggregatorTest.java    |   2 +-
 .../org/apache/camel/processor/MDCAsyncTest.java   |   6 +-
 .../processor/MDCOnCompletionOnCompletionTest.java |   4 +-
 .../camel/processor/MDCOnCompletionTest.java       |   4 +-
 .../org/apache/camel/processor/MDCResetTest.java   |   4 +-
 .../java/org/apache/camel/processor/MDCTest.java   |   4 +-
 .../org/apache/camel/processor/MDCWireTapTest.java |   5 +-
 .../camel/processor/MDCWithBreadcrumbTest.java     |   2 +
 .../camel/processor/MarkRollbackOnlyTest.java      |   4 +-
 .../processor/MessageHistoryCopyExchangeTest.java  |   4 +-
 .../processor/MessageHistoryCopyMessageTest.java   |   5 +-
 .../processor/MessageHistoryDumpRoutingTest.java   |   2 +-
 .../processor/MessageHistoryStepOnlyTest.java      |   5 +-
 .../apache/camel/processor/MethodFilterTest.java   |   2 +-
 .../MultiCastParallelAndStreamCachingTest.java     |   2 +-
 .../MultiCastStreamCachingInSubRouteTest.java      |   2 +-
 .../MultiErrorHandlerInRouteNotHandledTest.java    |   2 +-
 .../processor/MultiErrorHandlerInRouteTest.java    |   2 +-
 .../processor/MulticastCompletedPropertyTest.java  |   2 +-
 .../MulticastCopyOfSplitSubUnitOfWorkTest.java     |   7 +-
 .../apache/camel/processor/MulticastDslTest.java   |   2 +-
 .../MulticastFineGrainedErrorHandlingTest.java     |   4 +-
 .../MulticastGroupedExchangeExceptionTest.java     |   9 +-
 .../MulticastKeepOriginalMessageUnchangedTest.java |   2 +-
 .../camel/processor/MulticastNoOnPrepareTest.java  |   4 +-
 .../processor/MulticastNoStopOnExceptionTest.java  |   5 +-
 .../camel/processor/MulticastOnPrepareTest.java    |   4 +-
 .../MulticastParallelAllTimeoutAwareTest.java      |   5 +-
 .../MulticastParallelFailureEndpointTest.java      |   5 +-
 ...ticastParallelFineGrainedErrorHandlingTest.java |   4 +-
 .../MulticastParallelLastTimeoutTest.java          |   2 +-
 .../MulticastParallelMiddleTimeoutTest.java        |   2 +-
 .../MulticastParallelNoStopOnExceptionTest.java    |  13 ++-
 .../MulticastParallelStopOnExceptionTest.java      |  12 ++-
 .../processor/MulticastParallelStreamingTest.java  |   4 +-
 .../MulticastParallelStreamingTimeoutTest.java     |   2 +-
 .../MulticastParallelStreamingTwoTimeoutTest.java  |   2 +-
 .../processor/MulticastParallelStressTest.java     |   2 +-
 .../camel/processor/MulticastParallelTest.java     |   4 +-
 .../processor/MulticastParallelTimeout2Test.java   |   2 +-
 .../processor/MulticastParallelTimeout3Test.java   |   2 +-
 .../MulticastParallelTimeoutAwareTest.java         |   5 +-
 .../processor/MulticastParallelTimeoutTest.java    |   2 +-
 .../MulticastParallelTwoTimeoutMiddleTest.java     |   2 +-
 .../processor/MulticastParallelTwoTimeoutTest.java |   2 +-
 .../camel/processor/MulticastPipelineTest.java     |   2 +-
 .../camel/processor/MulticastRedeliverTest.java    |  14 ++-
 ...castStopOnExceptionLastWithOnExceptionTest.java |   4 +-
 .../processor/MulticastStopOnExceptionTest.java    |   4 +-
 ...ulticastStopOnExceptionWithOnExceptionTest.java |   4 +-
 .../processor/MulticastStreamCachingTest.java      |   6 +-
 .../processor/MulticastSubUnitOfWorkTest.java      |   7 +-
 .../org/apache/camel/processor/MulticastTest.java  |   6 +-
 .../camel/processor/MulticastUnitOfWorkTest.java   |   7 +-
 .../processor/MulticastWithOnExceptionTest.java    |   4 +-
 .../apache/camel/processor/NavigateRouteTest.java  |   6 +-
 .../camel/processor/NestedChoiceIssueTest.java     |   2 +-
 .../processor/NewProcessorAndServiceTest.java      |   7 +-
 .../org/apache/camel/processor/NormalizerTest.java |   2 +-
 ...deliveryWhileStoppingDeadLetterChannelTest.java |   6 +-
 .../NotAllowRedeliveryWhileStoppingTest.java       |   6 +-
 ...letionAndInterceptAndOnExceptionGlobalTest.java |   5 +-
 .../OnCompletionAndInterceptGlobalTest.java        |   5 +-
 .../processor/OnCompletionAndInterceptTest.java    |   5 +-
 .../camel/processor/OnCompletionAsyncTest.java     |   5 +-
 .../camel/processor/OnCompletionContainsTest.java  |   2 +-
 .../OnCompletionGlobalCustomPoolTest.java          |   8 +-
 .../camel/processor/OnCompletionGlobalTest.java    |   5 +-
 .../OnCompletionInvalidConfiguredTest.java         |   5 +-
 .../camel/processor/OnCompletionModeTest.java      |   4 +-
 .../OnCompletionMoreGlobalRouteCompletionTest.java |   5 +-
 .../processor/OnCompletionMoreGlobalTest.java      |   5 +-
 .../processor/OnCompletionOnCompleteOnlyTest.java  |   5 +-
 .../processor/OnCompletionOnFailureOnlyTest.java   |   2 +-
 .../OnCompletionParallelProcessingTest.java        |   4 +-
 ...ompletionRouteScopeOverrideGlobalScopeTest.java |   5 +-
 .../processor/OnCompletionShouldBeLastTest.java    |   2 +-
 .../OnCompletionShutdownProcessorTest.java         |   4 +-
 .../apache/camel/processor/OnCompletionTest.java   |   5 +-
 .../processor/OnCompletionUseOriginalBodyTest.java |   4 +-
 .../camel/processor/OnCompletionWhenTest.java      |   2 +-
 .../processor/OnExceptionContinueToRouteTest.java  |   2 +-
 .../camel/processor/PipelineConcurrentTest.java    |   2 +-
 .../apache/camel/processor/PipelineMEPTest.java    |   5 +-
 .../camel/processor/PipelineStepWithEventTest.java |   9 +-
 .../org/apache/camel/processor/PipelineTest.java   |  10 +-
 .../camel/processor/PolicyPerProcessorTest.java    |   8 +-
 .../apache/camel/processor/PolicyPerRouteTest.java |   6 +-
 .../camel/processor/PollEnrichNoCacheTest.java     |   5 +-
 .../ProcessorMutateExchangeRedeliverTest.java      |  14 ++-
 .../ProducerTemplateDisableEventNotifierTest.java  |   4 +-
 .../RandomLoadBalanceJavaDSLBuilderTest.java       |   4 +-
 .../camel/processor/RandomLoadBalanceTest.java     |   6 +-
 .../RecipientListAggregationStrategyTest.java      |   2 +-
 .../processor/RecipientListBeanOnPrepareTest.java  |   4 +-
 .../RecipientListBeanSubUnitOfWorkTest.java        |   7 +-
 .../camel/processor/RecipientListBeanTest.java     |   4 +-
 ...pientListContextScopedOnExceptionIssueTest.java |   4 +-
 .../RecipientListDoNotStopOnExceptionTest.java     |   5 +-
 ...istExchangePropertyAggregationStrategyTest.java |   4 +-
 .../RecipientListExchangePropertyTest.java         |   6 +-
 .../RecipientListFineGrainedErrorHandlingTest.java |   5 +-
 .../processor/RecipientListFunctionalTest.java     |   2 +-
 .../RecipientListIgnoreInvalidEndpointsTest.java   |   8 +-
 ...cipientListInvalidEndpointErrorHandlerTest.java |   2 +-
 ...tInvalidEndpointIgnoreInvalidEndpointsTest.java |   2 +-
 .../camel/processor/RecipientListLeakTest.java     |   2 +-
 .../camel/processor/RecipientListMEPTest.java      |   4 +-
 .../processor/RecipientListMEPWithRawTest.java     |   2 +-
 .../camel/processor/RecipientListNoCacheTest.java  |   4 +-
 .../processor/RecipientListNoErrorHandlerTest.java |   2 +-
 .../processor/RecipientListOnPrepareTest.java      |   4 +-
 ...ntListParallelAggregateThreadPoolIssueTest.java |   6 +-
 ...ntListParallelFineGrainedErrorHandlingTest.java |   5 +-
 ...ParallelStopOnExceptionWithOnExceptionTest.java |   4 +-
 .../RecipientListParallelStreamingTest.java        |   2 +-
 .../camel/processor/RecipientListParallelTest.java |   2 +-
 .../RecipientListParallelTimeoutTest.java          |   4 +-
 .../processor/RecipientListRedeliverTest.java      |  14 ++-
 .../processor/RecipientListReturnValueTest.java    |   4 +-
 .../RecipientListStopOnExceptionTest.java          |   5 +-
 ...ientListStopOnExceptionWithOnExceptionTest.java |   4 +-
 .../processor/RecipientListSubUnitOfWorkTest.java  |   7 +-
 .../apache/camel/processor/RecipientListTest.java  |   2 +-
 ...ipientListThrowExceptionFromExpressionTest.java |   2 +-
 .../RecipientListThrowExceptionSubRouteTest.java   |   2 +-
 .../RecipientListWithArrayHeaderTest.java          |   2 +-
 .../processor/RecipientListWithDelimiterTest.java  |   2 +-
 .../RecipientListWithSimpleExpressionTest.java     |   2 +-
 ...RecipientListWithStringDelimitedHeaderTest.java |   2 +-
 ...cipientListWithStringDelimitedPropertyTest.java |   2 +-
 .../camel/processor/RedeliverToSubRouteTest.java   |   2 +-
 ...tterErrorHandlerNoRedeliveryOnShutdownTest.java |   8 +-
 .../RedeliveryErrorHandlerBlockedDelayTest.java    |   2 +-
 ...veryErrorHandlerBreakoutDuringShutdownTest.java |   6 +-
 .../RedeliveryErrorHandlerLogHandledTest.java      |   5 +-
 ...veryErrorHandlerNoRedeliveryOnShutdownTest.java |   6 +-
 .../RedeliveryErrorHandlerNonBlockedDelayTest.java |   2 +-
 ...ErrorHandlerNonBlockedRedeliveryHeaderTest.java |   2 +-
 .../RedeliveryOnExceptionBlockedDelayTest.java     |   2 +-
 .../RedeliveryPolicyDelayPatternTest.java          |   7 +-
 .../RedeliveryPolicyPerExceptionTest.java          |  14 ++-
 .../org/apache/camel/processor/RegExRouteTest.java |   2 +-
 .../apache/camel/processor/RemoveHeaderTest.java   |   9 +-
 .../camel/processor/RemoveHeadersExcludeTest.java  |   4 +-
 .../apache/camel/processor/RemoveHeadersTest.java  |   4 +-
 .../RemovePropertiesWithExclusionTest.java         |   9 +-
 .../RemovePropertiesWithoutExclusionTest.java      |   9 +-
 .../apache/camel/processor/RemovePropertyTest.java |   9 +-
 ...ResequenceStreamIgnoreInvalidExchangesTest.java |   2 +-
 ...equenceStreamNotIgnoreInvalidExchangesTest.java |   4 +-
 .../ResequenceStreamRejectOldExchangesTest.java    |   2 +-
 .../apache/camel/processor/ResequencerTest.java    |  14 +--
 .../camel/processor/RollbackCustomMessageTest.java |   5 +-
 .../processor/RollbackDefaultErrorHandlerTest.java |  11 +-
 .../processor/RollbackDefaultMessageTest.java      |   5 +-
 .../org/apache/camel/processor/RollbackTest.java   |   9 +-
 .../camel/processor/RoundRobinLoadBalanceTest.java |   6 +-
 .../camel/processor/RouteAutoStartupTest.java      |   4 +-
 .../camel/processor/RouteAwareProcessorTest.java   |   2 +-
 .../camel/processor/RouteAwareRouteTest.java       |   2 +-
 .../processor/RouteAwareSynchronizationTest.java   |   4 +-
 .../camel/processor/RouteContextProcessorTest.java |   6 +-
 .../camel/processor/RouteFormattedUriTest.java     |   6 +-
 .../org/apache/camel/processor/RouteIdTest.java    |   4 +-
 .../camel/processor/RouteMEPOptionalOutTest.java   |   4 +-
 .../camel/processor/RouteNoAutoStartupTest.java    |   2 +-
 .../camel/processor/RouteOneInputAllowedTest.java  |   5 +-
 .../camel/processor/RoutePerformanceCountTest.java |   4 +-
 .../camel/processor/RoutePoliciesRefTest.java      |   2 +-
 .../apache/camel/processor/RoutePoliciesTest.java  |   2 +-
 .../processor/RouteServicesStartupOrderTest.java   |   4 +-
 .../RouteShutdownNotReverseOrderTest.java          |   4 +-
 .../processor/RouteShutdownReverseOrderTest.java   |   4 +-
 .../processor/RouteStartupOrderClashTest.java      |   5 +-
 .../RouteStartupOrderDirectReverseTest.java        |   4 +-
 .../processor/RouteStartupOrderDirectTest.java     |   4 +-
 .../camel/processor/RouteStartupOrderLastTest.java |   4 +-
 .../processor/RouteStartupOrderSimpleTest.java     |   4 +-
 ...StartupOrderSuspendResumeNoAutoStartupTest.java |   4 +-
 .../RouteStartupOrderSuspendResumeTest.java        |   4 +-
 .../camel/processor/RouteStartupOrderTest.java     |   4 +-
 .../RouteStartupOrderWithDefaultTest.java          |   4 +-
 .../org/apache/camel/processor/RouteStopTest.java  |   2 +-
 .../processor/RouteTopLevelMisconfiguredTest.java  |   5 +-
 ...RouteWithConstantFieldFromExchangeFailTest.java |   9 +-
 .../RouteWithConstantFieldFromExchangeTest.java    |   2 +-
 ...utingSlipContextScopedOnExceptionIssueTest.java |   4 +-
 .../apache/camel/processor/RoutingSlipDslTest.java |   2 +-
 .../processor/RoutingSlipInOutAndInOnlyTest.java   |   4 +-
 .../camel/processor/RoutingSlipNoCacheTest.java    |   5 +-
 .../processor/RoutingSlipNoErrorHandlerTest.java   |   2 +-
 .../RoutingSlipNoSuchEndpointExceptionTest.java    |   2 +-
 .../camel/processor/RoutingSlipRedeliverTest.java  |  14 ++-
 ...outingSlipThrowExceptionFromExpressionTest.java |   2 +-
 .../apache/camel/processor/SagaFailuresTest.java   |   2 +-
 .../apache/camel/processor/SagaOptionsTest.java    |   4 +-
 .../camel/processor/SagaPropagationTest.java       |  13 +--
 .../java/org/apache/camel/processor/SagaTest.java  |   8 +-
 .../apache/camel/processor/SagaTimeoutTest.java    |   2 +-
 .../camel/processor/SamplingThrottlerTest.java     |   4 +-
 .../apache/camel/processor/ScriptExternalTest.java |   6 +-
 .../org/apache/camel/processor/ScriptTest.java     |   6 +-
 .../processor/SendExchangePatternOptionTest.java   |   2 +-
 .../camel/processor/SendToNoErrorHandlerTest.java  |   2 +-
 .../processor/SendToNonExistingEndpointTest.java   |   7 +-
 .../camel/processor/SetBodyProcessorTest.java      |   2 +-
 .../camel/processor/SetExchangePatternTest.java    |   7 +-
 .../SetHeaderUsingDslExpressionsTest.java          |   6 +-
 .../apache/camel/processor/SetPropertyTest.java    |   8 +-
 .../processor/ShutdownCompleteAllTasksTest.java    |  10 +-
 .../ShutdownCompleteCurrentTaskOnlyTest.java       |  10 +-
 .../apache/camel/processor/ShutdownDeferTest.java  |   9 +-
 .../camel/processor/ShutdownNotDeferTest.java      |   9 +-
 .../ShutdownSedaAndDirectEndpointTest.java         |   2 +-
 .../apache/camel/processor/SimpleDirectTest.java   |   2 +-
 .../camel/processor/SimpleMockPlaceholderTest.java |   2 +-
 .../camel/processor/SimpleMockSampleTest.java      |   2 +-
 .../org/apache/camel/processor/SimpleMockTest.java |   4 +-
 .../camel/processor/SimpleMockTwoRoutesTest.java   |   4 +-
 .../processor/SimpleProcessorIdAwareTest.java      |   4 +-
 .../camel/processor/SimpleProcessorTest.java       |   4 +-
 .../processor/SimpleProcessorTraceableTest.java    |   4 +-
 .../camel/processor/SimpleResultTypeRouteTest.java |   2 +-
 .../processor/SimpleSingleOutputMockTest.java      |   4 +-
 .../camel/processor/SimpleTryCatchFinallyTest.java |   2 +-
 .../camel/processor/SimpleTryFinallyTest.java      |   2 +-
 .../SimpleTryThrowExceptionFinallyTest.java        |   5 +-
 .../org/apache/camel/processor/SimulatorTest.java  |   6 +-
 .../org/apache/camel/processor/SortBodyTest.java   |   4 +-
 .../apache/camel/processor/SortExpressionTest.java |   4 +-
 .../camel/processor/SplitAggregateInOutTest.java   |   4 +-
 .../camel/processor/SplitCustomExpressionTest.java |   2 +-
 .../camel/processor/SplitGroupMultiLinesTest.java  |   2 +-
 .../camel/processor/SplitGroupMultiXmlTest.java    |   6 +-
 .../processor/SplitGroupMultiXmlTokenTest.java     |   6 +-
 .../camel/processor/SplitGroupSkipFirstTest.java   |   2 +-
 .../SplitGroupWrappedMultiXmlTokenTest.java        |   6 +-
 .../camel/processor/SplitIteratorNullTest.java     |   5 +-
 .../camel/processor/SplitParallelTimeoutTest.java  |   5 +-
 .../processor/SplitRefCustomExpressionTest.java    |   2 +-
 ...ubUnitOfWorkStopOnExceptionAndParallelTest.java |   7 +-
 .../SplitSubUnitOfWorkStopOnExceptionTest.java     |   7 +-
 .../camel/processor/SplitSubUnitOfWorkTest.java    |   7 +-
 .../processor/SplitTokenizerGroupDynamicTest.java  |   2 +-
 .../camel/processor/SplitTokenizerGroupTest.java   |   2 +-
 .../processor/SplitTokenizerNamespaceTest.java     |   2 +-
 .../processor/SplitTokenizerRegexpGroupTest.java   |   2 +-
 .../apache/camel/processor/SplitTokenizerTest.java |   2 +-
 .../processor/SplitTokenizerXmlMultilineTest.java  |   2 +-
 .../camel/processor/SplitTwoSubUnitOfWorkTest.java |  10 +-
 .../apache/camel/processor/SplitWithEndTest.java   |   4 +-
 .../camel/processor/SplitterCollateTest.java       |   4 +-
 .../processor/SplitterCompletedPropertyTest.java   |   2 +-
 .../camel/processor/SplitterMethodCallTest.java    |   2 +-
 .../SplitterNoAggregationStrategyTest.java         |   5 +-
 .../processor/SplitterNoStopOnExceptionTest.java   |   5 +-
 .../camel/processor/SplitterNullBodyTest.java      |   2 +-
 .../camel/processor/SplitterOnCompletionTest.java  |   5 +-
 .../processor/SplitterOnPrepareExceptionTest.java  |   4 +-
 .../camel/processor/SplitterOnPrepareTest.java     |   4 +-
 .../processor/SplitterParallelAggregateTest.java   |   2 +-
 .../processor/SplitterParallelBigFileTest.java     |  10 +-
 .../SplitterParallelNoStopOnExceptionTest.java     |  13 ++-
 .../SplitterParallelStopOnExceptionTest.java       |  12 ++-
 ...ParallelStopOnExceptionWithOnExceptionTest.java |   4 +-
 .../apache/camel/processor/SplitterPojoTest.java   |   8 +-
 .../processor/SplitterPropertyContinuedTest.java   |   2 +-
 ...SplitterShareUnitOfWorkCompletionAwareTest.java |   2 +-
 .../apache/camel/processor/SplitterSkipTest.java   |   2 +-
 .../processor/SplitterStopOnExceptionTest.java     |   4 +-
 ...SplitterStopOnExceptionWithOnExceptionTest.java |   4 +-
 .../camel/processor/SplitterStreamCacheTest.java   |   6 +-
 .../SplitterStreamCachingInSubRouteTest.java       |   2 +-
 .../SplitterStreamingErrorHandlingTest.java        |   5 +-
 ...rStreamingStopOnExceptionErrorHandlingTest.java |   5 +-
 .../processor/SplitterStreamingUoWIssueTest.java   |   6 +-
 .../SplitterStreamingWithErrorHandlerTest.java     |   2 +-
 .../org/apache/camel/processor/SplitterTest.java   |  21 ++--
 .../SplitterThrowExceptionFromExpressionTest.java  |   2 +-
 .../camel/processor/SplitterUoWIssueTest.java      |   6 +-
 .../processor/SplitterUseOriginalLoopTest.java     |   2 +-
 ...litterUseOriginalNotPropagateExceptionTest.java |   5 +-
 .../processor/SplitterWireTapStreamCacheTest.java  |   6 +-
 .../SplitterWithCustomThreadPoolExecutorTest.java  |   4 +-
 .../processor/SplitterWithDualMulticastTest.java   |   2 +-
 .../camel/processor/SplitterWithMulticastTest.java |   2 +-
 .../SplitterWithScannerIoExceptionTest.java        |   2 +-
 .../camel/processor/SplitterWithXqureyTest.java    |   6 +-
 .../camel/processor/StepEventNotifierTest.java     |   4 +-
 .../java/org/apache/camel/processor/StepTest.java  |   2 +-
 .../camel/processor/StickyLoadBalanceTest.java     |   6 +-
 .../StreamCachingCustomShouldSpoolRuleTest.java    |  10 +-
 .../camel/processor/StreamCachingInOutTest.java    |   7 +-
 .../processor/StreamCachingOnlyRouteTest.java      |   2 +-
 .../camel/processor/StreamCachingPerRouteTest.java |   6 +-
 .../processor/StreamCachingRecipientListTest.java  |   2 +-
 .../processor/StreamCachingRoutingSlipTest.java    |   2 +-
 .../StreamCachingSpoolDirectoryQuarkusTest.java    |  10 +-
 .../processor/StreamCachingXPathRouteTest.java     |   2 +-
 .../camel/processor/StreamResequencerTest.java     |   6 +-
 .../StreamSourceContentBasedRouterTest.java        |   6 +-
 .../ThreadsCoreAndMaxPoolInvalidTest.java          |   5 +-
 .../ThreadsCoreAndMaxPoolKeepAliveTimeTest.java    |   2 +-
 .../camel/processor/ThreadsCoreAndMaxPoolTest.java |   2 +-
 .../camel/processor/ThreadsCorePoolTest.java       |  17 +--
 .../apache/camel/processor/ThreadsDefaultTest.java |   2 +-
 .../camel/processor/ThreadsInvalidConfigTest.java  |  22 ++--
 .../camel/processor/ThreadsMaxQueueSizeTest.java   |   2 +-
 .../processor/ThreadsRejectedExecutionTest.java    |   5 +-
 .../camel/processor/ThreadsRejectedPolicyTest.java |   2 +-
 .../camel/processor/ThreadsRequestReplyTest.java   |   7 +-
 .../processor/ThreadsZeroInCoreAndMaxPoolTest.java |   8 +-
 .../ThrottlerAsyncDelayedCallerRunsTest.java       |   2 +-
 .../camel/processor/ThrottlerAsyncDelayedTest.java |   2 +-
 .../apache/camel/processor/ThrottlerDslTest.java   |   6 +-
 .../processor/ThrottlerInvalidConfiguredTest.java  |   5 +-
 .../camel/processor/ThrottlerMethodCallTest.java   |   4 +-
 .../camel/processor/ThrottlerNullEvalTest.java     |   2 +-
 .../org/apache/camel/processor/ThrottlerTest.java  |   8 +-
 .../processor/ThrottlerThreadPoolProfileTest.java  |   2 +-
 ...xceptionRoutePolicyHalfOpenHandlerSedaTest.java |   6 +-
 ...ingExceptionRoutePolicyHalfOpenHandlerTest.java |   6 +-
 ...ThrottlingExceptionRoutePolicyHalfOpenTest.java |   6 +-
 ...lingExceptionRoutePolicyKeepOpenOnInitTest.java |   6 +-
 ...tlingExceptionRoutePolicyOpenViaConfigTest.java |   6 +-
 .../ThrottlingExceptionRoutePolicyTest.java        |   6 +-
 .../camel/processor/ThrottlingGroupingTest.java    |   8 +-
 .../ThrottlingInflightRoutePolicyTest.java         |   2 +-
 .../camel/processor/ThrowExceptionMessageTest.java |   5 +-
 .../processor/ThrowExceptionNullMessageTest.java   |   5 +-
 .../apache/camel/processor/ThrowExceptionTest.java |   5 +-
 .../ToDynamicAutoStartupComponentsTest.java        |   4 +-
 .../apache/camel/processor/ToDynamicEmptyTest.java |   2 +-
 .../camel/processor/ToDynamicIgnoreTest.java       |   2 +-
 ...DynamicLanguageSimpleAndXPathAndHeaderTest.java |   2 +-
 .../ToDynamicLanguageSimpleAndXPathTest.java       |   2 +-
 .../processor/ToDynamicLanguageXPathTest.java      |   2 +-
 .../camel/processor/ToDynamicNoCacheTest.java      |   5 +-
 .../ToDynamicPropertyPlaceholderTest.java          |   5 +-
 .../camel/processor/ToDynamicRawAndXPathTest.java  |   2 +-
 .../apache/camel/processor/ToDynamicRawTest.java   |   2 +-
 .../processor/ToDynamicSendDynamicAwareTest.java   |   6 +-
 .../org/apache/camel/processor/ToDynamicTest.java  |   4 +-
 .../camel/processor/ToEndpointPropertyTest.java    |   4 +-
 .../camel/processor/TopicLoadBalanceTest.java      |   6 +-
 .../apache/camel/processor/TraceDelayerTest.java   |   2 +-
 .../camel/processor/TraceInterceptorTest.java      |   2 +-
 .../camel/processor/TracePerRouteManualTest.java   |   2 +-
 .../camel/processor/TracerConfigurationTest.java   |   2 +-
 .../processor/TransformBeanExceptionTest.java      |   2 +-
 .../TransformProcessorWithHeaderTest.java          |   2 +-
 .../org/apache/camel/processor/TransformTest.java  |   6 +-
 .../camel/processor/TransformViaDSLTest.java       |   6 +-
 .../apache/camel/processor/TransformXpathTest.java |   4 +-
 .../processor/TripleNestedChoiceIssueTest.java     |   2 +-
 .../TryCatchCaughtExceptionFinallyTest.java        |   4 +-
 .../processor/TryCatchCaughtExceptionTest.java     |   4 +-
 .../TryCatchCaughtExceptionTwoTimesTest.java       |   4 +-
 .../processor/TryCatchContinueToRouteTest.java     |   2 +-
 .../TryCatchMustHaveExceptionConfiguredTest.java   |   5 +-
 .../camel/processor/TryCatchNestedChoiceTest.java  |   2 +-
 .../camel/processor/TryCatchRecipientListTest.java |   2 +-
 .../processor/TryFinallyCaughtExceptionTest.java   |   4 +-
 .../TryProcessorHandleWrappedExceptionTest.java    |  13 ++-
 .../TryProcessorMultipleExceptionTest.java         |   2 +-
 .../camel/processor/TryProcessorOnWhenTest.java    |   5 +-
 .../apache/camel/processor/TryProcessorTest.java   |  10 +-
 .../TypeConverterRegistryStatsPerformanceTest.java |   2 +-
 .../camel/processor/UnitOfWorkProducerTest.java    |   8 +-
 .../org/apache/camel/processor/UnitOfWorkTest.java |  28 ++---
 .../processor/UnitOfWorkWithAsyncFlowTest.java     |   4 +-
 .../camel/processor/UnmarshalProcessorTest.java    |  12 ++-
 .../org/apache/camel/processor/ValidateIdTest.java |   4 +-
 .../apache/camel/processor/ValidateRegExpTest.java |  10 +-
 .../apache/camel/processor/ValidateSimpleTest.java |   8 +-
 .../processor/ValidatingDomProcessorTest.java      |   8 +-
 .../ValidatingProcessorFromSourceTest.java         |   9 +-
 .../processor/ValidatingProcessorFromUrlTest.java  |   8 +-
 .../ValidatingProcessorNotUseSharedSchemaTest.java |  11 +-
 .../camel/processor/ValidatingProcessorTest.java   |  14 ++-
 .../ValidationFinallyBlockNoCatchTest.java         |   8 +-
 .../processor/ValidationFinallyBlockTest.java      |   6 +-
 .../org/apache/camel/processor/ValidationTest.java |   8 +-
 .../camel/processor/VerySimpleDirectTest.java      |   2 +-
 .../processor/WeightedRandomLoadBalanceTest.java   |   9 +-
 .../WeightedRoundRobinLoadBalanceTest.java         |   9 +-
 .../camel/processor/WireTapAbortPolicyTest.java    |  12 ++-
 .../processor/WireTapBeanAsProcessorTest.java      |   8 +-
 .../apache/camel/processor/WireTapBeanTest.java    |   6 +-
 .../camel/processor/WireTapCustomPool2Test.java    |  10 +-
 .../camel/processor/WireTapCustomPoolTest.java     |  10 +-
 .../camel/processor/WireTapExpressionTest.java     |   2 +-
 .../camel/processor/WireTapLogEndpointTest.java    |   2 +-
 .../org/apache/camel/processor/WireTapLogTest.java |   2 +-
 .../camel/processor/WireTapNewExchangeTest.java    |   2 +-
 .../apache/camel/processor/WireTapNoCacheTest.java |   5 +-
 .../camel/processor/WireTapOnExceptionTest.java    |   2 +-
 .../camel/processor/WireTapOnPrepareTest.java      |   8 +-
 .../camel/processor/WireTapShutdownBeanTest.java   |   4 +-
 .../camel/processor/WireTapShutdownRouteTest.java  |   4 +-
 .../camel/processor/WireTapStreamCachingTest.java  |   6 +-
 .../org/apache/camel/processor/WireTapTest.java    |   6 +-
 ...WireTapUsingFireAndForgetCopyAsDefaultTest.java |  13 ++-
 .../WireTapUsingFireAndForgetCopyTest.java         |  13 ++-
 .../processor/WireTapUsingFireAndForgetTest.java   |   9 +-
 .../camel/processor/WireTapUsingMulticastTest.java |   6 +-
 .../camel/processor/WireTapVoidBeanTest.java       |   3 +-
 .../apache/camel/processor/XPathChoiceTest.java    |   6 +-
 .../apache/camel/processor/XPathFilterTest.java    |   2 +-
 .../XPathWithNamespaceBuilderFilterTest.java       |   6 +-
 .../processor/XPathWithNamespacesFilterTest.java   |   6 +-
 .../aggregator/AbstractDistributedTest.java        |   8 +-
 ...ggregateAggregationStrategyIsPredicateTest.java |   2 +-
 .../AggregateClosedCorrelationKeyTest.java         |   6 +-
 .../aggregator/AggregateCompleteAllOnStopTest.java |   2 +-
 ...yBatchConsumerSendEmptyMessageWhenIdleTest.java |   2 +-
 ...gateCompletionAwareAggregationStrategyTest.java |   2 +-
 .../AggregateCompletionIntervalTest.java           |   2 +-
 ...gregateCompletionOnNewCorrelationGroupTest.java |   2 +-
 .../aggregator/AggregateCompletionOnlyOneTest.java |   4 +-
 .../aggregator/AggregateCompletionOnlyTwoTest.java |   4 +-
 .../AggregateCompletionPredicateTest.java          |   2 +-
 ...ggregateCompletionSizeAndBatchConsumerTest.java |   2 +-
 ...gateCompletionSizeExpressionAndTimeoutTest.java |   2 +-
 .../AggregateConcurrentPerCorrelationKeyTest.java  |   2 +-
 .../aggregator/AggregateControllerTest.java        |   4 +-
 .../aggregator/AggregateDiscardOnFailureTest.java  |   2 +-
 .../aggregator/AggregateDiscardOnTimeoutTest.java  |   4 +-
 .../processor/aggregator/AggregateDslTest.java     |   2 +-
 .../AggregateEagerCheckCompletionTest.java         |   2 +-
 .../AggregateExpressionSizeFallbackTest.java       |   2 +-
 .../AggregateExpressionSizeOverrideFixedTest.java  |   2 +-
 ...gateExpressionSizeOverrideFixedTimeoutTest.java |   2 +-
 .../aggregator/AggregateExpressionSizeTest.java    |   2 +-
 .../aggregator/AggregateExpressionTest.java        |   2 +-
 .../AggregateExpressionTimeoutFallbackTest.java    |   2 +-
 .../AggregateExpressionTimeoutPerGroupTest.java    |   2 +-
 .../aggregator/AggregateExpressionTimeoutTest.java |   2 +-
 ...eCompletionHeaderInAggregationStrategyTest.java |   2 +-
 .../AggregateForceCompletionHeaderTest.java        |   2 +-
 .../AggregateForceCompletionOnStopTest.java        |  20 ++--
 .../aggregator/AggregateFromWireTapTest.java       |   6 +-
 .../aggregator/AggregateGroupMessageTest.java      |   4 +-
 .../AggregateGroupedExchangeBatchSizeTest.java     |   7 +-
 ...roupedExchangeCompletionExpressionSizeTest.java |   2 +-
 ...AggregateGroupedExchangeCompletionSizeTest.java |   2 +-
 ...gateGroupedExchangeMultipleCorrelationTest.java |   4 +-
 .../AggregateGroupedExchangeSizePredicateTest.java |   4 +-
 .../AggregateGroupedExchangeSizeTest.java          |   4 +-
 .../aggregator/AggregateGroupedExchangeTest.java   |   4 +-
 .../AggregateIgnoreInvalidCorrelationKeysTest.java |   5 +-
 .../aggregator/AggregateLostGroupIssueTest.java    |   2 +-
 .../aggregator/AggregateMultipleSourceTest.java    |   2 +-
 .../AggregateNewExchangeAndConfirmTest.java        |   3 +-
 .../AggregateParallelProcessingTest.java           |   2 +-
 .../AggregatePreCompleteAwareStrategyTest.java     |   2 +-
 ...gregatePreCompleteAwareStrategyTimeoutTest.java |   2 +-
 .../aggregator/AggregateProcessorTest.java         |  10 +-
 ...egateProcessorTimeoutCompletionRestartTest.java |   8 +-
 .../AggregateRepositoryReturnNullTest.java         |   5 +-
 .../AggregateShouldSkipFilteredExchangesTest.java  |   2 +-
 .../AggregateShutdownThreadPoolTest.java           |   4 +-
 .../AggregateSimpleExpressionIssueTest.java        |  10 +-
 .../AggregateSimplePredicateEagerTest.java         |   2 +-
 .../aggregator/AggregateSimplePredicateTest.java   |   2 +-
 .../aggregator/AggregateSimpleSizeTest.java        |   2 +-
 .../aggregator/AggregateSimpleTimeoutTest.java     |   2 +-
 .../aggregator/AggregateStrategyServiceTest.java   |   2 +-
 .../aggregator/AggregateThreadPoolProfileTest.java |   2 +-
 .../aggregator/AggregateTimeoutManualTest.java     |   2 +-
 .../aggregator/AggregateTimeoutOnlyTest.java       |   2 +-
 .../processor/aggregator/AggregateTimeoutTest.java |   5 +-
 .../AggregateTimeoutWithExecutorServiceTest.java   |   6 +-
 .../AggregateTimeoutWithNoExecutorServiceTest.java |   7 +-
 .../AggregateUnknownExecutorServiceRefTest.java    |   5 +-
 .../AggregationStrategyAsPredicateTest.java        |   2 +-
 ...trategyBeanAdapterAllowNullOldExchangeTest.java |   2 +-
 ...ggregationStrategyBeanAdapterAllowNullTest.java |   4 +-
 ...tionStrategyBeanAdapterNonStaticMethodTest.java |   2 +-
 ...ggregationStrategyBeanAdapterOneMethodTest.java |   2 +-
 ...nAdapterPollEnrichAllowNullNewExchangeTest.java |   2 +-
 ...gregationStrategyBeanAdapterPollEnrichTest.java |   2 +-
 ...gationStrategyBeanAdapterRefMethodNameTest.java |   2 +-
 .../AggregationStrategyBeanAdapterRefTest.java     |   2 +-
 ...egationStrategyBeanAdapterStaticMethodTest.java |   2 +-
 .../AggregationStrategyBeanAdapterTest.java        |   2 +-
 ...egyBeanAdapterWithHeadersAndPropertiesTest.java |   2 +-
 ...regationStrategyBeanAdapterWithHeadersTest.java |   2 +-
 .../AggregationStrategyCompleteByPropertyTest.java |   2 +-
 .../AggregationStrategyGroupedBodyTest.java        |   5 +-
 .../AggregationStrategyLifecycleTest.java          |   9 +-
 .../aggregator/AggregatorAndOnExceptionTest.java   |   2 +-
 .../aggregator/AggregatorConcurrencyTest.java      |   4 +-
 .../aggregator/AggregatorExceptionHandleTest.java  |   2 +-
 .../AggregatorExceptionInPredicateTest.java        |   2 +-
 .../aggregator/AggregatorExceptionTest.java        |   2 +-
 .../aggregator/AggregatorLockingTest.java          |   2 +-
 .../camel/processor/aggregator/AggregatorTest.java |   2 +-
 .../aggregator/AlbertoAggregatorTest.java          |   2 +-
 .../aggregator/BeanBeforeAggregateIssueTest.java   |   6 +-
 .../BodyOnlyAggregationStrategyTest.java           |   2 +-
 .../CustomAggregationStrategyServiceTest.java      |  13 ++-
 .../aggregator/CustomAggregationStrategyTest.java  |   2 +-
 ...ionStrategyCompletionFromBatchConsumerTest.java |  11 +-
 ...ustomListAggregationStrategyEmptySplitTest.java |   5 +-
 .../CustomListAggregationStrategySplitTest.java    |  11 +-
 .../CustomListAggregationStrategyTest.java         |  11 +-
 .../DefaultAggregatorCollectionTest.java           |   2 +-
 .../DistributedCompletionIntervalTest.java         |   2 +-
 ...DistributedConcurrentPerCorrelationKeyTest.java |   4 +-
 .../DistributedOptimisticLockFailingTest.java      |   5 +-
 .../aggregator/DistributedTimeoutTest.java         |   4 +-
 .../EnricherRouteNumberOfProcessorTest.java        |   9 +-
 .../aggregator/OptimisticLockRetryPolicyTest.java  |  12 ++-
 .../PredicateAggregatorCollectionTest.java         |   2 +-
 ...teParallelProcessingStackOverflowIssueTest.java |   3 +-
 .../SplitAggregateStackOverflowIssueTest.java      |  11 +-
 ...itParallelProcessingStackOverflowIssueTest.java |   3 +-
 .../SplitRouteNumberOfProcessorTest.java           |   9 +-
 .../aggregator/SplitStackOverflowIssueTest.java    |   2 +-
 .../aggregator/StringAggregationStrategyTest.java  |   2 +-
 ...yncDeadLetterChannelExecutorServiceRefTest.java |   2 +-
 .../async/AsyncDeadLetterChannelTest.java          |   2 +-
 .../async/AsyncDefaultErrorHandlerTest.java        |   5 +-
 .../processor/async/AsyncEndpointCBRTest.java      |   7 +-
 .../AsyncEndpointCustomAsyncInterceptorTest.java   |   7 +-
 .../async/AsyncEndpointCustomInterceptorTest.java  |   7 +-
 .../async/AsyncEndpointCustomRoutePolicyTest.java  |   7 +-
 .../processor/async/AsyncEndpointDelayUoWTest.java |   6 +-
 .../async/AsyncEndpointDoWhileLoopTest.java        |   2 +-
 .../async/AsyncEndpointDualMulticastTest.java      |   4 +-
 .../AsyncEndpointDualTopicLoadBalanceTest.java     |   2 +-
 .../async/AsyncEndpointDynamicRouterTest.java      |   4 +-
 .../processor/async/AsyncEndpointEnricherTest.java |   7 +-
 .../AsyncEndpointEventNotifierSendingTest.java     |   4 +-
 .../async/AsyncEndpointEventNotifierTest.java      |   9 +-
 ...AsyncEndpointFailOverLoadBalanceMixed2Test.java |   7 +-
 ...AsyncEndpointFailOverLoadBalanceMixed3Test.java |   7 +-
 .../AsyncEndpointFailOverLoadBalanceMixedTest.java |   7 +-
 ...ncEndpointFailOverLoadBalanceOnlyAsyncTest.java |   7 +-
 ...ncEndpointFailedAfterDeadLetterChannelTest.java |   6 +-
 ...EndpointFailedAfterOnExceptionContinueTest.java |   7 +-
 ...cEndpointFailedAfterOnExceptionHandledTest.java |   7 +-
 .../async/AsyncEndpointFailedAfterTest.java        |   6 +-
 .../AsyncEndpointFailureProcessorContinueTest.java |   7 +-
 .../async/AsyncEndpointFailureProcessorTest.java   |   7 +-
 .../processor/async/AsyncEndpointFilterTest.java   |   7 +-
 .../async/AsyncEndpointIdempotentConsumerTest.java |   6 +-
 .../processor/async/AsyncEndpointLoopTest.java     |   7 +-
 ...pointMulticastFineGrainedErrorHandlingTest.java |   4 +-
 .../async/AsyncEndpointMulticastTest.java          |   7 +-
 .../processor/async/AsyncEndpointPipelineTest.java |   4 +-
 .../processor/async/AsyncEndpointPolicyTest.java   |   9 +-
 .../async/AsyncEndpointRecipientList2Test.java     |   7 +-
 .../async/AsyncEndpointRecipientList3Test.java     |   7 +-
 .../async/AsyncEndpointRecipientList4Test.java     |   7 +-
 .../async/AsyncEndpointRecipientListBean3Test.java |   7 +-
 .../async/AsyncEndpointRecipientListBean4Test.java |   7 +-
 .../async/AsyncEndpointRecipientListBeanTest.java  |   7 +-
 ...tRecipientListFineGrainedErrorHandlingTest.java |   5 +-
 .../AsyncEndpointRecipientListParallel2Test.java   |   7 +-
 .../AsyncEndpointRecipientListParallel3Test.java   |   7 +-
 .../AsyncEndpointRecipientListParallel4Test.java   |   7 +-
 .../AsyncEndpointRecipientListParallel5Test.java   |   7 +-
 .../AsyncEndpointRecipientListParallelTest.java    |   7 +-
 .../async/AsyncEndpointRecipientListTest.java      |   7 +-
 ...RedeliveryErrorHandlerNonBlockedDelay2Test.java |   6 +-
 ...RedeliveryErrorHandlerNonBlockedDelay3Test.java |   6 +-
 ...tRedeliveryErrorHandlerNonBlockedDelayTest.java |   6 +-
 .../AsyncEndpointRoundRobinLoadBalanceTest.java    |   7 +-
 .../async/AsyncEndpointRoutingSlip2Test.java       |   4 +-
 .../async/AsyncEndpointRoutingSlip3Test.java       |   7 +-
 .../async/AsyncEndpointRoutingSlipBean2Test.java   |   4 +-
 .../async/AsyncEndpointRoutingSlipBean3Test.java   |   7 +-
 ...syncEndpointRoutingSlipBeanNonBlockingTest.java |   9 +-
 .../async/AsyncEndpointRoutingSlipBeanTest.java    |   4 +-
 .../async/AsyncEndpointRoutingSlipTest.java        |   4 +-
 .../processor/async/AsyncEndpointSamplingTest.java |   7 +-
 .../async/AsyncEndpointSedaInOnlyTest.java         |  15 +--
 .../processor/async/AsyncEndpointSedaTest.java     |   7 +-
 .../AsyncEndpointSingleTopicLoadBalanceTest.java   |   2 +-
 ...cEndpointSplitFineGrainedErrorHandlingTest.java |   4 +-
 .../processor/async/AsyncEndpointSplitTest.java    |   7 +-
 ...pointSplitUseLatestAggregationStrategyTest.java |   7 +-
 .../processor/async/AsyncEndpointStopTest.java     |   7 +-
 .../async/AsyncEndpointSynchronousFalseTest.java   |   7 +-
 .../async/AsyncEndpointSynchronousTest.java        |   7 +-
 .../camel/processor/async/AsyncEndpointTest.java   |   7 +-
 .../async/AsyncEndpointTransformTest.java          |   7 +-
 .../async/AsyncEndpointTryCatchFinally2Test.java   |  11 +-
 .../async/AsyncEndpointTryCatchFinally3Test.java   |   6 +-
 .../async/AsyncEndpointTryCatchFinally4Test.java   |   4 +-
 .../async/AsyncEndpointTryCatchFinally5Test.java   |   4 +-
 .../async/AsyncEndpointTryCatchFinallyTest.java    |   7 +-
 .../async/AsyncEndpointUoWFailedTest.java          |   6 +-
 .../processor/async/AsyncEndpointUoWTest.java      |   6 +-
 .../async/AsyncEndpointWithDelayerTest.java        |   7 +-
 .../async/AsyncEndpointWithStreamCachingTest.java  |   7 +-
 .../async/AsyncEndpointWithTracingTest.java        |   7 +-
 ...FailureProcessorWithRedeliveryAndDelayTest.java |   7 +-
 .../AsyncFailureProcessorWithRedeliveryTest.java   |   7 +-
 .../processor/async/AsyncInOnlyEndpointTest.java   |   6 +-
 .../apache/camel/processor/async/AsyncMDCTest.java |   9 +-
 .../async/AsyncNestedTripleChoiceIssueTest.java    |   2 +-
 ...xceptionFailureProcessorWithRedeliveryTest.java |   6 +-
 .../AsyncProcessorAwaitManagerInterruptTest.java   |   5 +-
 ...sorAwaitManagerInterruptWithRedeliveryTest.java |  11 +-
 .../async/AsyncProcessorAwaitManagerTest.java      |   4 +-
 .../camel/processor/async/AsyncProducerTest.java   |   7 +-
 .../processor/async/AsyncRouteWithErrorTest.java   |   9 +-
 .../async/AsyncSedaInOnlyEndpointTest.java         |   6 +-
 .../processor/async/AsyncTwoEndpointTest.java      |  11 +-
 .../DynamicRouterConcurrentPOJOTest.java           |   2 +-
 .../EnrichExpressionIgnoreInvalidEndpointTest.java |   2 +-
 .../enricher/EnrichExpressionNoCacheTest.java      |   2 +-
 .../processor/enricher/EnrichExpressionTest.java   |   2 +-
 .../enricher/EnricherAggregateOnExceptionTest.java |   5 +-
 .../enricher/EnricherAggregateStreamingTest.java   |   2 +-
 .../EnricherAsyncUnhandledExceptionTest.java       |  17 ++-
 .../EnricherDefaultAggregationStrategyTest.java    |   4 +-
 .../camel/processor/enricher/EnricherDslTest.java  |   2 +-
 .../processor/enricher/EnricherNoResourceTest.java |   2 +-
 .../camel/processor/enricher/EnricherRefTest.java  |   4 +-
 .../processor/enricher/EnricherSendEventTest.java  |  12 ++-
 .../camel/processor/enricher/EnricherTest.java     |   8 +-
 .../enricher/PollEnrichBridgeErrorHandlerTest.java |   4 +-
 ...lEnrichExpressionIgnoreInvalidEndpointTest.java |   2 +-
 .../enricher/PollEnrichExpressionNoCacheTest.java  |   2 +-
 .../enricher/PollEnrichExpressionTest.java         |   2 +-
 ...ollEnrichFileCustomAggregationStrategyTest.java |  10 +-
 ...llEnrichFileDefaultAggregationStrategyTest.java |  10 +-
 .../processor/enricher/PollEnrichNullBodyTest.java |   2 +-
 .../PollEnricherAggregateOnExceptionTest.java      |   5 +-
 .../enricher/PollEnricherNoResourceTest.java       |   2 +-
 .../processor/enricher/PollEnricherRefTest.java    |   4 +-
 .../camel/processor/enricher/PollEnricherTest.java |  10 +-
 .../errorhandler/ErrorHandlerSupportTest.java      |   4 +-
 .../CustomExceptionPolicyStrategyTest.java         |   4 +-
 .../DefaultExceptionPolicyStrategyTest.java        |  10 +-
 ...ltExceptionPolicyStrategyUsingOnlyWhenTest.java |   4 +-
 ...efaultExceptionPolicyStrategyUsingWhenTest.java |   4 +-
 .../intercept/FromFileInterceptSendToIssue.java    |   2 +
 .../InterceptFromEndpointInstanceTest.java         |   2 +-
 .../intercept/InterceptFromEndpointRefTest.java    |   2 +-
 .../intercept/InterceptFromEndpointRefUriTest.java |   2 +-
 .../InterceptFromPropertyPlaceholderTest.java      |   2 +-
 .../intercept/InterceptFromSimpleLogTest.java      |   2 +-
 .../InterceptFromSimplePredicateTest.java          |   2 +-
 .../InterceptFromSimplePredicateWithStopTest.java  |   2 +-
 .../intercept/InterceptFromSimpleRouteTest.java    |   2 +-
 .../intercept/InterceptFromUriRegexTest.java       |   2 +-
 .../intercept/InterceptFromUriSimpleLogTest.java   |   2 +-
 .../InterceptFromUriWildcardHeaderUriTest.java     |   2 +-
 .../intercept/InterceptFromUriWildcardTest.java    |   2 +-
 .../intercept/InterceptFromWhenNoStopTest.java     |   2 +-
 .../processor/intercept/InterceptFromWhenTest.java |   2 +-
 .../intercept/InterceptFromWhenWithChoiceTest.java |   2 +-
 .../InterceptSendToEndpointAfterTest.java          |   2 +-
 ...nterceptSendToEndpointConditionalSkip2Test.java |   2 +-
 ...nterceptSendToEndpointConditionalSkip3Test.java |   2 +-
 ...InterceptSendToEndpointConditionalSkipTest.java |   2 +-
 .../InterceptSendToEndpointDynamicTest.java        |   6 +-
 .../InterceptSendToEndpointInOnException.java      |   2 +
 .../InterceptSendToEndpointMultipleRoutesTest.java |   2 +-
 ...nterceptSendToEndpointNormalizePatternTest.java |   2 +-
 .../intercept/InterceptSendToEndpointTest.java     |   2 +-
 .../InterceptSendToEndpointWithParametersTest.java |   2 +-
 .../InterceptSendToEndpointWithStopTest.java       |   2 +-
 .../intercept/InterceptSendToExceptionTest.java    |   5 +-
 .../processor/intercept/InterceptSendToIssue.java  |   2 +
 .../intercept/InterceptSimpleRouteStopTest.java    |   2 +-
 .../intercept/InterceptSimpleRouteTest.java        |   2 +-
 .../InterceptSimpleRouteWhenStopTest.java          |   2 +-
 .../intercept/InterceptSimpleRouteWhenTest.java    |   2 +-
 .../ParentChildInterceptStrategyTest.java          |   4 +-
 .../interceptor/AdviceWithAutoStartupTest.java     |   5 +-
 .../interceptor/AdviceWithLambdaTest.java          |   5 +-
 ...AdviceWithMockEndpointsHavingParameterTest.java |   4 +-
 .../interceptor/AdviceWithMockEndpointsTest.java   |   5 +-
 .../AdviceWithMockEndpointsWithSkipTest.java       |   4 +-
 ...dviceWithMockMultipleEndpointsWithSkipTest.java |   4 +-
 .../AdviceWithRecipientListMockEndpointsTest.java  |   2 +-
 .../interceptor/AdviceWithReplaceFromTest.java     |   4 +-
 .../interceptor/AdviceWithRouteIdTest.java         |   2 +-
 .../interceptor/AdviceWithTasksMatchTest.java      |   2 +-
 .../AdviceWithTasksOnExceptionTest.java            |   2 +-
 .../interceptor/AdviceWithTasksSelectTest.java     |   7 +-
 .../processor/interceptor/AdviceWithTasksTest.java |   9 +-
 .../AdviceWithTasksToStringPatternTest.java        |   9 +-
 .../processor/interceptor/AdviceWithTest.java      |   5 +-
 .../interceptor/AdviceWithTryCatchTest.java        |   2 +-
 .../AdviceWithTwoRoutesOnExceptionTest.java        |   2 +-
 .../interceptor/AdviceWithTwoRoutesTest.java       |   2 +-
 .../processor/interceptor/AdviceWithTypeTest.java  |   6 +-
 .../AdviceWithWeaveAfterLastSplitTest.java         |   2 +-
 .../AdviceWithWeaveByStringOnChoiceTest.java       |   2 +-
 .../AdviceWithWeaveByTypeOnExceptionTest.java      |   2 +-
 .../interceptor/AdviceWithWeaveFirstLastTest.java  |   4 +-
 .../interceptor/AdviceWithWeaveLastCBRTest.java    |   2 +-
 .../AdviceWithWeaveToUriAndAddLastTest.java        |   2 +-
 .../AuditInterceptorAsyncDelegateIssueTest.java    |   8 +-
 .../AuditInterceptorDelegateIssueTest.java         |   8 +-
 .../CustomInterceptorRouteWithChildOutputTest.java |   4 +-
 .../interceptor/DebugExceptionBreakpointTest.java  |   9 +-
 .../DebugExceptionEventBreakpointTest.java         |   9 +-
 .../interceptor/DebugSingleStepConditionTest.java  |   8 +-
 .../processor/interceptor/DebugSingleStepTest.java |   8 +-
 .../camel/processor/interceptor/DebugTest.java     |   8 +-
 .../InterceptorStrategyNotOrderedTest.java         |   2 +-
 .../InterceptorStrategyOrderedTest.java            |   2 +-
 .../processor/interceptor/NoStreamCachingTest.java |  21 ++--
 ...xtScopedOnExceptionCorrectRouteContextTest.java |   5 +-
 ...ScopedOnExceptionLoadBalancerStopRouteTest.java |   6 +-
 .../ContextScopedOnExceptionLogRouteTest.java      |   4 +-
 ...efaultErrorHandlerExchangeFormatterRefTest.java |   5 +-
 ...rorHandlerOnExceptionOccurredProcessorTest.java |   5 +-
 .../DefaultErrorHandlerRetryWhileTest.java         |   4 +-
 .../onexception/DoCatchDirectDynamicRouteTest.java |   2 +-
 .../DoCatchDirectRecipientListTest.java            |   2 +-
 .../onexception/DoCatchDirectRouteTest.java        |   2 +-
 .../onexception/OnExceptionAfterRouteTest.java     |   5 +-
 ...xceptionAndDLCErrorHandlerIssueReverseTest.java |   2 +-
 .../OnExceptionAndDLCErrorHandlerIssueTest.java    |   2 +-
 .../OnExceptionCallSubRouteNoErrorHandlerTest.java |   2 +-
 .../onexception/OnExceptionComplexRouteTest.java   |   6 +-
 ...tionComplexWithNestedErrorHandlerRouteTest.java |   2 +-
 ...rorHandlerRouteWithDefaultErrorHandlerTest.java |   4 +-
 .../OnExceptionContinuePredicateTest.java          |   4 +-
 .../OnExceptionContinueSubRouteTest.java           |   2 +-
 .../OnExceptionContinueSubSubRouteTest.java        |   2 +-
 .../onexception/OnExceptionContinueTest.java       |   2 +-
 .../OnExceptionContinueTwoPredicateTest.java       |   4 +-
 .../onexception/OnExceptionContinueTwoTest.java    |   4 +-
 .../onexception/OnExceptionFromChoiceTest.java     |   6 +-
 .../OnExceptionFromChoiceUseOriginalBodyTest.java  |   6 +-
 ...onGlobalAndDLCErrorHandlerIssueReverseTest.java |   2 +-
 ...ExceptionGlobalAndDLCErrorHandlerIssueTest.java |   2 +-
 .../OnExceptionGlobalScopedRecursionTest.java      |   5 +-
 .../OnExceptionHandleAndThrowNewExceptionTest.java |   4 +-
 .../OnExceptionHandleAndTransformTest.java         |   4 +-
 ...dleAndTransformWithDefaultErrorHandlerTest.java |   4 +-
 .../OnExceptionHandledAndContinueTest.java         |   5 +-
 .../onexception/OnExceptionHandledTest.java        |   2 +-
 .../OnExceptionHandledThrowsExceptionTest.java     |   5 +-
 .../OnExceptionLoadBalancerDoubleIssueTest.java    |   2 +-
 .../onexception/OnExceptionMisconfiguredTest.java  |   4 +-
 ...nExceptionOccurredProcessorOnExceptionTest.java |   4 +-
 .../OnExceptionOccurredProcessorTest.java          |   4 +-
 ...ceptionProcessorInspectCausedExceptionTest.java |   5 +-
 ...CausedExceptionWithDefaultErrorHandlerTest.java |   5 +-
 .../onexception/OnExceptionRecursionTest.java      |   5 +-
 .../onexception/OnExceptionRetryUntilTest.java     |   8 +-
 ...ptionRetryUntilWithDefaultErrorHandlerTest.java |   8 +-
 .../onexception/OnExceptionRouteIdTest.java        |   5 +-
 .../OnExceptionRouteScopedRecursionTest.java       |   5 +-
 .../onexception/OnExceptionRouteTest.java          |   8 +-
 ...nExceptionRouteWithDefaultErrorHandlerTest.java |   8 +-
 .../OnExceptionUseOriginalBodyTest.java            |   4 +-
 .../OnExceptionUseOriginalMessageTest.java         |   4 +-
 .../onexception/OnExceptionWhenSimpleOgnlTest.java |   2 +-
 .../OnExceptionWireTapNewExchangeBodyTest.java     |   2 +-
 .../OnExceptionWithRouteAndContinueTest.java       |   2 +-
 .../OnExceptionWrappedExceptionTest.java           |   2 +-
 .../onexception/OnExceptionsPerRouteTest.java      |   2 +-
 .../onexception/RedeliverEntireRouteTest.java      |   4 +-
 .../RouteScopedOnExceptionSameTypeTest.java        |   2 +-
 .../resequencer/ResequencerBatchOrderTest.java     |   6 +-
 .../resequencer/ResequencerEngineTest.java         |  30 +++---
 .../resequencer/ResequencerFileNameTest.java       |   6 +-
 .../camel/processor/resequencer/SequenceTest.java  |  15 +--
 .../processor/resequencer/TestComparatorTest.java  |  16 +--
 .../DynamicRouterEventNotifierTest.java            |   8 +-
 .../RecipientListEventNotifierTest.java            |   8 +-
 .../RoutingSlipCreateProducerFailedTest.java       |   5 +-
 .../RoutingSlipDataModificationTest.java           |  10 +-
 .../routingslip/RoutingSlipEventNotifierTest.java  |   8 +-
 .../RoutingSlipIgnoreInvalidEndpointsTest.java     |   8 +-
 .../processor/routingslip/RoutingSlipPOJOTest.java |   2 +-
 .../processor/routingslip/RoutingSlipTest.java     |   2 +-
 .../routingslip/RoutingSlipWithExceptionTest.java  |  10 +-
 .../DefaultValidationErrorHandlerTest.java         |   4 +-
 .../camel/reifier/DataFormatReifierTest.java       |  10 +-
 .../apache/camel/reifier/ProcessorReifierTest.java |   4 +-
 .../DefaultCamelContextEndpointCacheLimitTest.java |   6 +-
 .../DefaultCamelContextEndpointCacheTest.java      |   6 +-
 .../apache/camel/support/DefaultEndpointTest.java  |   4 +-
 .../apache/camel/support/DefaultRegistryTest.java  |  12 +--
 .../camel/support/DefaultTimeoutMapTest.java       |  12 +--
 .../camel/support/GroupTokenIteratorTest.java      |  12 ++-
 .../camel/support/InputStreamIteratorTest.java     |   4 +-
 .../camel/support/IntrospectionSupportTest.java    |   4 +-
 ...opertyBindingSupportAutowireNestedDeepTest.java |   5 +-
 .../PropertyBindingSupportAutowireNestedTest.java  |   4 +-
 .../PropertyBindingSupportAutowireTest.java        |   5 +-
 .../PropertyBindingSupportConfigurerTest.java      |  10 +-
 .../support/PropertyBindingSupportListTest.java    |   4 +-
 .../support/PropertyBindingSupportMapTest.java     |   4 +-
 .../camel/support/PropertyBindingSupportTest.java  |  18 ++--
 .../apache/camel/support/ServiceSupportTest.java   |   4 +-
 .../camel/support/TimerListenerManagerTest.java    |   6 +-
 .../support/builder/RecordableInputStreamTest.java |   7 +-
 .../support/builder/RecordableReaderTest.java      |   7 +-
 .../support/component/ApiMethodHelperTest.java     |  84 +++++++--------
 .../component/ApiMethodPropertiesHelperTest.java   |   4 +-
 .../component/ArgumentSubstitutionParserTest.java  |   4 +-
 ...ndiCamelSingletonInitialContextFactoryTest.java |   6 +-
 .../org/apache/camel/support/jndi/JndiTest.java    |  15 +--
 .../camel/support/jsse/FilterParametersTest.java   |   4 +-
 .../support/jsse/KeyManagersParametersTest.java    |  10 +-
 .../camel/support/jsse/KeyStoreParametersTest.java |   5 +-
 .../support/jsse/SSLContextParametersTest.java     |  23 ++--
 .../support/jsse/SecureRandomParametersTest.java   |   5 +-
 .../support/jsse/TrustManagersParametersTest.java  |   7 +-
 .../processor/DefaultExchangeFormatterTest.java    |  10 +-
 .../processor/DefaultMaskingFormatterTest.java     |  35 +++---
 .../support/processor/ThroughPutLoggerTest.java    |   9 +-
 .../FileIdempotentStoreOrderingTest.java           |  17 ++-
 .../apache/camel/util/CamelContextHelperTest.java  |   9 +-
 .../apache/camel/util/CaseInsensitiveMapTest.java  |  11 +-
 .../apache/camel/util/CreateModelFromXmlTest.java  |   3 +-
 .../util/DumpModelAsXmlAggregateRouteTest.java     |   5 +-
 ...mlChoiceFilterRoutePropertyPlaceholderTest.java |   5 +-
 .../util/DumpModelAsXmlChoiceFilterRouteTest.java  |   5 +-
 .../util/DumpModelAsXmlDanishCharactersTest.java   |   5 +-
 .../camel/util/DumpModelAsXmlNamespaceTest.java    |   5 +-
 .../camel/util/DumpModelAsXmlPlaceholdersTest.java |   4 +-
 .../util/DumpModelAsXmlRouteExpressionTest.java    |   5 +-
 .../util/DumpModelAsXmlRoutePredicateTest.java     |   5 +-
 .../util/DumpModelAsXmlSplitBodyRouteTest.java     |   9 +-
 ...umpModelAsXmlSplitNestedChoiceEndRouteTest.java |   5 +-
 .../DumpModelAsXmlTransformRouteConstantTest.java  |   9 +-
 .../DumpModelAsXmlTransformRouteLanguageTest.java  |   8 +-
 .../util/DumpModelAsXmlTransformRouteTest.java     |   9 +-
 .../org/apache/camel/util/EndpointHelperTest.java  |  28 ++---
 .../org/apache/camel/util/EventHelperTest.java     |   4 +-
 .../org/apache/camel/util/ExchangeHelperTest.java  |  10 +-
 .../camel/util/ExpressionListComparatorTest.java   |   4 +-
 .../apache/camel/util/FilePathResolverTest.java    |   7 +-
 .../java/org/apache/camel/util/FileUtilTest.java   |  21 ++--
 .../java/org/apache/camel/util/GZIPHelperTest.java |  12 +--
 .../org/apache/camel/util/IOHelperCharsetTest.java |   7 +-
 .../java/org/apache/camel/util/IOHelperTest.java   |   7 +-
 .../org/apache/camel/util/InetAddressUtilTest.java |   7 +-
 .../org/apache/camel/util/KeyValueHolderTest.java  |  23 ++--
 .../org/apache/camel/util/MessageHelperTest.java   |  19 ++--
 .../NoClassDefFoundErrorWrapExceptionTest.java     |   5 +-
 .../org/apache/camel/util/ObjectHelperTest.java    | 118 +++++++++++----------
 .../java/org/apache/camel/util/OgnlHelperTest.java |   7 +-
 .../apache/camel/util/OrderedComparatorTest.java   |   7 +-
 .../org/apache/camel/util/PackageHelperTest.java   |   9 +-
 .../org/apache/camel/util/PlatformHelperTest.java  |   7 +-
 .../camel/util/PredicateAssertHelperTest.java      |   3 +-
 .../org/apache/camel/util/ReferenceCountTest.java  |  21 ++--
 .../org/apache/camel/util/ResourceHelperTest.java  |   4 +-
 .../apache/camel/util/StingQuoteHelperTest.java    |   7 +-
 .../org/apache/camel/util/StringHelperTest.java    |  44 ++++----
 .../camel/util/UnsafeCharactersEncoderTest.java    |   9 +-
 .../toolbox/FlexibleAggregationStrategiesTest.java |   4 +-
 2261 files changed, 8362 insertions(+), 5209 deletions(-)

diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 038f509..37109f0 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -167,15 +167,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -243,6 +242,12 @@
             <artifactId>camel-core-catalog</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.6.1</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/AutoCloseableTest.java b/core/camel-core/src/test/java/org/apache/camel/AutoCloseableTest.java
index f84e77f..d8ebb31 100644
--- a/core/camel-core/src/test/java/org/apache/camel/AutoCloseableTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/AutoCloseableTest.java
@@ -19,7 +19,7 @@ package org.apache.camel;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.engine.DefaultProducerTemplate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/CamelExceptionsTest.java b/core/camel-core/src/test/java/org/apache/camel/CamelExceptionsTest.java
index fececed..96075c3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/CamelExceptionsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/CamelExceptionsTest.java
@@ -20,7 +20,9 @@ import java.util.Date;
 
 import org.apache.camel.builder.ExpressionBuilder;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class CamelExceptionsTest extends ContextTestSupport {
 
@@ -321,7 +323,7 @@ public class CamelExceptionsTest extends ContextTestSupport {
         NoTypeConversionAvailableException e2 = new NoTypeConversionAvailableException(null, Date.class);
         assertNull(e2.getValue());
         assertEquals(Date.class, e2.getToType());
-        assertNull(null, e2.getFromType());
+        assertNull(e2.getFromType());
     }
 
     @Test
diff --git a/core/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java b/core/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
index 1f8a87d4..47a9740 100644
--- a/core/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
@@ -30,8 +30,10 @@ import org.apache.camel.spi.Language;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.support.DefaultRegistry;
 import org.apache.camel.support.jndi.JndiTest;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * A useful base class which creates a {@link CamelContext} with some routes
@@ -92,7 +94,7 @@ public abstract class ContextTestSupport extends TestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
 
@@ -138,7 +140,7 @@ public abstract class ContextTestSupport extends TestSupport {
     }
 
     @Override
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         log.debug("tearDown test: {}", getName());
         if (consumer != null) {
@@ -335,7 +337,7 @@ public abstract class ContextTestSupport extends TestSupport {
         Language language = assertResolveLanguage(languageName);
 
         Expression expression = language.createExpression(expressionText);
-        assertNotNull("No Expression could be created for text: " + expressionText + " language: " + language, expression);
+        assertNotNull(expression, "No Expression could be created for text: " + expressionText + " language: " + language);
 
         assertExpression(expression, exchange, expectedValue);
     }
@@ -348,7 +350,7 @@ public abstract class ContextTestSupport extends TestSupport {
         Language language = assertResolveLanguage(languageName);
 
         Predicate predicate = language.createPredicate(expressionText);
-        assertNotNull("No Predicate could be created for text: " + expressionText + " language: " + language, predicate);
+        assertNotNull(predicate, "No Predicate could be created for text: " + expressionText + " language: " + language);
 
         assertPredicate(predicate, exchange, expected);
     }
@@ -358,7 +360,7 @@ public abstract class ContextTestSupport extends TestSupport {
      */
     protected Language assertResolveLanguage(String languageName) {
         Language language = context.resolveLanguage(languageName);
-        assertNotNull("No language found for name: " + languageName, language);
+        assertNotNull(language, "No language found for name: " + languageName);
         return language;
     }
 
@@ -384,18 +386,18 @@ public abstract class ContextTestSupport extends TestSupport {
     }
 
     protected void assertValidContext(CamelContext context) {
-        assertNotNull("No context found!", context);
+        assertNotNull(context, "No context found!");
     }
 
     protected <T extends Endpoint> T getMandatoryEndpoint(String uri, Class<T> type) {
         T endpoint = context.getEndpoint(uri, type);
-        assertNotNull("No endpoint found for uri: " + uri, endpoint);
+        assertNotNull(endpoint, "No endpoint found for uri: " + uri);
         return endpoint;
     }
 
     protected Endpoint getMandatoryEndpoint(String uri) {
         Endpoint endpoint = context.getEndpoint(uri);
-        assertNotNull("No endpoint found for uri: " + uri, endpoint);
+        assertNotNull(endpoint, "No endpoint found for uri: " + uri);
         return endpoint;
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/ExchangeTestSupport.java b/core/camel-core/src/test/java/org/apache/camel/ExchangeTestSupport.java
index 0ce8362..9e23494 100644
--- a/core/camel-core/src/test/java/org/apache/camel/ExchangeTestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/ExchangeTestSupport.java
@@ -17,6 +17,9 @@
 package org.apache.camel;
 
 import org.apache.camel.support.DefaultExchange;
+import org.junit.jupiter.api.BeforeEach;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * A base class for a test which requires a {@link CamelContext} and a populated
@@ -46,10 +49,11 @@ public abstract class ExchangeTestSupport extends ContextTestSupport {
     }
 
     @Override
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
         exchange = createExchange();
-        assertNotNull("No exchange created!", exchange);
+        assertNotNull(exchange, "No exchange created!");
         populateExchange(exchange);
     }
 }
diff --git a/core/camel-core/src/test/java/org/apache/camel/InjectorDefaultsTest.java b/core/camel-core/src/test/java/org/apache/camel/InjectorDefaultsTest.java
index e8fa1d5..6060241 100644
--- a/core/camel-core/src/test/java/org/apache/camel/InjectorDefaultsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/InjectorDefaultsTest.java
@@ -18,7 +18,9 @@ package org.apache.camel;
 
 import org.apache.camel.impl.engine.DefaultInjector;
 import org.apache.camel.spi.Injector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class InjectorDefaultsTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java b/core/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
index 0ec39e8..64827c3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
@@ -18,6 +18,9 @@ package org.apache.camel;
 
 import org.apache.camel.spi.Language;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * A useful base class for testing the language plugins in Camel
  */
@@ -75,7 +78,7 @@ public abstract class LanguageTestSupport extends ExchangeTestSupport {
     protected void assertExpression(String expressionText, String expectedValue, String orThisExpectedValue) {
         Object value = evaluateExpression(expressionText, expectedValue);
 
-        assertTrue("Expression: " + expressionText + " on Exchange: " + exchange, expectedValue.equals(value) || orThisExpectedValue.equals(value));
+        assertTrue(expectedValue.equals(value) || orThisExpectedValue.equals(value), "Expression: " + expressionText + " on Exchange: " + exchange);
     }
 
     /**
@@ -85,7 +88,7 @@ public abstract class LanguageTestSupport extends ExchangeTestSupport {
         Language language = assertResolveLanguage(getLanguageName());
 
         Expression expression = language.createExpression(expressionText);
-        assertNotNull("No Expression could be created for text: " + expressionText + " language: " + language, expression);
+        assertNotNull(expression, "No Expression could be created for text: " + expressionText + " language: " + language);
 
         Object value;
         if (expectedValue != null) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java b/core/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java
index bba09fc..62285c6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class LoggingLevelTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class LoggingLevelTest {
 
     @Test
     public void testLoggingLevelInfo() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/PropertyBindingExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/PropertyBindingExceptionTest.java
index 11531fc..9e40731 100644
--- a/core/camel-core/src/test/java/org/apache/camel/PropertyBindingExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/PropertyBindingExceptionTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class PropertyBindingExceptionTest {
     public static final String EXPECTED_EXCEPTION_MESSAGE = "Error binding property (prefix.property=value) with name: property";
@@ -26,11 +26,11 @@ public class PropertyBindingExceptionTest {
     @Test
     public void exceptionMessageTest() {
         PropertyBindingException pbe = new PropertyBindingException(new Object(), "property", "value", "prefix", "property", new Throwable("The casue!"));
-        assertTrue("PropertyBindingException message should start with [" + EXPECTED_EXCEPTION_MESSAGE + "] while is [" + pbe.getMessage() + "] instead.",
-                pbe.getMessage().startsWith(EXPECTED_EXCEPTION_MESSAGE));
+        assertTrue(pbe.getMessage().startsWith(EXPECTED_EXCEPTION_MESSAGE),
+                "PropertyBindingException message should start with [" + EXPECTED_EXCEPTION_MESSAGE + "] while is [" + pbe.getMessage() + "] instead.");
 
         pbe = new PropertyBindingException(new Object(), "property", "value", "prefix.", "property", new Throwable("The casue!"));
-        assertTrue("PropertyBindingException message should start with [" + EXPECTED_EXCEPTION_MESSAGE + "] while is [" + pbe.getMessage() + "] instead.",
-                pbe.getMessage().startsWith(EXPECTED_EXCEPTION_MESSAGE));
+        assertTrue(pbe.getMessage().startsWith(EXPECTED_EXCEPTION_MESSAGE),
+                "PropertyBindingException message should start with [" + EXPECTED_EXCEPTION_MESSAGE + "] while is [" + pbe.getMessage() + "] instead.");
     }
 }
diff --git a/core/camel-core/src/test/java/org/apache/camel/SuspendableServiceTest.java b/core/camel-core/src/test/java/org/apache/camel/SuspendableServiceTest.java
index 0e9fd83..908a97e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/SuspendableServiceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/SuspendableServiceTest.java
@@ -16,10 +16,11 @@
  */
 package org.apache.camel;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SuspendableServiceTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SuspendableServiceTest {
 
     private static class MyService implements SuspendableService {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
index 19a1bf0..e95dc29 100644
--- a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -17,6 +17,7 @@
 package org.apache.camel;
 
 import java.io.File;
+import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
@@ -30,25 +31,25 @@ import org.apache.camel.processor.Pipeline;
 import org.apache.camel.processor.errorhandler.ErrorHandlerSupport;
 import org.apache.camel.support.DefaultExchange;
 import org.apache.camel.support.PredicateAssertHelper;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
+import org.hamcrest.Matcher;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * A bunch of useful testing methods
  */
-public abstract class TestSupport extends Assert {
+public abstract class TestSupport {
 
     protected static final String LS = System.lineSeparator();
     private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
 
-    @Rule
-    public TestName name = new TestName();
+    protected TestInfo info;
 
     protected Logger log = LoggerFactory.getLogger(getClass());
 
@@ -58,18 +59,23 @@ public abstract class TestSupport extends Assert {
     }
 
     public String getName() {
-        return name.getMethodName();
+        return info.getTestMethod().map(Method::getName).orElse("");
+    }
+
+    @BeforeEach
+    public void setTestInfo(TestInfo info) {
+        this.info = info;
     }
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         // start with a clean slate
         AbstractCamelContext.setContextCounter(0);
         TestSupportNodeIdFactory.resetCounters();
-        Assume.assumeTrue(canRunOnThisPlatform());
+        Assumptions.assumeTrue(canRunOnThisPlatform());
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         // make sure we cleanup the platform mbean server
         TestSupportJmxCleanup.removeMBeans(null);
@@ -129,14 +135,14 @@ public abstract class TestSupport extends Assert {
     // -----------------------------------------------------------------------
 
     public static <T> T assertIsInstanceOf(Class<T> expectedType, Object value) {
-        assertNotNull("Expected an instance of type: " + expectedType.getName() + " but was null", value);
-        assertTrue("object should be a " + expectedType.getName() + " but was: " + value + " with type: " + value.getClass().getName(), expectedType.isInstance(value));
+        assertNotNull(value, "Expected an instance of type: " + expectedType.getName() + " but was null");
+        assertTrue(expectedType.isInstance(value), "object should be a " + expectedType.getName() + " but was: " + value + " with type: " + value.getClass().getName());
         return expectedType.cast(value);
     }
 
     public static void assertEndpointUri(Endpoint endpoint, String uri) {
-        assertNotNull("Endpoint is null when expecting endpoint for: " + uri, endpoint);
-        assertEquals("Endoint uri for: " + endpoint, uri, endpoint.getEndpointUri());
+        assertNotNull(endpoint, "Endpoint is null when expecting endpoint for: " + uri);
+        assertEquals(uri, endpoint.getEndpointUri(), "Endoint uri for: " + endpoint);
     }
 
     /**
@@ -164,16 +170,16 @@ public abstract class TestSupport extends Assert {
      *             expected class type
      */
     public static void assertInMessageBodyEquals(Exchange exchange, Object expected) throws InvalidPayloadException {
-        assertNotNull("Should have a response exchange!", exchange);
+        assertNotNull(exchange, "Should have a response exchange!");
 
         Object actual;
         if (expected == null) {
             actual = exchange.getIn().getMandatoryBody();
-            assertEquals("in body of: " + exchange, expected, actual);
+            assertEquals(expected, actual, "in body of: " + exchange);
         } else {
             actual = exchange.getIn().getMandatoryBody(expected.getClass());
         }
-        assertEquals("in body of: " + exchange, expected, actual);
+        assertEquals(expected, actual, "in body of: " + exchange);
 
         LOG.debug("Received response: {} with in: {}", exchange, exchange.getIn());
     }
@@ -189,29 +195,29 @@ public abstract class TestSupport extends Assert {
      */
     @Deprecated
     public static void assertOutMessageBodyEquals(Exchange exchange, Object expected) throws InvalidPayloadException {
-        assertNotNull("Should have a response exchange!", exchange);
+        assertNotNull(exchange, "Should have a response exchange!");
 
         Object actual;
         if (expected == null) {
             actual = exchange.getOut().getMandatoryBody();
-            assertEquals("output body of: " + exchange, expected, actual);
+            assertEquals(expected, actual, "output body of: " + exchange);
         } else {
             actual = exchange.getOut().getMandatoryBody(expected.getClass());
         }
-        assertEquals("output body of: " + exchange, expected, actual);
+        assertEquals(expected, actual, "output body of: " + exchange);
 
         LOG.debug("Received response: {} with out: {}", exchange, exchange.getOut());
     }
 
     public static Object assertMessageHeader(Message message, String name, Object expected) {
         Object value = message.getHeader(name);
-        assertEquals("Header: " + name + " on Message: " + message, expected, value);
+        assertEquals(expected, value, "Header: " + name + " on Message: " + message);
         return value;
     }
 
     public static Object assertProperty(Exchange exchange, String name, Object expected) {
         Object value = exchange.getProperty(name);
-        assertEquals("Property: " + name + " on Exchange: " + exchange, expected, value);
+        assertEquals(expected, value, "Property: " + name + " on Exchange: " + exchange);
         return value;
     }
 
@@ -228,7 +234,7 @@ public abstract class TestSupport extends Assert {
 
         LOG.debug("Evaluated expression: {} on exchange: {} result: {}", expression, exchange, value);
 
-        assertEquals("Expression: " + expression + " on Exchange: " + exchange, expected, value);
+        assertEquals(expected, value, "Expression: " + expression + " on Exchange: " + exchange);
         return value;
     }
 
@@ -262,7 +268,7 @@ public abstract class TestSupport extends Assert {
 
         LOG.debug("Evaluated predicate: {} on exchange: {} result: {}", predicate, exchange, value);
 
-        assertEquals("Predicate: " + predicate + " on Exchange: " + exchange, expected, value);
+        assertEquals(expected, value, "Predicate: " + predicate + " on Exchange: " + exchange);
         return value;
     }
 
@@ -272,7 +278,7 @@ public abstract class TestSupport extends Assert {
     public static Endpoint resolveMandatoryEndpoint(CamelContext context, String uri) {
         Endpoint endpoint = context.getEndpoint(uri);
 
-        assertNotNull("No endpoint found for URI: " + uri, endpoint);
+        assertNotNull(endpoint, "No endpoint found for URI: " + uri);
 
         return endpoint;
     }
@@ -283,7 +289,7 @@ public abstract class TestSupport extends Assert {
     public static <T extends Endpoint> T resolveMandatoryEndpoint(CamelContext context, String uri, Class<T> endpointType) {
         T endpoint = context.getEndpoint(uri, endpointType);
 
-        assertNotNull("No endpoint found for URI: " + uri, endpoint);
+        assertNotNull(endpoint, "No endpoint found for URI: " + uri);
 
         return endpoint;
     }
@@ -301,7 +307,7 @@ public abstract class TestSupport extends Assert {
     }
 
     public static <T> T assertOneElement(List<T> list) {
-        assertEquals("Size of list should be 1: " + list, 1, list.size());
+        assertEquals(1, list.size(), "Size of list should be 1: " + list);
         return list.get(0);
     }
 
@@ -316,7 +322,7 @@ public abstract class TestSupport extends Assert {
      * Asserts that a list is of the given size
      */
     public static <T> List<T> assertListSize(String message, List<T> list, int size) {
-        assertEquals(message + " should be of size: " + size + " but is: " + list, size, list.size());
+        assertEquals(size, list.size(), message + " should be of size: " + size + " but is: " + list);
         return list;
     }
 
@@ -331,7 +337,7 @@ public abstract class TestSupport extends Assert {
      * Asserts that a list is of the given size
      */
     public static <T> Collection<T> assertCollectionSize(String message, Collection<T> list, int size) {
-        assertEquals(message + " should be of size: " + size + " but is: " + list, size, list.size());
+        assertEquals(size, list.size(), message + " should be of size: " + size + " but is: " + list);
         return list;
     }
 
@@ -356,8 +362,8 @@ public abstract class TestSupport extends Assert {
      *            text parameter
      */
     public static void assertStringContains(String text, String containedText) {
-        assertNotNull("Text should not be null!", text);
-        assertTrue("Text: " + text + " does not contain: " + containedText, text.contains(containedText));
+        assertNotNull(text, "Text should not be null!");
+        assertTrue(text.contains(containedText), "Text: " + text + " does not contain: " + containedText);
     }
 
     /**
@@ -452,7 +458,7 @@ public abstract class TestSupport extends Assert {
         String actualPath = actual.replace('\\', '/');
 
         if (message != null) {
-            assertEquals(message, expectedPath, actualPath);
+            assertEquals(expectedPath, actualPath, message);
         } else {
             assertEquals(expectedPath, actualPath);
         }
@@ -463,8 +469,8 @@ public abstract class TestSupport extends Assert {
      */
     public static void assertDirectoryExists(String filename) {
         File file = new File(filename);
-        assertTrue("Directory " + filename + " should exist", file.exists());
-        assertTrue("Directory " + filename + " should be a directory", file.isDirectory());
+        assertTrue(file.exists(), "Directory " + filename + " should exist");
+        assertTrue(file.isDirectory(), "Directory " + filename + " should be a directory");
     }
 
     /**
@@ -472,8 +478,8 @@ public abstract class TestSupport extends Assert {
      */
     public static void assertFileExists(String filename) {
         File file = new File(filename);
-        assertTrue("File " + filename + " should exist", file.exists());
-        assertTrue("File " + filename + " should be a file", file.isFile());
+        assertTrue(file.exists(), "File " + filename + " should exist");
+        assertTrue(file.isFile(), "File " + filename + " should be a file");
     }
 
     /**
@@ -481,7 +487,7 @@ public abstract class TestSupport extends Assert {
      */
     public static void assertFileNotExists(String filename) {
         File file = new File(filename);
-        assertFalse("File " + filename + " should not exist", file.exists());
+        assertFalse(file.exists(), "File " + filename + " should not exist");
     }
 
     /**
@@ -578,4 +584,9 @@ public abstract class TestSupport extends Assert {
         }
         return builder;
     }
+
+    public static <T> void assumeThat(String s, T t, Matcher<T> m) {
+        Assumptions.assumeTrue(m.matches(t), s);
+    }
+
 }
diff --git a/core/camel-core/src/test/java/org/apache/camel/ThreadPoolRejectedPolicyTest.java b/core/camel-core/src/test/java/org/apache/camel/ThreadPoolRejectedPolicyTest.java
index 93b4819..6221f56 100644
--- a/core/camel-core/src/test/java/org/apache/camel/ThreadPoolRejectedPolicyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/ThreadPoolRejectedPolicyTest.java
@@ -28,7 +28,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.camel.util.concurrent.Rejectable;
 import org.apache.camel.util.concurrent.RejectableThreadPoolExecutor;
 import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ThreadPoolRejectedPolicyTest extends TestSupport {
 
@@ -199,7 +201,7 @@ public class ThreadPoolRejectedPolicyTest extends TestSupport {
     private void shutdownAndAwait(final ExecutorService executorService) {
         executorService.shutdown();
         try {
-            assertTrue("Test ExecutorService shutdown is not expected to take longer than 10 seconds.", executorService.awaitTermination(10, TimeUnit.SECONDS));
+            assertTrue(executorService.awaitTermination(10, TimeUnit.SECONDS), "Test ExecutorService shutdown is not expected to take longer than 10 seconds.");
         } catch (InterruptedException e) {
             fail("Test ExecutorService shutdown is not expected to be interrupted.");
         }
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/AddRoutesAtRuntimeTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/AddRoutesAtRuntimeTest.java
index 57a51e8..a591030 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/AddRoutesAtRuntimeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/AddRoutesAtRuntimeTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.builder;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Test how to add routes at runtime using a RouteBuilder
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
index 24a3e14..222f14d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
@@ -27,7 +27,9 @@ import org.apache.camel.TestSupport;
 import org.apache.camel.ValidationException;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.processor.DelegateProcessor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BuilderWithScopesTest extends TestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java
index 7c7a1bc..5471512 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java
@@ -28,13 +28,15 @@ import org.apache.camel.impl.engine.DefaultRoute;
 import org.apache.camel.processor.SendProcessor;
 import org.apache.camel.processor.errorhandler.DeadLetterChannel;
 import org.apache.camel.processor.errorhandler.RedeliveryPolicy;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ContextErrorHandlerTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         setUseRouteBuilder(false);
         super.setUp();
@@ -75,10 +77,10 @@ public class ContextErrorHandlerTest extends ContextTestSupport {
         };
 
         List<Route> list = getRouteListWithCurrentContext(builder);
-        assertEquals("Number routes created" + list, 1, list.size());
+        assertEquals(1, list.size(), "Number routes created" + list);
         for (Route route : list) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
+            assertEquals("seda://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumerRoute = assertIsInstanceOf(DefaultRoute.class, route);
             Processor processor = consumerRoute.getProcessor();
@@ -101,7 +103,7 @@ public class ContextErrorHandlerTest extends ContextTestSupport {
         };
 
         List<Route> list = getRouteListWithCurrentContext(builder);
-        assertEquals("Number routes created" + list, 2, list.size());
+        assertEquals(2, list.size(), "Number routes created" + list);
         for (Route route : list) {
 
             DefaultRoute consumerRoute = assertIsInstanceOf(DefaultRoute.class, route);
@@ -112,8 +114,8 @@ public class ContextErrorHandlerTest extends ContextTestSupport {
 
             RedeliveryPolicy redeliveryPolicy = deadLetterChannel.getRedeliveryPolicy();
 
-            assertEquals("getMaximumRedeliveries()", 1, redeliveryPolicy.getMaximumRedeliveries());
-            assertEquals("isUseExponentialBackOff()", true, redeliveryPolicy.isUseExponentialBackOff());
+            assertEquals(1, redeliveryPolicy.getMaximumRedeliveries(), "getMaximumRedeliveries()");
+            assertEquals(true, redeliveryPolicy.isUseExponentialBackOff(), "isUseExponentialBackOff()");
         }
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
index 05b793f..27f5b70 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
@@ -28,21 +28,23 @@ import org.apache.camel.processor.FilterProcessor;
 import org.apache.camel.processor.SendProcessor;
 import org.apache.camel.processor.errorhandler.DeadLetterChannel;
 import org.apache.camel.processor.errorhandler.RedeliveryPolicy;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ErrorHandlerTest extends TestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         // make SEDA testing faster
         System.setProperty("CamelSedaPollTimeout", "10");
     }
 
     @Override
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         System.clearProperty("CamelSedaPollTimeout");
     }
@@ -62,10 +64,10 @@ public class ErrorHandlerTest extends TestSupport {
         // END SNIPPET: e1
 
         List<Route> list = getRouteList(builder);
-        assertEquals("Number routes created" + list, 1, list.size());
+        assertEquals(1, list.size(), "Number routes created" + list);
         for (Route route : list) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
+            assertEquals("seda://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumerRoute = assertIsInstanceOf(DefaultRoute.class, route);
             Channel channel = unwrapChannel(consumerRoute.getProcessor());
@@ -98,7 +100,7 @@ public class ErrorHandlerTest extends TestSupport {
         // END SNIPPET: e2
 
         List<Route> list = getRouteList(builder);
-        assertEquals("Number routes created" + list, 2, list.size());
+        assertEquals(2, list.size(), "Number routes created" + list);
     }
 
     @Test
@@ -116,10 +118,10 @@ public class ErrorHandlerTest extends TestSupport {
         // END SNIPPET: e3
 
         List<Route> list = getRouteList(builder);
-        assertEquals("Number routes created" + list, 1, list.size());
+        assertEquals(1, list.size(), "Number routes created" + list);
         for (Route route : list) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
+            assertEquals("seda://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumerRoute = assertIsInstanceOf(DefaultRoute.class, route);
             Channel channel = unwrapChannel(consumerRoute.getProcessor());
@@ -145,10 +147,10 @@ public class ErrorHandlerTest extends TestSupport {
         // END SNIPPET: e4
 
         List<Route> list = getRouteList(builder);
-        assertEquals("Number routes created" + list, 1, list.size());
+        assertEquals(1, list.size(), "Number routes created" + list);
         for (Route route : list) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
+            assertEquals("seda://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumerRoute = assertIsInstanceOf(DefaultRoute.class, route);
             Processor processor = consumerRoute.getProcessor();
@@ -157,8 +159,8 @@ public class ErrorHandlerTest extends TestSupport {
             DeadLetterChannel deadLetterChannel = assertIsInstanceOf(DeadLetterChannel.class, channel.getErrorHandler());
             RedeliveryPolicy redeliveryPolicy = deadLetterChannel.getRedeliveryPolicy();
 
-            assertEquals("getMaximumRedeliveries()", 2, redeliveryPolicy.getMaximumRedeliveries());
-            assertEquals("isUseExponentialBackOff()", true, redeliveryPolicy.isUseExponentialBackOff());
+            assertEquals(2, redeliveryPolicy.getMaximumRedeliveries(), "getMaximumRedeliveries()");
+            assertEquals(true, redeliveryPolicy.isUseExponentialBackOff(), "isUseExponentialBackOff()");
         }
     }
 
@@ -174,10 +176,10 @@ public class ErrorHandlerTest extends TestSupport {
         // END SNIPPET: e5
 
         List<Route> routes = getRouteList(builder);
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
+            assertEquals("seda://a", key.getEndpointUri(), "From endpoint");
             DefaultRoute consumerRoute = assertIsInstanceOf(DefaultRoute.class, route);
             Channel channel = unwrapChannel(consumerRoute.getProcessor());
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
index 5f2bf1a..d26e3e0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
@@ -28,7 +28,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Unit test to test exception configuration
@@ -53,7 +56,8 @@ public class ExceptionBuilderTest extends ContextTestSupport {
             template.sendBody("direct:a", "Hello NPE");
             fail("Should have thrown a NullPointerException");
         } catch (RuntimeCamelException e) {
-            assertTrue(e.getCause() instanceof NullPointerException);
+            boolean b = e.getCause() instanceof NullPointerException;
+            assertTrue(b);
             // expected
         }
 
@@ -72,7 +76,8 @@ public class ExceptionBuilderTest extends ContextTestSupport {
             template.sendBody("direct:a", "Hello IO");
             fail("Should have thrown a IOException");
         } catch (RuntimeCamelException e) {
-            assertTrue(e.getCause() instanceof IOException);
+            boolean b = e.getCause() instanceof IOException;
+            assertTrue(b);
             // expected
         }
 
@@ -91,7 +96,8 @@ public class ExceptionBuilderTest extends ContextTestSupport {
             template.sendBody("direct:a", "Hello Exception");
             fail("Should have thrown a Exception");
         } catch (RuntimeCamelException e) {
-            assertTrue(e.getCause() instanceof Exception);
+            boolean b = e.getCause() instanceof Exception;
+            assertTrue(b);
             // expected
         }
 
@@ -110,7 +116,8 @@ public class ExceptionBuilderTest extends ContextTestSupport {
             template.sendBody("direct:a", "Hello business");
             fail("Should have thrown a MyBusinessException");
         } catch (RuntimeCamelException e) {
-            assertTrue(e.getCause() instanceof MyBusinessException);
+            boolean b = e.getCause() instanceof MyBusinessException;
+            assertTrue(b);
             // expected
         }
 
@@ -130,7 +137,8 @@ public class ExceptionBuilderTest extends ContextTestSupport {
             template.sendBody("direct:a", "I am not allowed to do this");
             fail("Should have thrown a GeneralSecurityException");
         } catch (RuntimeCamelException e) {
-            assertTrue(e.getCause() instanceof GeneralSecurityException);
+            boolean b = e.getCause() instanceof GeneralSecurityException;
+            assertTrue(b);
             // expected
         }
 
@@ -150,7 +158,8 @@ public class ExceptionBuilderTest extends ContextTestSupport {
             template.sendBody("direct:a", "I am not allowed to access this");
             fail("Should have thrown a GeneralSecurityException");
         } catch (RuntimeCamelException e) {
-            assertTrue(e.getCause() instanceof IllegalAccessException);
+            boolean b = e.getCause() instanceof IllegalAccessException;
+            assertTrue(b);
             // expected
         }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java
index 2959d88..4081908 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Unit test to test exception configuration
@@ -71,7 +74,8 @@ public class ExceptionBuilderWithHandledExceptionTest extends ContextTestSupport
             template.sendBodyAndHeader("direct:a", "Hello IOE", "foo", "something that does not match");
             fail("Should have thrown a IOException");
         } catch (RuntimeCamelException e) {
-            assertTrue(e.getCause() instanceof IOException);
+            boolean b = e.getCause() instanceof IOException;
+            assertTrue(b);
             // expected, failure is not handled because predicate doesn't match
         }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ExchangeBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ExchangeBuilderTest.java
index 17d5bba..3a5b40a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ExchangeBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ExchangeBuilderTest.java
@@ -20,10 +20,11 @@ import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ExchangeBuilderTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ExchangeBuilderTest {
     private static final DefaultCamelContext CONTEXT = new DefaultCamelContext();
     private static final String BODY = "Message Body";
     private static final String KEY = "Header key";
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
index 64d398f..cae9712 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
@@ -30,21 +30,12 @@ import org.apache.camel.Predicate;
 import org.apache.camel.TestSupport;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.apache.camel.builder.ExpressionBuilder.bodyExpression;
-import static org.apache.camel.builder.ExpressionBuilder.camelContextPropertiesExpression;
-import static org.apache.camel.builder.ExpressionBuilder.camelContextPropertyExpression;
-import static org.apache.camel.builder.ExpressionBuilder.constantExpression;
-import static org.apache.camel.builder.ExpressionBuilder.headerExpression;
-import static org.apache.camel.builder.ExpressionBuilder.messageExpression;
-import static org.apache.camel.builder.ExpressionBuilder.parseSimpleOrFallbackToConstantExpression;
-import static org.apache.camel.builder.ExpressionBuilder.regexReplaceAll;
-import static org.apache.camel.builder.ExpressionBuilder.regexTokenizeExpression;
-import static org.apache.camel.builder.ExpressionBuilder.sortExpression;
-import static org.apache.camel.builder.ExpressionBuilder.tokenizeExpression;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.builder.ExpressionBuilder.*;
 import static org.apache.camel.builder.PredicateBuilder.contains;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ExpressionBuilderTest extends TestSupport {
     protected CamelContext camelContext = new DefaultCamelContext();
@@ -111,7 +102,7 @@ public class ExpressionBuilderTest extends TestSupport {
         assertExpression(expression, exchange, "CamelTestValue");
         expression = camelContextPropertiesExpression();
         Map<?, ?> properties = expression.evaluate(exchange, Map.class);
-        assertEquals("Get a wrong properties size", properties.size(), 1);
+        assertEquals(properties.size(), 1, "Get a wrong properties size");
     }
 
     @Test
@@ -133,7 +124,7 @@ public class ExpressionBuilderTest extends TestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
         Message in = exchange.getIn();
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionFunctionTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionFunctionTest.java
index 319bea4..794edda 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionFunctionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionFunctionTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.builder.ExpressionBuilder.messageExpression;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java
index d3922c1..95cf165 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java
@@ -26,7 +26,9 @@ import org.apache.camel.FluentProducerTemplate;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.engine.DefaultFluentProducerTemplate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Unit test for FluentProducerTemplate
@@ -147,7 +149,8 @@ public class FluentProducerTemplateTest extends ContextTestSupport {
         try {
             DefaultFluentProducerTemplate.on(context).withBodyAs("10", Double.class).to("direct:sum").request();
         } catch (CamelExecutionException e) {
-            assertTrue(e.getCause() instanceof IllegalArgumentException);
+            boolean b = e.getCause() instanceof IllegalArgumentException;
+            assertTrue(b);
             assertEquals("Expected body of type Integer", e.getCause().getMessage());
         }
 
@@ -162,7 +165,8 @@ public class FluentProducerTemplateTest extends ContextTestSupport {
         Exchange out = DefaultFluentProducerTemplate.on(context).withBody("Hello World").to("direct:exception").send();
 
         assertTrue(out.isFailed());
-        assertTrue(out.getException() instanceof IllegalArgumentException);
+        boolean b = out.getException() instanceof IllegalArgumentException;
+        assertTrue(b);
         assertEquals("Forced exception by unit test", out.getException().getMessage());
 
         assertMockEndpointsSatisfied();
@@ -208,7 +212,8 @@ public class FluentProducerTemplateTest extends ContextTestSupport {
 
             fail("Should have thrown RuntimeCamelException");
         } catch (RuntimeCamelException e) {
-            assertTrue(e.getCause() instanceof IllegalArgumentException);
+            boolean b = e.getCause() instanceof IllegalArgumentException;
+            assertTrue(b);
             assertEquals("Forced exception by unit test", e.getCause().getMessage());
         }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java
index 20838fb..a9f4789 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java
@@ -26,7 +26,9 @@ import org.apache.camel.Producer;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.support.DefaultComponent;
 import org.apache.camel.support.DefaultEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class NotifyBuilderFromRouteTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java
index 0922883..ff785b4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.builder;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class NotifyBuilderTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderWhenDoneByIndexTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderWhenDoneByIndexTest.java
index 975a4c1..2e8f089 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderWhenDoneByIndexTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderWhenDoneByIndexTest.java
@@ -21,7 +21,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class NotifyBuilderWhenDoneByIndexTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceRouteTest.java
index 6f55f13..cedb2f7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceRouteTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.WaitForTaskToComplete;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PredicateBinaryCoerceRouteTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceTypeTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceTypeTest.java
index ceea79b..529c622 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceTypeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceTypeTest.java
@@ -23,8 +23,8 @@ import org.apache.camel.Predicate;
 import org.apache.camel.TestSupport;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class PredicateBinaryCoerceTypeTest extends TestSupport {
     protected Exchange exchange = new DefaultExchange(new DefaultCamelContext());
@@ -199,7 +199,7 @@ public class PredicateBinaryCoerceTypeTest extends TestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
         Message in = exchange.getIn();
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderConcurrentTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderConcurrentTest.java
index 653fedf..c1aa3cc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderConcurrentTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderConcurrentTest.java
@@ -29,7 +29,9 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PredicateBuilderConcurrentTest extends ContextTestSupport {
 
@@ -72,9 +74,9 @@ public class PredicateBuilderConcurrentTest extends ContextTestSupport {
         for (int i = 0; i < 1000; i++) {
             Boolean result = futures.get(i).get(10, TimeUnit.SECONDS);
             if (i % 2 == 0) {
-                assertEquals("Should be true for #" + i, true, result.booleanValue());
+                assertEquals(true, result.booleanValue(), "Should be true for #" + i);
             } else {
-                assertEquals("Should be false for #" + i, false, result.booleanValue());
+                assertEquals(false, result.booleanValue(), "Should be false for #" + i);
             }
         }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
index 701d79d..08c6fb0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
@@ -24,12 +24,13 @@ import org.apache.camel.Predicate;
 import org.apache.camel.TestSupport;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.builder.Builder.constant;
 import static org.apache.camel.builder.PredicateBuilder.in;
 import static org.apache.camel.builder.PredicateBuilder.not;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class PredicateBuilderTest extends TestSupport {
 
@@ -180,7 +181,7 @@ public class PredicateBuilderTest extends TestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
         Message in = exchange.getIn();
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderSkipJavaLangObjectMethodsTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderSkipJavaLangObjectMethodsTest.java
index f8dbf32..560b950 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderSkipJavaLangObjectMethodsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderSkipJavaLangObjectMethodsTest.java
@@ -17,7 +17,9 @@
 package org.apache.camel.builder;
 
 import org.apache.camel.ContextTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderTest.java
index b4f5608..976f750 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderTest.java
@@ -20,7 +20,9 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -33,7 +35,7 @@ public class ProxyBuilderTest extends ContextTestSupport {
 
         Future<String> future = foo.sayHello("Camel");
         assertNotNull(future);
-        assertFalse("Should not be done", future.isDone());
+        assertFalse(future.isDone(), "Should not be done");
 
         assertEquals("Hello Camel", future.get(5, TimeUnit.SECONDS));
     }
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java
index a056985..e1464df 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java
@@ -17,7 +17,7 @@
 package org.apache.camel.builder;
 
 import org.apache.camel.ContextTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RouteBuilderAddRoutesOnlyInterceptTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java
index 6e62f35..ea077da 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java
@@ -17,7 +17,7 @@
 package org.apache.camel.builder;
 
 import org.apache.camel.ContextTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RouteBuilderAddRoutesTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
index 1df4d4d..0237f26 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
@@ -44,7 +44,9 @@ import org.apache.camel.processor.ThreadsProcessor;
 import org.apache.camel.processor.errorhandler.DeadLetterChannel;
 import org.apache.camel.processor.idempotent.IdempotentConsumer;
 import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RouteBuilderTest extends TestSupport {
     protected Processor myProcessor = new MyProcessor();
@@ -77,16 +79,16 @@ public class RouteBuilderTest extends TestSupport {
     public void testSimpleRoute() throws Exception {
         List<Route> routes = buildSimpleRoute();
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumer = assertIsInstanceOf(DefaultRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
 
             SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, channel.getNextProcessor());
-            assertEquals("Endpoint URI", "direct://b", sendProcessor.getDestination().getEndpointUri());
+            assertEquals("direct://b", sendProcessor.getDestination().getEndpointUri(), "Endpoint URI");
         }
     }
 
@@ -109,17 +111,17 @@ public class RouteBuilderTest extends TestSupport {
 
         log.debug("Created routes: " + routes);
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumer = assertIsInstanceOf(DefaultRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
 
             FilterProcessor filterProcessor = assertIsInstanceOf(FilterProcessor.class, channel.getNextProcessor());
             SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, unwrapChannel(filterProcessor).getNextProcessor());
-            assertEquals("Endpoint URI", "direct://b", sendProcessor.getDestination().getEndpointUri());
+            assertEquals("direct://b", sendProcessor.getDestination().getEndpointUri(), "Endpoint URI");
         }
     }
 
@@ -142,17 +144,17 @@ public class RouteBuilderTest extends TestSupport {
 
         log.debug("Created routes: " + routes);
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumer = assertIsInstanceOf(DefaultRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
 
             ChoiceProcessor choiceProcessor = assertIsInstanceOf(ChoiceProcessor.class, channel.getNextProcessor());
             List<FilterProcessor> filters = choiceProcessor.getFilters();
-            assertEquals("Should be two when clauses", 2, filters.size());
+            assertEquals(2, filters.size(), "Should be two when clauses");
 
             Processor filter1 = filters.get(0);
             assertSendTo(unwrapChannel(((FilterProcessor)filter1).getProcessor()).getNextProcessor(), "direct://b");
@@ -187,10 +189,10 @@ public class RouteBuilderTest extends TestSupport {
     public void testCustomProcessor() throws Exception {
         List<Route> routes = buildCustomProcessor();
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
         }
     }
 
@@ -213,10 +215,10 @@ public class RouteBuilderTest extends TestSupport {
 
         log.debug("Created routes: " + routes);
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
         }
     }
 
@@ -239,17 +241,17 @@ public class RouteBuilderTest extends TestSupport {
 
         log.debug("Created routes: " + routes);
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumer = assertIsInstanceOf(DefaultRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
 
             MulticastProcessor multicastProcessor = assertIsInstanceOf(MulticastProcessor.class, channel.getNextProcessor());
             List<Processor> endpoints = new ArrayList<>(multicastProcessor.getProcessors());
-            assertEquals("Should have 2 endpoints", 2, endpoints.size());
+            assertEquals(2, endpoints.size(), "Should have 2 endpoints");
 
             assertSendToProcessor(unwrapChannel(endpoints.get(0)).getNextProcessor(), "direct://tap");
             assertSendToProcessor(unwrapChannel(endpoints.get(1)).getNextProcessor(), "direct://b");
@@ -279,10 +281,10 @@ public class RouteBuilderTest extends TestSupport {
 
         log.debug("Created routes: " + routes);
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumer = assertIsInstanceOf(DefaultRoute.class, route);
 
@@ -311,10 +313,10 @@ public class RouteBuilderTest extends TestSupport {
         List<Route> routes = getRouteList(builder);
         log.debug("Created routes: " + routes);
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
         }
     }
 
@@ -351,10 +353,10 @@ public class RouteBuilderTest extends TestSupport {
 
         log.debug("Created routes: " + routes);
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumer = assertIsInstanceOf(DefaultRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
@@ -393,10 +395,10 @@ public class RouteBuilderTest extends TestSupport {
 
         log.debug("Created routes: " + routes);
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumer = assertIsInstanceOf(DefaultRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
@@ -424,20 +426,20 @@ public class RouteBuilderTest extends TestSupport {
 
         log.debug("Created routes: " + routes);
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumer = assertIsInstanceOf(DefaultRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
 
             IdempotentConsumer idempotentConsumer = assertIsInstanceOf(IdempotentConsumer.class, channel.getNextProcessor());
-            assertEquals("messageIdExpression", "header(myMessageId)", idempotentConsumer.getMessageIdExpression().toString());
+            assertEquals("header(myMessageId)", idempotentConsumer.getMessageIdExpression().toString(), "messageIdExpression");
 
             assertIsInstanceOf(MemoryIdempotentRepository.class, idempotentConsumer.getIdempotentRepository());
             SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, unwrapChannel(idempotentConsumer.getProcessor()).getNextProcessor());
-            assertEquals("Endpoint URI", "direct://b", sendProcessor.getDestination().getEndpointUri());
+            assertEquals("direct://b", sendProcessor.getDestination().getEndpointUri(), "Endpoint URI");
         }
     }
 
@@ -461,10 +463,10 @@ public class RouteBuilderTest extends TestSupport {
 
         log.debug("Created routes: " + routes);
 
-        assertEquals("Number routes created", 1, routes.size());
+        assertEquals(1, routes.size(), "Number routes created");
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "direct://a", key.getEndpointUri());
+            assertEquals("direct://a", key.getEndpointUri(), "From endpoint");
 
             DefaultRoute consumer = assertIsInstanceOf(DefaultRoute.class, route);
 
@@ -483,7 +485,7 @@ public class RouteBuilderTest extends TestSupport {
         }
 
         SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, processor);
-        assertEquals("Endpoint URI", uri, sendProcessor.getDestination().getEndpointUri());
+        assertEquals(uri, sendProcessor.getDestination().getEndpointUri(), "Endpoint URI");
     }
 
     protected void assertSendToProcessor(Processor processor, String uri) {
@@ -495,7 +497,7 @@ public class RouteBuilderTest extends TestSupport {
             assertSendTo(processor, uri);
         } else {
             Producer producer = assertIsInstanceOf(Producer.class, processor);
-            assertEquals("Endpoint URI", uri, producer.getEndpoint().getEndpointUri());
+            assertEquals(uri, producer.getEndpoint().getEndpointUri(), "Endpoint URI");
         }
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/SimpleBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/SimpleBuilderTest.java
index 4c101d0..0a202e6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/SimpleBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/SimpleBuilderTest.java
@@ -21,7 +21,9 @@ import org.apache.camel.TestSupport;
 import org.apache.camel.TypeConversionException;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SimpleBuilderTest extends TestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ThreadPoolBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ThreadPoolBuilderTest.java
index 3fd5d89..6972cf9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ThreadPoolBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ThreadPoolBuilderTest.java
@@ -24,7 +24,10 @@ import java.util.concurrent.TimeUnit;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class ThreadPoolBuilderTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java
index ad4f7e1..d614bb5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java
@@ -26,7 +26,10 @@ import org.apache.camel.impl.transformer.ProcessorTransformer;
 import org.apache.camel.processor.SendProcessor;
 import org.apache.camel.spi.DataType;
 import org.apache.camel.spi.Transformer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class TransformerBuilderTest extends TestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ValueBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ValueBuilderTest.java
index 92ef588..c2b478b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ValueBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ValueBuilderTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ValueBuilderTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
index 79318f3..80eb92a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
@@ -24,7 +24,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.language.xpath.DefaultNamespaceContext;
 import org.apache.camel.language.xpath.XPathBuilder;
 import org.apache.camel.support.builder.Namespaces;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class DefaultNamespaceContextTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java
index cc76849..f287354 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.support.builder.Namespaces;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * XPath with namespace test
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathContentBasedRouterTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathContentBasedRouterTest.java
index 643fe6f..2d23273 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathContentBasedRouterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathContentBasedRouterTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.xml;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
index 2b6594d..53b1461 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
@@ -26,9 +26,11 @@ import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.TypeConversionException;
 import org.apache.camel.converter.jaxp.XmlConverter;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.language.xpath.XPathBuilder.xpath;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class XPathFeatureTest extends ContextTestSupport {
     public static final String DOM_BUILDER_FACTORY_FEATURE = XmlConverter.DOCUMENT_BUILDER_FACTORY_FEATURE;
@@ -37,6 +39,7 @@ public class XPathFeatureTest extends ContextTestSupport {
     public static final String XML_DATA_INVALID = " <!DOCTYPE foo [ " + " <!ELEMENT foo ANY > <!ENTITY xxe SYSTEM \"file:///bin/test.sh\" >]> <test> &xxe; </test><notwellformed>";
 
     @Override
+    @BeforeEach
     public void setUp() throws Exception {
         resetCoreConverters();
         super.setUp();
@@ -63,7 +66,7 @@ public class XPathFeatureTest extends ContextTestSupport {
     @Test
     public void testXPathResult() throws Exception {
         String result = (String)xpath("/").stringResult().evaluate(createExchange(XML_DATA));
-        assertEquals("Get a wrong result", "  ", result);
+        assertEquals("  ", result, "Get a wrong result");
     }
 
     @Test
@@ -74,7 +77,8 @@ public class XPathFeatureTest extends ContextTestSupport {
             xpath("/").stringResult().evaluate(createExchange(XML_DATA));
             fail("Expect an Exception here");
         } catch (TypeConversionException ex) {
-            assertTrue("Get a wrong exception cause: " + ex.getCause().getClass() + " instead of " + FileNotFoundException.class, ex.getCause() instanceof FileNotFoundException);
+            boolean b = ex.getCause() instanceof FileNotFoundException;
+            assertTrue(b, "Get a wrong exception cause: " + ex.getCause().getClass() + " instead of " + FileNotFoundException.class);
         } finally {
             System.clearProperty(DOM_BUILDER_FACTORY_FEATURE + ":" + "http://xml.org/sax/features/external-general-entities");
         }
@@ -87,8 +91,8 @@ public class XPathFeatureTest extends ContextTestSupport {
             xpath("/").documentType(Exchange.class).stringResult().evaluate(createExchange(XML_DATA));
             fail("Expect an Exception here");
         } catch (RuntimeCamelException ex) {
-            assertTrue("Get a wrong exception cause: " + ex.getCause().getClass() + " instead of " + NoTypeConversionAvailableException.class,
-                       ex.getCause() instanceof NoTypeConversionAvailableException);
+            boolean b = ex.getCause() instanceof NoTypeConversionAvailableException;
+            assertTrue(b, "Get a wrong exception cause: " + ex.getCause().getClass() + " instead of " + NoTypeConversionAvailableException.class);
         }
     }
 
@@ -98,7 +102,8 @@ public class XPathFeatureTest extends ContextTestSupport {
             xpath("/").stringResult().evaluate(createExchange(XML_DATA_INVALID));
             fail("Expect an Exception here");
         } catch (TypeConversionException ex) {
-            assertTrue("Get a wrong exception cause: " + ex.getCause().getClass() + " instead of " + SAXParseException.class, ex.getCause() instanceof SAXParseException);
+            boolean b = ex.getCause() instanceof SAXParseException;
+            assertTrue(b, "Get a wrong exception cause: " + ex.getCause().getClass() + " instead of " + SAXParseException.class);
         }
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFunctionsTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFunctionsTest.java
index 9f10ee6..a4169e2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFunctionsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFunctionsTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.xml;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * XPath with and without header test.
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameResultTypeAndNamespaceTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameResultTypeAndNamespaceTest.java
index d9c1dee..1922e9f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameResultTypeAndNamespaceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameResultTypeAndNamespaceTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.support.builder.Namespaces;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test XPath DSL with the ability to apply XPath on a header
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameTest.java
index 6041eb0..24c8eac 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.xml;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test XPath DSL with the ability to apply XPath on a header
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderTest.java
index b1ded5a..f5902c6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.xml;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * XPath with and without header test.
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathMockTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathMockTest.java
index 207a66d..b668c80 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathMockTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathMockTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.xml;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.builder.PredicateBuilder.not;
 import static org.apache.camel.language.xpath.XPathBuilder.xpath;
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceTest.java
index 19ec3bd..d00fcc7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.support.builder.Namespaces;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * XPath with namespace test
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNestedNamespaceTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNestedNamespaceTest.java
index 3d2d4e4..0e42665 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNestedNamespaceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNestedNamespaceTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.xml;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.support.builder.Namespaces;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class XPathNestedNamespaceTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
index eea2a00..be9be28 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
@@ -45,9 +45,10 @@ import org.apache.camel.language.xpath.InvalidXPathException;
 import org.apache.camel.language.xpath.XPathBuilder;
 import org.apache.camel.support.builder.Namespaces;
 import org.apache.camel.util.StringHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.language.xpath.XPathBuilder.xpath;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class XPathTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformRouteTest.java
index 6519c64..64663d6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformRouteTest.java
@@ -22,7 +22,7 @@ import org.w3c.dom.NodeList;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class XPathTransformRouteTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
index 046fada..585478e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
@@ -25,16 +25,14 @@ import org.w3c.dom.NodeList;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.language.xpath.XPathBuilder;
 import org.hamcrest.Matchers;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 
 import static org.hamcrest.Matchers.containsString;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 import static org.mockito.hamcrest.MockitoHamcrest.argThat;
 
 public class XPathTransformTest extends ContextTestSupport {
@@ -57,7 +55,7 @@ public class XPathTransformTest extends ContextTestSupport {
 
     @Test
     public void testXPathNamespaceLoggingEnabledJavaDSL() throws Exception {
-        Assume.assumeThat("Reflection on java.lang.Field has been disabled in JDK 12", getJavaVersion(), Matchers.lessThanOrEqualTo(11));
+        assumeThat("Reflection on java.lang.Field has been disabled in JDK 12", getJavaVersion(), Matchers.lessThanOrEqualTo(11));
 
         Logger l = mock(Logger.class);
 
@@ -84,7 +82,7 @@ public class XPathTransformTest extends ContextTestSupport {
 
     @Test
     public void testXPathNamespaceLoggingDisabledJavaDSL() throws Exception {
-        Assume.assumeThat("Reflection on java.lang.Field has been disabled in JDK 12", getJavaVersion(), Matchers.lessThanOrEqualTo(11));
+        assumeThat("Reflection on java.lang.Field has been disabled in JDK 12", getJavaVersion(), Matchers.lessThanOrEqualTo(11));
 
         Logger l = mock(Logger.class);
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java
index eecec86..82f1063 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.language.xpath.DefaultNamespaceContext;
 import org.apache.camel.language.xpath.XPathBuilder;
 import org.apache.camel.support.builder.Namespaces;
 import org.apache.camel.support.builder.xml.NamespacesHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class XPathWithNamespacesFromDomTest extends ContextTestSupport {
 
@@ -32,14 +35,14 @@ public class XPathWithNamespacesFromDomTest extends ContextTestSupport {
     public void testXPathUsingDomForNamespaces() throws Exception {
         Document document = context.getTypeConverter().convertTo(Document.class, "<x:foo xmlns:x='n1' xmlns:y='n2'><bar id='a' xmlns:y='n3'/></x:foo>");
         Element element = (Element)document.getElementsByTagName("bar").item(0);
-        assertNotNull("Could not find element for id 'a'", element);
+        assertNotNull(element, "Could not find element for id 'a'");
 
         XPathBuilder builder = XPathBuilder.xpath("//y:foo[@id='z']");
         Namespaces ns = NamespacesHelper.namespaces(element);
         ns.configure(builder);
         builder.start();
         DefaultNamespaceContext namespaceContext = builder.getNamespaceContext();
-        assertEquals("y namespace", "n3", namespaceContext.getNamespaceURI("y"));
+        assertEquals("n3", namespaceContext.getNamespaceURI("y"), "y namespace");
 
         assertPredicateMatches(builder, createExchangeWithBody("<blah><foo xmlns='n3' id='z'/></blah>"));
         assertPredicateDoesNotMatch(builder, createExchangeWithBody("<blah><foo xmlns='n2' id='z'/></blah>"));
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java
index 87d7f10..e5a010c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java
@@ -40,13 +40,15 @@ import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.spi.Synchronization;
 import org.apache.camel.support.DefaultExchange;
 import org.apache.camel.support.UnitOfWorkHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class XsltBuilderTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/xslt");
         createDirectory("target/data/xslt");
@@ -232,7 +234,7 @@ public class XsltBuilderTest extends ContextTestSupport {
         assertIsInstanceOf(File.class, exchange.getOut().getBody());
 
         File file = new File("target/data/xslt/xsltout.xml");
-        assertTrue("Output file should exist", file.exists());
+        assertTrue(file.exists(), "Output file should exist");
 
         String body = exchange.getOut().getBody(String.class);
         assertTrue(body.endsWith("<goodbye>world!</goodbye>"));
@@ -252,7 +254,7 @@ public class XsltBuilderTest extends ContextTestSupport {
         assertIsInstanceOf(File.class, exchange.getOut().getBody());
 
         File file = new File("target/data/xslt/xsltout.xml");
-        assertTrue("Output file should exist", file.exists());
+        assertTrue(file.exists(), "Output file should exist");
 
         String body = exchange.getOut().getBody(String.class);
         assertTrue(body.endsWith("<goodbye>world!</goodbye>"));
@@ -262,7 +264,7 @@ public class XsltBuilderTest extends ContextTestSupport {
         UnitOfWorkHelper.doneSynchronizations(exchange, onCompletions, log);
 
         // the file should be deleted
-        assertFalse("Output file should be deleted", file.exists());
+        assertFalse(file.exists(), "Output file should be deleted");
     }
 
     @Test
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltOutputFileTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltOutputFileTest.java
index d1d623c..27d2b5a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltOutputFileTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltOutputFileTest.java
@@ -25,9 +25,11 @@ import org.apache.camel.Exchange;
 import org.apache.camel.NoSuchHeaderException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.component.xslt.XsltBuilder.xslt;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class XsltOutputFileTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTest.java
index 173eb42..c449d2d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTest.java
@@ -21,7 +21,7 @@ import java.net.URL;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.component.xslt.XsltBuilder.xslt;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java
index 1b74e3b..176e065 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java
@@ -21,10 +21,12 @@ import javax.xml.transform.Source;
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.xslt.XsltUriResolver;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class XsltUriResolverTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class XsltUriResolverTest {
 
     @Test
     public void testResolveUri() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogTest.java
index e3224b8..e50861d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogTest.java
@@ -21,17 +21,17 @@ import java.util.Map;
 
 import org.apache.camel.catalog.impl.DefaultRuntimeCamelCatalog;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class RuntimeCamelCatalogTest {
 
     static RuntimeCamelCatalog catalog;
 
-    @BeforeClass
+    @BeforeAll
     public static void createCamelCatalog() {
         catalog = new DefaultRuntimeCamelCatalog();
         catalog.setCamelContext(new DefaultCamelContext());
diff --git a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceSelectorTest.java b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceSelectorTest.java
index 25c2f22..0f3fc67 100644
--- a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceSelectorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceSelectorTest.java
@@ -26,11 +26,11 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.cluster.AbstractCamelClusterService;
 import org.apache.camel.support.cluster.AbstractCamelClusterView;
 import org.apache.camel.support.cluster.ClusterServiceSelectors;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.support.cluster.ClusterServiceHelper.lookupService;
 import static org.apache.camel.support.cluster.ClusterServiceHelper.mandatoryLookupService;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ClusterServiceSelectorTest {
 
@@ -46,8 +46,8 @@ public class ClusterServiceSelectorTest {
 
             Optional<CamelClusterService> lookup = lookupService(context);
 
-            Assert.assertTrue(lookup.isPresent());
-            Assert.assertEquals(service1, lookup.get());
+            assertTrue(lookup.isPresent());
+            assertEquals(service1, lookup.get());
         } finally {
             if (context != null) {
                 context.stop();
@@ -66,7 +66,7 @@ public class ClusterServiceSelectorTest {
 
             Optional<CamelClusterService> lookup = lookupService(context);
 
-            Assert.assertFalse(lookup.isPresent());
+            assertFalse(lookup.isPresent());
         } finally {
             if (context != null) {
                 context.stop();
@@ -87,8 +87,8 @@ public class ClusterServiceSelectorTest {
             CamelClusterService.Selector selector = ClusterServiceSelectors.single();
             Optional<CamelClusterService> lookup = lookupService(context, selector);
 
-            Assert.assertTrue(lookup.isPresent());
-            Assert.assertEquals(service1, lookup.get());
+            assertTrue(lookup.isPresent());
+            assertEquals(service1, lookup.get());
         } finally {
             if (context != null) {
                 context.stop();
@@ -108,7 +108,7 @@ public class ClusterServiceSelectorTest {
             CamelClusterService.Selector selector = ClusterServiceSelectors.single();
             Optional<CamelClusterService> lookup = lookupService(context, selector);
 
-            Assert.assertFalse(lookup.isPresent());
+            assertFalse(lookup.isPresent());
         } finally {
             if (context != null) {
                 context.stop();
@@ -128,7 +128,7 @@ public class ClusterServiceSelectorTest {
             CamelClusterService.Selector selector = ClusterServiceSelectors.first();
             Optional<CamelClusterService> lookup = lookupService(context, selector);
 
-            Assert.assertTrue(lookup.isPresent());
+            assertTrue(lookup.isPresent());
         } finally {
             if (context != null) {
                 context.stop();
@@ -145,9 +145,9 @@ public class ClusterServiceSelectorTest {
             context.addService(new DummyClusterService1());
             context.addService(new DummyClusterService2());
 
-            Assert.assertTrue(lookupService(context, ClusterServiceSelectors.type(DummyClusterService1.class)).isPresent());
-            Assert.assertTrue(lookupService(context, ClusterServiceSelectors.type(DummyClusterService2.class)).isPresent());
-            Assert.assertFalse(lookupService(context, ClusterServiceSelectors.type(FileLockClusterService.class)).isPresent());
+            assertTrue(lookupService(context, ClusterServiceSelectors.type(DummyClusterService1.class)).isPresent());
+            assertTrue(lookupService(context, ClusterServiceSelectors.type(DummyClusterService2.class)).isPresent());
+            assertFalse(lookupService(context, ClusterServiceSelectors.type(FileLockClusterService.class)).isPresent());
 
         } finally {
             if (context != null) {
@@ -174,15 +174,15 @@ public class ClusterServiceSelectorTest {
             Optional<CamelClusterService> lookup;
 
             lookup = lookupService(context, ClusterServiceSelectors.attribute("service.type", "zookeeper"));
-            Assert.assertTrue(lookup.isPresent());
-            Assert.assertEquals(service1, lookup.get());
+            assertTrue(lookup.isPresent());
+            assertEquals(service1, lookup.get());
 
             lookup = lookupService(context, ClusterServiceSelectors.attribute("service.type", "file"));
-            Assert.assertTrue(lookup.isPresent());
-            Assert.assertEquals(service2, lookup.get());
+            assertTrue(lookup.isPresent());
+            assertEquals(service2, lookup.get());
 
             lookup = lookupService(context, ClusterServiceSelectors.attribute("service.type", "consul"));
-            Assert.assertFalse(lookup.isPresent());
+            assertFalse(lookup.isPresent());
 
         } finally {
             if (context != null) {
@@ -209,8 +209,8 @@ public class ClusterServiceSelectorTest {
             CamelClusterService.Selector selector = ClusterServiceSelectors.order();
             Optional<CamelClusterService> lookup = lookupService(context, selector);
 
-            Assert.assertTrue(lookup.isPresent());
-            Assert.assertEquals(service2, lookup.get());
+            assertTrue(lookup.isPresent());
+            assertEquals(service2, lookup.get());
 
         } finally {
             if (context != null) {
@@ -241,7 +241,7 @@ public class ClusterServiceSelectorTest {
             CamelClusterService.Selector selector = ClusterServiceSelectors.order();
             Optional<CamelClusterService> lookup = lookupService(context, selector);
 
-            Assert.assertFalse(lookup.isPresent());
+            assertFalse(lookup.isPresent());
         } finally {
             if (context != null) {
                 context.stop();
@@ -262,8 +262,8 @@ public class ClusterServiceSelectorTest {
             CamelClusterService.Selector selector = ClusterServiceSelectors.single();
             CamelClusterService lookup = mandatoryLookupService(context, selector);
 
-            Assert.assertNotNull(lookup);
-            Assert.assertEquals(service1, lookup);
+            assertNotNull(lookup);
+            assertEquals(service1, lookup);
         } finally {
             if (context != null) {
                 context.stop();
@@ -283,8 +283,8 @@ public class ClusterServiceSelectorTest {
 
             CamelClusterService lookup = mandatoryLookupService(context);
 
-            Assert.assertNotNull(lookup);
-            Assert.assertEquals(service1, lookup);
+            assertNotNull(lookup);
+            assertEquals(service1, lookup);
         } finally {
             if (context != null) {
                 context.stop();
@@ -292,14 +292,15 @@ public class ClusterServiceSelectorTest {
         }
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testMandatoryLookupFailure() throws Exception {
         CamelContext context = null;
 
         try {
-            context = new DefaultCamelContext();
+            CamelContext ctx = context = new DefaultCamelContext();
 
-            mandatoryLookupService(context, ClusterServiceSelectors.single());
+            assertThrows(IllegalStateException.class, () ->
+                mandatoryLookupService(ctx, ClusterServiceSelectors.single()));
         } finally {
             if (context != null) {
                 context.stop();
@@ -307,14 +308,15 @@ public class ClusterServiceSelectorTest {
         }
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testMandatoryLookupFailureWithoutSelector() throws Exception {
         CamelContext context = null;
 
         try {
-            context = new DefaultCamelContext();
+            CamelContext ctx = context = new DefaultCamelContext();
 
-            mandatoryLookupService(context);
+            assertThrows(IllegalStateException.class, () ->
+                mandatoryLookupService(ctx));
         } finally {
             if (context != null) {
                 context.stop();
diff --git a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceViewTest.java b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceViewTest.java
index feda62a..af0f6cb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceViewTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceViewTest.java
@@ -30,8 +30,9 @@ import java.util.stream.IntStream;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.support.cluster.AbstractCamelClusterService;
 import org.apache.camel.support.cluster.AbstractCamelClusterView;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ClusterServiceViewTest {
 
@@ -42,8 +43,8 @@ public class ClusterServiceViewTest {
         TestClusterView view2 = service.getView("ns1").unwrap(TestClusterView.class);
         TestClusterView view3 = service.getView("ns2").unwrap(TestClusterView.class);
 
-        Assert.assertEquals(view1, view2);
-        Assert.assertNotEquals(view1, view3);
+        assertEquals(view1, view2);
+        assertNotEquals(view1, view3);
     }
 
     @Test
@@ -55,42 +56,42 @@ public class ClusterServiceViewTest {
         TestClusterView view2 = service.getView("ns1").unwrap(TestClusterView.class);
         TestClusterView view3 = service.getView("ns2").unwrap(TestClusterView.class);
 
-        Assert.assertEquals(ServiceStatus.Started, view1.getStatus());
-        Assert.assertEquals(ServiceStatus.Started, view2.getStatus());
-        Assert.assertEquals(ServiceStatus.Started, view3.getStatus());
+        assertEquals(ServiceStatus.Started, view1.getStatus());
+        assertEquals(ServiceStatus.Started, view2.getStatus());
+        assertEquals(ServiceStatus.Started, view3.getStatus());
 
         service.releaseView(view1);
 
-        Assert.assertEquals(ServiceStatus.Started, view1.getStatus());
-        Assert.assertEquals(ServiceStatus.Started, view2.getStatus());
-        Assert.assertEquals(ServiceStatus.Started, view3.getStatus());
+        assertEquals(ServiceStatus.Started, view1.getStatus());
+        assertEquals(ServiceStatus.Started, view2.getStatus());
+        assertEquals(ServiceStatus.Started, view3.getStatus());
 
         service.releaseView(view2);
 
-        Assert.assertEquals(ServiceStatus.Stopped, view1.getStatus());
-        Assert.assertEquals(ServiceStatus.Stopped, view2.getStatus());
-        Assert.assertEquals(ServiceStatus.Started, view3.getStatus());
+        assertEquals(ServiceStatus.Stopped, view1.getStatus());
+        assertEquals(ServiceStatus.Stopped, view2.getStatus());
+        assertEquals(ServiceStatus.Started, view3.getStatus());
 
         service.releaseView(view3);
 
         TestClusterView newView1 = service.getView("ns1").unwrap(TestClusterView.class);
         TestClusterView newView2 = service.getView("ns1").unwrap(TestClusterView.class);
 
-        Assert.assertEquals(newView1, newView2);
-        Assert.assertEquals(view1, newView1);
-        Assert.assertEquals(view1, newView2);
+        assertEquals(newView1, newView2);
+        assertEquals(view1, newView1);
+        assertEquals(view1, newView2);
 
-        Assert.assertEquals(ServiceStatus.Started, newView1.getStatus());
-        Assert.assertEquals(ServiceStatus.Started, newView2.getStatus());
-        Assert.assertEquals(ServiceStatus.Stopped, view3.getStatus());
+        assertEquals(ServiceStatus.Started, newView1.getStatus());
+        assertEquals(ServiceStatus.Started, newView2.getStatus());
+        assertEquals(ServiceStatus.Stopped, view3.getStatus());
 
         service.stop();
 
-        Assert.assertEquals(ServiceStatus.Stopped, view1.getStatus());
-        Assert.assertEquals(ServiceStatus.Stopped, view2.getStatus());
-        Assert.assertEquals(ServiceStatus.Stopped, view3.getStatus());
-        Assert.assertEquals(ServiceStatus.Stopped, newView1.getStatus());
-        Assert.assertEquals(ServiceStatus.Stopped, newView2.getStatus());
+        assertEquals(ServiceStatus.Stopped, view1.getStatus());
+        assertEquals(ServiceStatus.Stopped, view2.getStatus());
+        assertEquals(ServiceStatus.Stopped, view3.getStatus());
+        assertEquals(ServiceStatus.Stopped, newView1.getStatus());
+        assertEquals(ServiceStatus.Stopped, newView2.getStatus());
     }
 
     @Test
@@ -98,26 +99,26 @@ public class ClusterServiceViewTest {
         TestClusterService service = new TestClusterService(UUID.randomUUID().toString());
         TestClusterView view = service.getView("ns1").unwrap(TestClusterView.class);
 
-        Assert.assertEquals(ServiceStatus.Stopped, view.getStatus());
+        assertEquals(ServiceStatus.Stopped, view.getStatus());
 
         // This should not start the view as the service has not yet started.
         service.startView(view.getNamespace());
 
-        Assert.assertEquals(ServiceStatus.Stopped, view.getStatus());
+        assertEquals(ServiceStatus.Stopped, view.getStatus());
 
         // This should start the view.
         service.start();
 
-        Assert.assertEquals(ServiceStatus.Started, view.getStatus());
+        assertEquals(ServiceStatus.Started, view.getStatus());
 
         service.stopView(view.getNamespace());
-        Assert.assertEquals(ServiceStatus.Stopped, view.getStatus());
+        assertEquals(ServiceStatus.Stopped, view.getStatus());
 
         service.startView(view.getNamespace());
-        Assert.assertEquals(ServiceStatus.Started, view.getStatus());
+        assertEquals(ServiceStatus.Started, view.getStatus());
 
         service.releaseView(view);
-        Assert.assertEquals(ServiceStatus.Stopped, view.getStatus());
+        assertEquals(ServiceStatus.Stopped, view.getStatus());
     }
 
     @Test
@@ -138,7 +139,7 @@ public class ClusterServiceViewTest {
 
         latch.await(10, TimeUnit.SECONDS);
 
-        IntStream.range(0, events).forEach(i -> Assert.assertTrue(results.contains(i)));
+        IntStream.range(0, events).forEach(i -> assertTrue(results.contains(i)));
     }
 
     @Test
@@ -164,7 +165,7 @@ public class ClusterServiceViewTest {
 
         latch.await(10, TimeUnit.SECONDS);
 
-        IntStream.range(0, events * 2).forEach(i -> Assert.assertTrue(results.contains(i)));
+        IntStream.range(0, events * 2).forEach(i -> assertTrue(results.contains(i)));
     }
 
     // *********************************
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java
index bb4fe4e..987f59c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.ExchangeBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AmbiguousMethodCallExceptionSimplifiedTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanByteArrayBodyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanByteArrayBodyTest.java
index 354b433..7640925 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanByteArrayBodyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanByteArrayBodyTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanByteArrayBodyTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
index 1764faa..9dfee80 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
@@ -22,15 +22,15 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class BeanChoseMethodWithMatchingTypeAndSkipSettersTest extends ContextTestSupport {
 
     private OrderServiceBean service = new OrderServiceBean();
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/file/order");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentMissingParenthesisTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentMissingParenthesisTest.java
index 4ad699e..1a68f8a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentMissingParenthesisTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentMissingParenthesisTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class BeanComponentMissingParenthesisTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentWithPropertiesLookupSetFromEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentWithPropertiesLookupSetFromEndpointTest.java
index 55f3392..4860283 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentWithPropertiesLookupSetFromEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentWithPropertiesLookupSetFromEndpointTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanComponentWithPropertiesLookupSetFromEndpointTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java
index fcb3df7..9f93d39 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanConcurrentTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanCreateBodyExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanCreateBodyExceptionTest.java
index 0b37fe6..f9afa9d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanCreateBodyExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanCreateBodyExceptionTest.java
@@ -21,7 +21,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.support.DefaultMessage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanCreateBodyExceptionTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanEndpointTest.java
index dfb98a6..35d7488 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanEndpointTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class BeanEndpointTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java
index ee6f867..d48dfeb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Unit test to demonstrate that bean invocation must no return Exchange.
@@ -38,7 +41,8 @@ public class BeanExchangeAsReturnTypeNotAllowedTest extends ContextTestSupport {
             template.sendBody("direct:in", "Hello World");
             fail("Should have thrown IllegalStateException");
         } catch (RuntimeCamelException e) {
-            assertTrue(e.getCause() instanceof IllegalStateException);
+            boolean b = e.getCause() instanceof IllegalStateException;
+            assertTrue(b);
             // expected
         }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExcludedMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExcludedMethodTest.java
index 21d0e56..9135bbb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExcludedMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExcludedMethodTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanExcludedMethodTest extends ContextTestSupport {
 
@@ -30,7 +32,7 @@ public class BeanExcludedMethodTest extends ContextTestSupport {
         Exchange exchange = new DefaultExchange(context);
         MyDummyBean pojo = new MyDummyBean();
         MethodInvocation mi = info.createInvocation(pojo, exchange);
-        assertNull("Should not be possible to find a suitable method", mi);
+        assertNull(mi, "Should not be possible to find a suitable method");
     }
 
     @Test
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java
index 56e3896..7f18c97 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.BeanScope;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class BeanExplicitMethodAmbiguousTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java
index dace948..9c7069a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanExplicitMethodTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExpressionConcurrentTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExpressionConcurrentTest.java
index 9e054eb..3bbce52 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExpressionConcurrentTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanExpressionConcurrentTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanExpressionConcurrentTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodPredicateTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodPredicateTest.java
index d73d10a..dd59abb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodPredicateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodPredicateTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanHandlerMethodPredicateTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodTest.java
index 13f1f5c..67a7710 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodTest.java
@@ -22,7 +22,9 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Handler;
 import org.apache.camel.Header;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanHandlerMethodTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java
index 35f39cd..26f5a0e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanImplicitMethodTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInPipelineTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInPipelineTest.java
index 2fd4af9..8ccd413 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInPipelineTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInPipelineTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Unit test to demonstrate beans in pipelines.
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java
index 0038e88..34f6d88 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java
@@ -23,7 +23,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.support.DefaultExchange;
 import org.apache.camel.support.DefaultMessage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class BeanInfoAMoreComplexOverloadedTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java
index 3c1fa61..d7330ff 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Unit test for overridden methods in an inheritance.
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedTest.java
index 97129b4..55684e7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.support.DefaultExchange;
 import org.apache.camel.support.DefaultMessage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanInfoOverloadedTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedWithSubTypeParamTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedWithSubTypeParamTest.java
index 6ac85b0..316a516 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedWithSubTypeParamTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoOverloadedWithSubTypeParamTest.java
@@ -17,15 +17,16 @@
 package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanInfoOverloadedWithSubTypeParamTest extends ContextTestSupport {
 
     @Test
     public void testBeanInfoOverloadedWithSubTypedParam() {
         BeanInfo beanInfo = new BeanInfo(context, Bean.class);
-        Assert.assertEquals(2, beanInfo.getMethods().size());
+        assertEquals(2, beanInfo.getMethods().size());
     }
 
     class Bean {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java
index 9670364..739cb49 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.ExchangeException;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class BeanInfoSelectMethodTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
index 0fdef54..fe35e43 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
@@ -26,12 +26,13 @@ import org.apache.camel.InOnly;
 import org.apache.camel.InOut;
 import org.apache.camel.Pattern;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BeanInfoTest extends Assert {
+import static org.junit.jupiter.api.Assertions.*;
+
+public class BeanInfoTest {
     private static final Logger LOG = LoggerFactory.getLogger(BeanInfoTest.class);
 
     protected CamelContext camelContext = new DefaultCamelContext();
@@ -115,26 +116,26 @@ public class BeanInfoTest extends Assert {
     public void testImplementLevel2InterfaceMethodInPackagePrivateClass() {
         BeanInfo info = createBeanInfo(PackagePrivateClassImplementingLevel2InterfaceMethod.class);
         List<MethodInfo> mis = info.getMethods();
-        Assert.assertNotNull(mis);
-        Assert.assertEquals(1, mis.size());
+        assertNotNull(mis);
+        assertEquals(1, mis.size());
         MethodInfo mi = mis.get(0);
-        Assert.assertNotNull(mi);
+        assertNotNull(mi);
         Method m = mi.getMethod();
-        Assert.assertEquals("method", m.getName());
-        Assert.assertTrue(Modifier.isPublic(m.getDeclaringClass().getModifiers()));
+        assertEquals("method", m.getName());
+        assertTrue(Modifier.isPublic(m.getDeclaringClass().getModifiers()));
     }
 
     @Test
     public void testPublicClassImplementingInterfaceMethodBySuperPackagePrivateClass() {
         BeanInfo info = createBeanInfo(PublicClassImplementingBySuperPackagePrivateClass.class);
         List<MethodInfo> mis = info.getMethods();
-        Assert.assertNotNull(mis);
-        Assert.assertEquals(1, mis.size());
+        assertNotNull(mis);
+        assertEquals(1, mis.size());
         MethodInfo mi = mis.get(0);
-        Assert.assertNotNull(mi);
+        assertNotNull(mi);
         Method m = mi.getMethod();
-        Assert.assertEquals("method", m.getName());
-        Assert.assertTrue(Modifier.isPublic(m.getDeclaringClass().getModifiers()));
+        assertEquals("method", m.getName());
+        assertTrue(Modifier.isPublic(m.getDeclaringClass().getModifiers()));
     }
 
     protected BeanInfo createBeanInfo(Class<?> type) {
@@ -145,13 +146,13 @@ public class BeanInfoTest extends Assert {
     protected void assertMethodPattern(BeanInfo info, String methodName, ExchangePattern expectedPattern) throws NoSuchMethodException {
         Class<?> type = info.getType();
         Method method = type.getMethod(methodName);
-        assertNotNull("Could not find method: " + methodName, method);
+        assertNotNull(method, "Could not find method: " + methodName);
 
         MethodInfo methodInfo = info.getMethodInfo(method);
-        assertNotNull("Could not find methodInfo for: " + method, methodInfo);
+        assertNotNull(methodInfo, "Could not find methodInfo for: " + method);
 
         ExchangePattern actualPattern = methodInfo.getPattern();
-        assertEquals("Pattern for: " + method, expectedPattern, actualPattern);
+        assertEquals(expectedPattern, actualPattern, "Pattern for: " + method);
 
         LOG.info("Method: {} has pattern: {}", method, actualPattern);
     }
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
index 635124a..07c3c70 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Unit test for bridged methods.
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeAsyncTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeAsyncTest.java
index 4e48b42..28b8d42 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeAsyncTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeAsyncTest.java
@@ -28,8 +28,9 @@ import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Unit test for Java 8 {@link CompletableFuture} as return type on a bean being
@@ -71,9 +72,11 @@ public class BeanInvokeAsyncTest extends ContextTestSupport {
             runTestSendBody(m -> m.expectedMessageCount(0), "SomeProblem", this::throwSomething);
             fail("Exception expected");
         } catch (ExecutionException e) {
-            Assert.assertTrue(e.getCause() instanceof CamelExecutionException);
-            Assert.assertTrue(e.getCause().getCause() instanceof IllegalStateException);
-            Assert.assertEquals("SomeProblem", e.getCause().getCause().getMessage());
+            boolean b1 = e.getCause() instanceof CamelExecutionException;
+            assertTrue(b1);
+            boolean b = e.getCause().getCause() instanceof IllegalStateException;
+            assertTrue(b);
+            assertEquals("SomeProblem", e.getCause().getCause().getMessage());
         }
     }
 
@@ -90,9 +93,9 @@ public class BeanInvokeAsyncTest extends ContextTestSupport {
         methodInvoked = new CountDownLatch(1);
         sendFuture = template.asyncSendBody("direct:entry", sentBody);
 
-        Assert.assertTrue(methodInvoked.await(5, TimeUnit.SECONDS));
-        Assert.assertEquals(0, mock.getReceivedCounter());
-        Assert.assertFalse(sendFuture.isDone());
+        assertTrue(methodInvoked.await(5, TimeUnit.SECONDS));
+        assertEquals(0, mock.getReceivedCounter());
+        assertFalse(sendFuture.isDone());
         try {
             callFuture.complete(processor.apply(receivedBody));
         } catch (Exception e) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeSimpleOgnlToStringMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeSimpleOgnlToStringMethodTest.java
index 9e3cdb9..89c4fdc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeSimpleOgnlToStringMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeSimpleOgnlToStringMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeSingleMethodNoBodyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeSingleMethodNoBodyTest.java
index 349f5e9..b709449 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeSingleMethodNoBodyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeSingleMethodNoBodyTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanInvokeSingleMethodNoBodyTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeStaticTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeStaticTest.java
index 794d000..8d667c2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeStaticTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeStaticTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class BeanInvokeStaticTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeTest.java
index 2ab1db0..1402602 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanInvokeTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeToStringMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeToStringMethodTest.java
index 311777d..231dde9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeToStringMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeToStringMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeWithNullBodyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeWithNullBodyTest.java
index 5017640..e32bd08 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeWithNullBodyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeWithNullBodyTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanInvokeWithNullBodyTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanLifecycleTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanLifecycleTest.java
index 8a4676c..6a0b4eb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanLifecycleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanLifecycleTest.java
@@ -25,9 +25,11 @@ import org.apache.camel.Service;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanLifecycleTest extends ContextTestSupport {
 
@@ -36,7 +38,7 @@ public class BeanLifecycleTest extends ContextTestSupport {
     private MyBean statefulInstanceInRegistryNoCache;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         statefulInstance = new MyBean();
         statefulInstanceInRegistry = new MyBean();
@@ -46,7 +48,7 @@ public class BeanLifecycleTest extends ContextTestSupport {
     }
 
     @Override
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         super.tearDown();
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java
index 30627bc..1b7f34c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java
@@ -22,10 +22,11 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultRegistry;
 import org.apache.camel.support.jndi.JndiBeanRepository;
 import org.apache.camel.support.jndi.JndiContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class BeanLookupUsingJndiRegistryIssueTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class BeanLookupUsingJndiRegistryIssueTest {
 
     @Test
     public void testCamelWithJndi() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
index 790a95c..f894e89 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
@@ -22,7 +22,9 @@ import java.util.Map;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanMapPutTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodBeanTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodBeanTest.java
index 5d01f31..ce6ad12 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodBeanTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodBeanTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.bean;
 import java.lang.reflect.Method;
 
 import org.apache.camel.TestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class BeanMethodBeanTest extends TestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodNameHeaderIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodNameHeaderIssueTest.java
index 09ae190..e38e0e2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodNameHeaderIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodNameHeaderIssueTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Handler;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithCommaTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithCommaTest.java
index eeb4665..a838f89 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithCommaTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithCommaTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithExchangeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithExchangeTest.java
index 08fb905..061699b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithExchangeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithExchangeTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithEmptyParameterAndNoMethodWithNoParameterIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithEmptyParameterAndNoMethodWithNoParameterIssueTest.java
index 756e85f..1ab6065 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithEmptyParameterAndNoMethodWithNoParameterIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithEmptyParameterAndNoMethodWithNoParameterIssueTest.java
@@ -21,7 +21,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * CAMEL-6455
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithStringParameterTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithStringParameterTest.java
index 9f4811f..7c9cbbd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithStringParameterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithStringParameterTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoCacheTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoCacheTest.java
index 824ff70..e89c6c6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoCacheTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoCacheTest.java
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.camel.BeanScope;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanNoCacheTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleTest.java
index 559b68d..e43b8b4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleTest.java
@@ -25,7 +25,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanNoTypeConvertionPossibleTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java
index d142a62..5a1254c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanNoTypeConvertionPossibleWhenHeaderTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlBodyMethodReturnNullValueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlBodyMethodReturnNullValueTest.java
index fbff236..65314c7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlBodyMethodReturnNullValueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlBodyMethodReturnNullValueTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java
index 420c592..5c1e233 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.util.StopWatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOnglStaticMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOnglStaticMethodTest.java
index ceebb8e..8509c0c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOnglStaticMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOnglStaticMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanOnglStaticMethodTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedCovariantMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedCovariantMethodTest.java
index cd86831..92f9837 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedCovariantMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedCovariantMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanOverloadedCovariantMethodTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodFQNTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodFQNTest.java
index 6ee6686..802c2e3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodFQNTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodFQNTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodParameterValueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodParameterValueTest.java
index 637f6ae..9f52978 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodParameterValueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodParameterValueTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodTest.java
index d2fb71b..d64ed6d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Header;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadsWithAssignableParamTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadsWithAssignableParamTest.java
index 3e1072a..8b6e110 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadsWithAssignableParamTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadsWithAssignableParamTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanOverloadsWithAssignableParamTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPackageScopeOutsideTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPackageScopeOutsideTest.java
index cafb2a8..663ddb0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPackageScopeOutsideTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPackageScopeOutsideTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.issues.MyPackageScopedBean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test to demonstrate calling a package scoped bean method
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPackageScopeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPackageScopeTest.java
index 047c20f..b709195 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPackageScopeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPackageScopeTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test to demonstrate calling a package scoped bean method
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterBindingStreamCachingTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterBindingStreamCachingTest.java
index 0013359..9a0f6c3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterBindingStreamCachingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterBindingStreamCachingTest.java
@@ -21,7 +21,7 @@ import java.io.ByteArrayInputStream;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.language.simple.Simple;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanParameterBindingStreamCachingTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInfoTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInfoTest.java
index 46d1998..dd4fff3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInfoTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInfoTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.Body;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanParameterInfoTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidSyntaxTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidSyntaxTest.java
index 1e5a65f..1e3c31f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidSyntaxTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidSyntaxTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class BeanParameterInvalidSyntaxTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidValueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidValueTest.java
index 9023143..2ff8b51 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidValueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidValueTest.java
@@ -24,7 +24,9 @@ import org.apache.camel.ExpressionEvaluationException;
 import org.apache.camel.TypeConversionException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterMethodCallThreeBodyOgnlTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterMethodCallThreeBodyOgnlTest.java
index 67fd8ea..e09b1e9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterMethodCallThreeBodyOgnlTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterMethodCallThreeBodyOgnlTest.java
@@ -22,7 +22,9 @@ import java.util.List;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterNoBeanBindingTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterNoBeanBindingTest.java
index eedcba0..e139d5c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterNoBeanBindingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterNoBeanBindingTest.java
@@ -21,7 +21,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.RuntimeExchangeException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterThreeBodyOgnlTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterThreeBodyOgnlTest.java
index b843efc..66d5605 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterThreeBodyOgnlTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterThreeBodyOgnlTest.java
@@ -22,7 +22,9 @@ import java.util.List;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java
index 9a3913c..d54a63a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOverloadedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOverloadedTest.java
index 4f99763..e56de1a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOverloadedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOverloadedTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java
index 116cef3..572bbfc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java
@@ -22,7 +22,7 @@ import java.util.Map;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
index 0498c27..489ecab 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
@@ -22,7 +22,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.util.StopWatch;
 import org.apache.camel.util.TimeUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
index e2c4acc..f800615 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
@@ -25,7 +25,10 @@ import org.apache.camel.Headers;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Unit test of bean can propagate headers in a pipeline
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java
index e7f6ce2..44928fc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.bean.issues.PrivateClasses.HelloCamel;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.component.bean.issues.PrivateClasses.EXPECTED_OUTPUT;
 import static org.apache.camel.component.bean.issues.PrivateClasses.METHOD_NAME;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
index 9cee357..e39abf7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPropagateHeaderTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanPropagateHeaderTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyNoBindingTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyNoBindingTest.java
index ccf4505..6801150 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyNoBindingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyNoBindingTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.builder.ProxyBuilder;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanProxyNoBindingTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java
index b2ab73e..9c97b7a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.builder.ProxyBuilder;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanProxyTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
index ce093a6..7e249d2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class BeanRefMethodNotFoundTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java
index 9914b8f..d5cf438 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.camel.BeanScope;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanRefNoCacheTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java
index 2c9e3c5..deaa263 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java
@@ -21,7 +21,10 @@ import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class BeanRefNotFoundTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRegistryBeanTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRegistryBeanTest.java
index 512a722..b53d19f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRegistryBeanTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRegistryBeanTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Expression;
 import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanRegistryBeanTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableReturnNullTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableReturnNullTest.java
index 3d47bbf..761a590 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableReturnNullTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableReturnNullTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanReturnCallableReturnNullTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableTest.java
index 67205be..dc1f69d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnCallableTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanReturnCallableTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnNullTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnNullTest.java
index 598f08b..cce49ee 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnNullTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnNullTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanSimpleLanguageStaticMethodIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanSimpleLanguageStaticMethodIssueTest.java
index 4426930..4ce43bc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanSimpleLanguageStaticMethodIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanSimpleLanguageStaticMethodIssueTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanSimpleLanguageStaticMethodIssueTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanStaticMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanStaticMethodTest.java
index 33631dc..b19d04d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanStaticMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanStaticMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanStaticMethodTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationAndExchangeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationAndExchangeTest.java
index 195f040..eb941f1 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationAndExchangeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationAndExchangeTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.Header;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Unit test to demonstrate annotations combined with Exchange parameter.
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationInheritedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationInheritedTest.java
index 181b677..9826409 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationInheritedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithAnnotationInheritedTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.Header;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test inheritance of parameter binding annotations from superclasses and
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java
index d3a93b4..de3cb15 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java
@@ -21,7 +21,10 @@ import org.apache.camel.ExchangeException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class BeanWithExchangeExceptionAnnotationTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationWrappedExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationWrappedExceptionTest.java
index 58961da..ef033b2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationWrappedExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationWrappedExceptionTest.java
@@ -20,6 +20,9 @@ import java.io.IOException;
 
 import org.apache.camel.ExchangeException;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class BeanWithExchangeExceptionAnnotationWrappedExceptionTest extends BeanWithExchangeExceptionAnnotationTest {
 
     public static class MyBean {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
index cc02396..f1c7c6a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.language.simple.Simple;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanWithExpressionInjectionPredicateTest extends ContextTestSupport {
     protected MyBean myBean = new MyBean();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
index b24e93b..faa1c85 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
@@ -21,10 +21,12 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.language.simple.Simple;
 import org.apache.camel.processor.BeanRouteTest;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class BeanWithExpressionInjectionTest extends ContextTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(BeanRouteTest.class);
     protected MyBean myBean = new MyBean();
@@ -35,8 +37,8 @@ public class BeanWithExpressionInjectionTest extends ContextTestSupport {
 
         template.sendBodyAndHeader("direct:in", expectedBody, "foo", "bar");
 
-        assertEquals("bean body: " + myBean, expectedBody, myBean.body);
-        assertEquals("bean foo: " + myBean, "bar", myBean.foo);
+        assertEquals(expectedBody, myBean.body, "bean body: " + myBean);
+        assertEquals("bar", myBean.foo, "bean foo: " + myBean);
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeaderTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeaderTest.java
index 607d0f2..7554949 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeaderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeaderTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test to demonstrate the headers can pass through beans.
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
index 9159955..4b846c3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
@@ -30,10 +30,12 @@ import org.apache.camel.Processor;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class BeanWithHeadersAndBodyInject2Test extends ContextTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(BeanWithHeadersAndBodyInject2Test.class);
     private MyBean myBean = new MyBean();
@@ -56,7 +58,7 @@ public class BeanWithHeadersAndBodyInject2Test extends ContextTestSupport {
             }
         });
 
-        assertTrue("Should fail", out.isFailed());
+        assertTrue(out.isFailed(), "Should fail");
         assertIsInstanceOf(RuntimeCamelException.class, out.getException());
         assertIsInstanceOf(NoTypeConversionAvailableException.class, out.getException().getCause());
     }
@@ -74,7 +76,7 @@ public class BeanWithHeadersAndBodyInject2Test extends ContextTestSupport {
             }
         });
 
-        assertFalse("Should not fail", out.isFailed());
+        assertFalse(out.isFailed(), "Should not fail");
         assertSame(list, myBean.users);
         assertEquals("TheBody", myBean.body);
     }
@@ -88,7 +90,7 @@ public class BeanWithHeadersAndBodyInject2Test extends ContextTestSupport {
             }
         });
 
-        assertFalse("Should not fail", out.isFailed());
+        assertFalse(out.isFailed(), "Should not fail");
         assertEquals("TheBody", myBean.body);
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject3Test.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject3Test.java
index 1078536..5a71e28 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject3Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject3Test.java
@@ -24,7 +24,10 @@ import org.apache.camel.Headers;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class BeanWithHeadersAndBodyInject3Test extends ContextTestSupport {
     private MyBean myBean = new MyBean();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
index 1f38f6e..314a1ed 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
@@ -26,10 +26,12 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.BeanRouteTest;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class BeanWithHeadersAndBodyInjectionTest extends ContextTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(BeanRouteTest.class);
     protected MyBean myBean = new MyBean();
@@ -49,12 +51,12 @@ public class BeanWithHeadersAndBodyInjectionTest extends ContextTestSupport {
         });
 
         Map<String, Object> foo = myBean.headers;
-        assertNotNull("myBean.foo", foo);
+        assertNotNull(foo, "myBean.foo");
 
-        assertEquals("foo.h1", "xyz", foo.get("h1"));
-        assertEquals("foo.h2", 456, foo.get("h2"));
+        assertEquals("xyz", foo.get("h1"), "foo.h1");
+        assertEquals(456, foo.get("h2"), "foo.h2");
 
-        assertEquals("body", "TheBody", myBean.body);
+        assertEquals("TheBody", myBean.body, "body");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithInputStreamBodyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithInputStreamBodyTest.java
index e322659..6b5dbed 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithInputStreamBodyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithInputStreamBodyTest.java
@@ -23,7 +23,7 @@ import java.io.InputStream;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanWithInputStreamBodyTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
index 17ab211..eae6a96 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanWithMethodHeaderTest extends ContextTestSupport {
 
@@ -37,7 +39,7 @@ public class BeanWithMethodHeaderTest extends ContextTestSupport {
         template.sendBody("direct:echo", "Hello World");
 
         assertMockEndpointsSatisfied();
-        assertNull("There should no Bean_METHOD_NAME header", mock.getExchanges().get(0).getIn().getHeader(Exchange.BEAN_METHOD_NAME));
+        assertNull(mock.getExchanges().get(0).getIn().getHeader(Exchange.BEAN_METHOD_NAME), "There should no Bean_METHOD_NAME header");
     }
 
     @Test
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
index 1dfe79e8..fb9f8a1 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
@@ -27,7 +27,10 @@ import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class BeanWithPropertiesAndHeadersAndBodyInjectionTest extends ContextTestSupport {
     protected MyBean myBean = new MyBean();
@@ -46,19 +49,19 @@ public class BeanWithPropertiesAndHeadersAndBodyInjectionTest extends ContextTes
             }
         });
 
-        assertEquals("Should not fail", false, out.isFailed());
+        assertEquals(false, out.isFailed(), "Should not fail");
 
         Map<?, ?> foo = myBean.foo;
         Map<?, ?> bar = myBean.bar;
-        assertNotNull("myBean.foo", foo);
-        assertNotNull("myBean.bar", bar);
+        assertNotNull(foo, "myBean.foo");
+        assertNotNull(bar, "myBean.bar");
 
-        assertEquals("foo.p1", "abc", foo.get("p1"));
-        assertEquals("foo.p2", 123, foo.get("p2"));
+        assertEquals("abc", foo.get("p1"), "foo.p1");
+        assertEquals(123, foo.get("p2"), "foo.p2");
 
-        assertEquals("bar.h1", "xyz", bar.get("h1"));
-        assertEquals("bar.h2", 456, bar.get("h2"));
-        assertEquals("body", "TheBody", myBean.body);
+        assertEquals("xyz", bar.get("h1"), "bar.h1");
+        assertEquals(456, bar.get("h2"), "bar.h2");
+        assertEquals("TheBody", myBean.body, "body");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
index 04d134a..d9d2824 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
@@ -27,10 +27,13 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.BeanRouteTest;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class BeanWithPropertiesAndHeadersInjectionTest extends ContextTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(BeanRouteTest.class);
     protected MyBean myBean = new MyBean();
@@ -50,14 +53,14 @@ public class BeanWithPropertiesAndHeadersInjectionTest extends ContextTestSuppor
 
         Map<?, ?> foo = myBean.foo;
         Map<?, ?> bar = myBean.bar;
-        assertNotNull("myBean.foo", foo);
-        assertNotNull("myBean.bar", bar);
+        assertNotNull(foo, "myBean.foo");
+        assertNotNull(bar, "myBean.bar");
 
-        assertEquals("foo.p1", "abc", foo.get("p1"));
-        assertEquals("foo.p2", 123, foo.get("p2"));
+        assertEquals("abc", foo.get("p1"), "foo.p1");
+        assertEquals(123, foo.get("p2"), "foo.p2");
 
-        assertEquals("bar.h1", "xyz", bar.get("h1"));
-        assertEquals("bar.h2", 456, bar.get("h2"));
+        assertEquals("xyz", bar.get("h1"), "bar.h1");
+        assertEquals(456, bar.get("h2"), "bar.h2");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingHeaderValueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingHeaderValueTest.java
index 287208f..77c50ac 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingHeaderValueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingHeaderValueTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Handler;
 import org.apache.camel.language.xpath.XPath;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests the XPath annotation 'header' value which when set will cause the XPath
@@ -34,9 +36,9 @@ public class BeanWithXPathInjectionUsingHeaderValueTest extends ContextTestSuppo
     public void testConstantXPathHeaders() throws Exception {
         template.sendBodyAndHeader("bean:myBean", "<response>OK</response>", "invoiceDetails", "<invoice><person><name>Alan</name><date>26/08/2012</date></person></invoice>");
 
-        assertEquals("bean response:  " + myBean, "OK", myBean.response);
-        assertEquals("bean userName: " + myBean, "Alan", myBean.userName);
-        assertEquals("bean date:  " + myBean, "26/08/2012", myBean.date);
+        assertEquals("OK", myBean.response, "bean response:  " + myBean);
+        assertEquals("Alan", myBean.userName, "bean userName: " + myBean);
+        assertEquals("26/08/2012", myBean.date, "bean date:  " + myBean);
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingResultTypeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingResultTypeTest.java
index 226af39..89e697b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingResultTypeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingResultTypeTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.language.xpath.XPath;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanWithXPathInjectionUsingResultTypeTest extends ContextTestSupport {
 
@@ -28,8 +30,8 @@ public class BeanWithXPathInjectionUsingResultTypeTest extends ContextTestSuppor
     @Test
     public void testSendMessage() throws Exception {
         template.sendBody("bean:myBean", "<a><b>12</b></a>");
-        assertEquals("bean ab: " + myBean, "12", myBean.ab);
-        assertEquals("bean abText: " + myBean, "a12", myBean.abText);
+        assertEquals("12", myBean.ab, "bean ab: " + myBean);
+        assertEquals("a12", myBean.abText, "bean abText: " + myBean);
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
index e062abb..60c4cba 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
@@ -21,10 +21,13 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.BeanRouteTest;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class BodyAnnotationToDisambiguateMethodsTest extends ContextTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(BeanRouteTest.class);
     protected MyBean myBean = new MyBean();
@@ -35,7 +38,7 @@ public class BodyAnnotationToDisambiguateMethodsTest extends ContextTestSupport
 
         template.sendBodyAndHeader("direct:in", expectedBody, "foo", "bar");
 
-        assertEquals("bean body: " + myBean, expectedBody, myBean.body);
+        assertEquals(expectedBody, myBean.body, "bean body: " + myBean);
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentInvalidConfigurationTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentInvalidConfigurationTest.java
index f45955a..6b60033 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentInvalidConfigurationTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentInvalidConfigurationTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.ResolveEndpointFailedException;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ClassComponentInvalidConfigurationTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentTest.java
index 254229b..6183743 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ClassComponentTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentWithPropertiesLookupSetFromEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentWithPropertiesLookupSetFromEndpointTest.java
index f2209d6..045e1fd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentWithPropertiesLookupSetFromEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentWithPropertiesLookupSetFromEndpointTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ClassComponentWithPropertiesLookupSetFromEndpointTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentWithPropertiesSetFromEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentWithPropertiesSetFromEndpointTest.java
index 3c2f253..6c16c4d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentWithPropertiesSetFromEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/ClassComponentWithPropertiesSetFromEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ClassComponentWithPropertiesSetFromEndpointTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
index 195a485..69d20f3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Expression;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.support.ExpressionAdapter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CustomParameterMappingStrategyTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
index b98e72d1..2e554ba 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.Processor;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class DefaultParameterMappingStrategyTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
index 8dd6b6b..f3f8c07 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
@@ -22,10 +22,13 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.language.simple.Simple;
 import org.apache.camel.processor.BeanRouteTest;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class ExpressionAnnotationToDisambiguateMethodsTest extends ContextTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(BeanRouteTest.class);
     protected MyBean myBean = new MyBean();
@@ -35,14 +38,14 @@ public class ExpressionAnnotationToDisambiguateMethodsTest extends ContextTestSu
     public void testSendMessage() throws Exception {
         template.sendBodyAndHeader("direct:in", "<hello>world!</hello>", "foo", "bar");
 
-        assertEquals("bean body: " + myBean, "bar", myBean.bar);
+        assertEquals("bar", myBean.bar, "bean body: " + myBean);
     }
 
     @Test
     public void testSendMessageHandler() throws Exception {
         template.sendBodyAndHeader("direct:other", "<hello>world!</hello>", "foo", "bar");
 
-        assertEquals("bean body: " + myOtherBean, "bar", myOtherBean.bar);
+        assertEquals("bar", myOtherBean.bar, "bean body: " + myOtherBean);
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/FileBeanParameterBindingTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/FileBeanParameterBindingTest.java
index 8fb8767..292d4c8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/FileBeanParameterBindingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/FileBeanParameterBindingTest.java
@@ -22,13 +22,15 @@ import org.apache.camel.Header;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class FileBeanParameterBindingTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/foo");
         super.setUp();
@@ -68,12 +70,12 @@ public class FileBeanParameterBindingTest extends ContextTestSupport {
     public static class MyFooBean {
 
         public void before(@Header("bar") Integer bar, @Header(Exchange.FILE_NAME) String name) {
-            assertNull("There should be no bar", bar);
+            assertNull(bar, "There should be no bar");
             assertEquals("hello.txt", name);
         }
 
         public void after(@Header("bar") Integer bar, @Header(Exchange.FILE_NAME) String name) {
-            assertNotNull("There should be bar", bar);
+            assertNotNull(bar, "There should be bar");
             assertEquals(123, bar.intValue());
             assertEquals("hello.txt", name);
         }
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallBeanRefMethodNotFoundTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallBeanRefMethodNotFoundTest.java
index c56b0b5..16bfccb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallBeanRefMethodNotFoundTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallBeanRefMethodNotFoundTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class MethodCallBeanRefMethodNotFoundTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallBeanRefNotFoundTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallBeanRefNotFoundTest.java
index 8988a60..b18cf64 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallBeanRefNotFoundTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallBeanRefNotFoundTest.java
@@ -21,7 +21,10 @@ import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class MethodCallBeanRefNotFoundTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallMissingParenthesisTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallMissingParenthesisTest.java
index c1f6c79..be5e9a4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallMissingParenthesisTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallMissingParenthesisTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.bean;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class MethodCallMissingParenthesisTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallRefOrBeanPrefixTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallRefOrBeanPrefixTest.java
index 3310d82..b87b3e2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallRefOrBeanPrefixTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallRefOrBeanPrefixTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MethodCallRefOrBeanPrefixTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallStaticMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallStaticMethodTest.java
index 3abf0e8..e9cc355 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallStaticMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallStaticMethodTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.util.StringHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MethodCallStaticMethodTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java
index fdeed54..fa6ed9a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.ExchangeBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MethodNotFoundExceptionSimplifiedTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/MyAuditServiceProxyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/MyAuditServiceProxyTest.java
index 9e727ee..849e05f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/MyAuditServiceProxyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/MyAuditServiceProxyTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.ProxyBuilder;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MyAuditServiceProxyTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrencyBeanTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrencyBeanTest.java
index 7ef6a6c..283b761 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrencyBeanTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrencyBeanTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MyCurrencyBeanTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/MyServiceProxyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/MyServiceProxyTest.java
index 827ce72..9269d2f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/MyServiceProxyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/MyServiceProxyTest.java
@@ -21,7 +21,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class MyServiceProxyTest extends ContextTestSupport {
 
@@ -86,8 +89,8 @@ public class MyServiceProxyTest extends ContextTestSupport {
         in.id = 100;
         in.request = "Camel";
         MyResponse response = myService.call(in);
-        assertEquals("Get a wrong response id.", 100, response.id);
-        assertEquals("Get a wrong response", "Hi Camel", response.response);
+        assertEquals(100, response.id, "Get a wrong response id.");
+        assertEquals("Hi Camel", response.response, "Get a wrong response");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
index 2d09304..20030cb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Registry;
 import org.apache.camel.support.DefaultRegistry;
 import org.apache.camel.support.jndi.JndiBeanRepository;
 import org.apache.camel.support.jndi.JndiContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java
index e49cd48..5870984 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.Predicate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.BeanRouteTest;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class PredicateAsBeanTest extends ContextTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(BeanRouteTest.class);
     protected MyPredicate myPredicate = new MyPredicate();
@@ -36,7 +38,7 @@ public class PredicateAsBeanTest extends ContextTestSupport {
 
         template.sendBodyAndHeader("direct:in", expectedBody, "foo", "bar");
 
-        assertEquals("bean body: " + myPredicate, expectedBody, myPredicate.body);
+        assertEquals(expectedBody, myPredicate.body, "bean body: " + myPredicate);
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java
index 48c5f70..8bbed49 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java
@@ -22,7 +22,10 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ProxyReturnFutureExceptionTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureListTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureListTest.java
index 0e0e9d5..a052557 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureListTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureListTest.java
@@ -25,7 +25,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class ProxyReturnFutureListTest extends ContextTestSupport {
 
@@ -35,7 +38,7 @@ public class ProxyReturnFutureListTest extends ContextTestSupport {
 
         Future<List<String>> future = service.getUsers(true);
         log.info("Got future");
-        assertFalse("Should not be done", future.isDone());
+        assertFalse(future.isDone(), "Should not be done");
         log.info("Waiting for future to be done ...");
 
         List<String> users = future.get(2, TimeUnit.SECONDS);
@@ -49,7 +52,7 @@ public class ProxyReturnFutureListTest extends ContextTestSupport {
 
         Future<List<String>> future = service.getUsers(true);
         log.info("Got future");
-        assertFalse("Should not be done", future.isDone());
+        assertFalse(future.isDone(), "Should not be done");
         log.info("Waiting for future to be done ...");
 
         List<String> users = future.get(2, TimeUnit.SECONDS);
@@ -58,7 +61,7 @@ public class ProxyReturnFutureListTest extends ContextTestSupport {
 
         future = service.getUsers(true);
         log.info("Got future");
-        assertFalse("Should not be done", future.isDone());
+        assertFalse(future.isDone(), "Should not be done");
         log.info("Waiting for future to be done ...");
 
         users = future.get(2, TimeUnit.SECONDS);
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java
index 6650fcc..f5fb92a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java
@@ -21,7 +21,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ProxyReturnFutureTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/RequestScopedBeanComponentTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/RequestScopedBeanComponentTest.java
index b9c2446..511dc8c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/RequestScopedBeanComponentTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/RequestScopedBeanComponentTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RequestScopedBeanComponentTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/RouteMethodCallStaticTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/RouteMethodCallStaticTest.java
index c58f360..d159446 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/RouteMethodCallStaticTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/RouteMethodCallStaticTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanBodyParenthesisTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanBodyParenthesisTest.java
index a93d008..9632157 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanBodyParenthesisTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanBodyParenthesisTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithCommaTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithCommaTest.java
index d9eacd8..df7ecdd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithCommaTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithCommaTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithParenthesisTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithParenthesisTest.java
index e7a0024..1a5030e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithParenthesisTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithParenthesisTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanAbstractMethodIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanAbstractMethodIssueTest.java
index 2cc864f..7aa6120 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanAbstractMethodIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanAbstractMethodIssueTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.issues;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanAbstractMethodIssueTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanInfoSingleMethodServiceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanInfoSingleMethodServiceTest.java
index c93c5bf..c2af8ce 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanInfoSingleMethodServiceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanInfoSingleMethodServiceTest.java
@@ -21,7 +21,9 @@ import java.lang.reflect.Method;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.bean.BeanInfo;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanInfoSingleMethodServiceTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanParameterBestTypeMatchIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanParameterBestTypeMatchIssueTest.java
index 031d984..f5e89e2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanParameterBestTypeMatchIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanParameterBestTypeMatchIssueTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.issues;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanParameterBestTypeMatchIssueTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java
index fde0527..7872097 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanRouteToDerivedClassTest extends ContextTestSupport {
 
@@ -43,7 +45,7 @@ public class BeanRouteToDerivedClassTest extends ContextTestSupport {
 
         template.sendBody("direct:start", "Hello World");
 
-        assertEquals("Derived class should have been invoked", "Hello World", derived.getAndClearBody());
+        assertEquals("Hello World", derived.getAndClearBody(), "Derived class should have been invoked");
     }
 
     @Test
@@ -61,15 +63,15 @@ public class BeanRouteToDerivedClassTest extends ContextTestSupport {
         context.start();
 
         Object out = template.requestBody("direct:start", "Hello World");
-        assertEquals("Derived class should have been invoked", "Hello World", derived.getAndClearBody());
+        assertEquals("Hello World", derived.getAndClearBody(), "Derived class should have been invoked");
         assertEquals("Hello World", out.toString());
 
         out = template.requestBody("direct:other", new MyMessage("Hello World"));
-        assertEquals("Derived class should NOT have been invoked", null, derived.getAndClearBody());
+        assertEquals(null, derived.getAndClearBody(), "Derived class should NOT have been invoked");
         assertEquals("Bye World", out.toString());
 
         out = template.requestBody("direct:other", new MyMessage("Hello Again"));
-        assertEquals("Derived class should NOT have been invoked", null, derived.getAndClearBody());
+        assertEquals(null, derived.getAndClearBody(), "Derived class should NOT have been invoked");
         assertEquals("Bye World", out.toString());
     }
 
@@ -90,15 +92,15 @@ public class BeanRouteToDerivedClassTest extends ContextTestSupport {
         context.start();
 
         Object out = template.requestBody("direct:start", new MyMessage("Hello World"));
-        assertEquals("Derived class should have been invoked", "Hello World", derived.getAndClearBody());
+        assertEquals("Hello World", derived.getAndClearBody(), "Derived class should have been invoked");
         assertEquals("Hello World", out.toString());
 
         out = template.requestBody("direct:other", new MyMessage("Hello World"));
-        assertEquals("Derived class should NOT have been invoked", null, derived.getAndClearBody());
+        assertEquals(null, derived.getAndClearBody(), "Derived class should NOT have been invoked");
         assertEquals("Bye World", out.toString());
 
         out = template.requestBody("direct:other", new MyMessage("Hello Again"));
-        assertEquals("Derived class should NOT have been invoked", null, derived.getAndClearBody());
+        assertEquals(null, derived.getAndClearBody(), "Derived class should NOT have been invoked");
         assertEquals("Bye World", out.toString());
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanThisAdviceWithIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanThisAdviceWithIssueTest.java
index f752a01..9018ddd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanThisAdviceWithIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanThisAdviceWithIssueTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.AdviceWithRouteBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.reifier.RouteReifier;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeanThisAdviceWithIssueTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java
index bccac45..9a0f743 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.util.StopWatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/DefaultMethodCalledFromSimpleExpressionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/DefaultMethodCalledFromSimpleExpressionTest.java
index c7fe7f5..67fa892 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/DefaultMethodCalledFromSimpleExpressionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/DefaultMethodCalledFromSimpleExpressionTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.issues;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DefaultMethodCalledFromSimpleExpressionTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanLanguageNonRegistryTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanLanguageNonRegistryTest.java
index 28ed85b..aed90c4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanLanguageNonRegistryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanLanguageNonRegistryTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.issues;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FilterBeanLanguageNonRegistryTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanNonRegistryTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanNonRegistryTest.java
index 4a616ab..9127fa0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanNonRegistryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanNonRegistryTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.issues;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FilterBeanNonRegistryTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanRegistryTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanRegistryTest.java
index 5b62331..d7605b0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanRegistryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterBeanRegistryTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean.issues;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FilterBeanRegistryTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterPojoIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterPojoIssueTest.java
index 400c326..01fc97f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterPojoIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/FilterPojoIssueTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.issues;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FilterPojoIssueTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/TransformerIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/TransformerIssueTest.java
index 865b413..b02744d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/TransformerIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/TransformerIssueTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.issues;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TransformerIssueTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
index e530386..c65aa38 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
@@ -24,7 +24,9 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.bean.PojoProxyHelper;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PojoProxyHelperOneWayTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java
index 291f559..d85be1d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.bean.PojoProxyHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PojoProxyHelperRequestReplyTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseEndpointTest.java
index 4681474..8b43545 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseEndpointTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.browse;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BrowseEndpointTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteConsumeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteConsumeTest.java
index 36f0a54..2dc1fc9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteConsumeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteConsumeTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.BrowsableEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BrowseRouteConsumeTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteTest.java
index cfb3953..3a8140a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.BrowsableEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BrowseRouteTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java
index 886617d..acac0a2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java
@@ -23,10 +23,12 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class BrowseTest extends ContextTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(BrowseTest.class);
 
@@ -39,13 +41,13 @@ public class BrowseTest extends ContextTestSupport {
         template.sendBody("browse:foo", body2);
 
         Collection<Endpoint> list = context.getEndpoints();
-        assertEquals("number of endpoints", 2, list.size());
+        assertEquals(2, list.size(), "number of endpoints");
 
         for (Endpoint endpoint : list) {
             List<Exchange> exchanges = ((BrowseEndpoint)endpoint).getExchanges();
             LOG.debug(">>>> {} has: {}", endpoint, exchanges);
 
-            assertEquals("Exchanges received on " + endpoint, 2, exchanges.size());
+            assertEquals(2, exchanges.size(), "Exchanges received on " + endpoint);
             assertInMessageBodyEquals(exchanges.get(0), body1);
             assertInMessageBodyEquals(exchanges.get(1), body2);
         }
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusLanguageSimpleStartRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusLanguageSimpleStartRouteTest.java
index 8f8a81a..78e4f79 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusLanguageSimpleStartRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusLanguageSimpleStartRouteTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.controlbus;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusRestartRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusRestartRouteTest.java
index b18702f..f6b179e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusRestartRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusRestartRouteTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Route;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.support.RoutePolicySupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ControlBusRestartRouteTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusStartRouteAsyncTest.java b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusStartRouteAsyncTest.java
index 66d4739..2ac1ba8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusStartRouteAsyncTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusStartRouteAsyncTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.controlbus;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  *
@@ -40,7 +43,7 @@ public class ControlBusStartRouteAsyncTest extends ContextTestSupport {
 
         // get status using async, but we cannot get result as we run task async
         String status = template.requestBody("controlbus:route?routeId=foo&action=status&async=true", null, String.class);
-        assertNull("Cannot get result if async", status);
+        assertNull(status, "Cannot get result if async");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusStartRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusStartRouteTest.java
index 7f22d6e..92b3a19 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusStartRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusStartRouteTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
index df461e3..b477ed7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
@@ -22,10 +22,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-@Ignore("Manual test")
+@Disabled("Manual test")
 public class BigDataSetTest extends ContextTestSupport {
     protected SimpleDataSet dataSet = new SimpleDataSet(20000);
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
index 8257ba1..9a98a5e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.language.xpath.XPathBuilder;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.support.PredicateAssertHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CustomDataSetTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
index 651eae1..7bac1de 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
@@ -21,8 +21,9 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DataSetConsumerTest extends ContextTestSupport {
 
@@ -56,7 +57,7 @@ public class DataSetConsumerTest extends ContextTestSupport {
             }
         });
 
-        Assert.assertEquals("expectedMessageCount should be unset(i.e. -1) for a consumer-only endpoint", -1, getMockEndpoint(dataSetUri).getExpectedCount());
+        assertEquals(-1, getMockEndpoint(dataSetUri).getExpectedCount(), "expectedMessageCount should be unset(i.e. -1) for a consumer-only endpoint");
 
         MockEndpoint result = getMockEndpoint(resultUri);
         result.expectedMessageCount((int)dataSet.getSize());
@@ -80,8 +81,7 @@ public class DataSetConsumerTest extends ContextTestSupport {
             }
         });
 
-        Assert.assertEquals("expectedMessageCount should be the same as the DataSet size for a consumer-producer endpoint", dataSet.getSize(),
-                            getMockEndpoint(dataSetUri).getExpectedCount());
+        assertEquals(dataSet.getSize(), getMockEndpoint(dataSetUri).getExpectedCount(), "expectedMessageCount should be the same as the DataSet size for a consumer-producer endpoint");
 
         MockEndpoint result = getMockEndpoint(resultUri);
         result.expectedMessageCount((int)dataSet.getSize());
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java
index a5a5434..9fbc14a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java
@@ -22,8 +22,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class DataSetEndpointTest extends ContextTestSupport {
 
@@ -38,9 +39,9 @@ public class DataSetEndpointTest extends ContextTestSupport {
         endpoint.setCamelContext(context);
         endpoint.setInitialDelay(0);
 
-        Assert.assertEquals(0, endpoint.getPreloadSize());
-        Assert.assertEquals(0, endpoint.getConsumeDelay());
-        Assert.assertEquals(3, endpoint.getProduceDelay());
+        assertEquals(0, endpoint.getPreloadSize());
+        assertEquals(0, endpoint.getConsumeDelay());
+        assertEquals(3, endpoint.getProduceDelay());
 
         context.addRoutes(new RouteBuilder() {
             @Override
@@ -59,11 +60,11 @@ public class DataSetEndpointTest extends ContextTestSupport {
         final DataSetEndpoint endpoint = new DataSetEndpoint("dataset://foo", context.getComponent("dataset"), new SimpleDataSet(2));
 
         endpoint.setConsumeDelay(2);
-        Assert.assertEquals(2, endpoint.getConsumeDelay());
+        assertEquals(2, endpoint.getConsumeDelay());
         endpoint.setProduceDelay(5);
-        Assert.assertEquals(5, endpoint.getProduceDelay());
+        assertEquals(5, endpoint.getProduceDelay());
         endpoint.setInitialDelay(1);
-        Assert.assertEquals(1, endpoint.getInitialDelay());
+        assertEquals(1, endpoint.getInitialDelay());
 
         context.addRoutes(new RouteBuilder() {
             @Override
@@ -99,7 +100,7 @@ public class DataSetEndpointTest extends ContextTestSupport {
         context.start();
 
         endpoint.assertIsSatisfied();
-        Assert.assertTrue(reported.get());
+        assertTrue(reported.get());
     }
 
     @Test
@@ -107,7 +108,7 @@ public class DataSetEndpointTest extends ContextTestSupport {
         SimpleDataSet ds = new SimpleDataSet();
         ds.setSize(2);
         ds.setDefaultBody("Hi");
-        Assert.assertEquals("Hi", ds.getDefaultBody());
+        assertEquals("Hi", ds.getDefaultBody());
     }
 
     @Test
@@ -121,7 +122,7 @@ public class DataSetEndpointTest extends ContextTestSupport {
                 exchange.getIn().setBody(body);
             }
         });
-        Assert.assertNotNull(ds.getOutputTransformer());
+        assertNotNull(ds.getOutputTransformer());
 
         final DataSetEndpoint endpoint = new DataSetEndpoint("dataset://foo", context.getComponent("dataset"), ds);
         endpoint.setInitialDelay(0);
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
index 6377912..c614efb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
@@ -20,8 +20,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DataSetPreloadTest extends ContextTestSupport {
 
@@ -46,11 +47,11 @@ public class DataSetPreloadTest extends ContextTestSupport {
         assertMockEndpointsSatisfied();
 
         DataSetEndpoint ds = context.getEndpoint(uri, DataSetEndpoint.class);
-        Assert.assertEquals(5, ds.getPreloadSize());
+        assertEquals(5, ds.getPreloadSize());
 
         // test getter/setter
         ds.setPreloadSize(7);
-        Assert.assertEquals(7, ds.getPreloadSize());
+        assertEquals(7, ds.getPreloadSize());
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
index 120adcc..9f2895d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
@@ -21,8 +21,9 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class DataSetProducerTest extends ContextTestSupport {
 
@@ -182,7 +183,7 @@ public class DataSetProducerTest extends ContextTestSupport {
             }
         }
 
-        Assert.fail("AssertionError should have been generated");
+        fail("AssertionError should have been generated");
     }
 
     @Test
@@ -323,7 +324,7 @@ public class DataSetProducerTest extends ContextTestSupport {
             }
         }
 
-        Assert.fail("AssertionError should have been generated");
+        fail("AssertionError should have been generated");
     }
 
     @Test
@@ -392,7 +393,7 @@ public class DataSetProducerTest extends ContextTestSupport {
             }
         }
 
-        Assert.fail("AssertionError should have been generated");
+        fail("AssertionError should have been generated");
     }
 
     @Test
@@ -435,6 +436,6 @@ public class DataSetProducerTest extends ContextTestSupport {
             }
         }
 
-        Assert.fail("AssertionError should have been generated");
+        fail("AssertionError should have been generated");
     }
 }
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
index dd645d2..0466783 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test to demonstrate high concurrency with seda. Offspring by CAMEL-605.
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
index c189c55..b8e3649 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.dataset;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DataSetTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestAnyOrderTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestAnyOrderTest.java
index e24f675..3f65bc5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestAnyOrderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestAnyOrderTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.dataset;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DataSetTestAnyOrderTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
index e2a8d35..bd09c43 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.support.DefaultEndpoint;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DataSetTestEndpointTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileSplitTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileSplitTest.java
index 7737518..128b8ca 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileSplitTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileSplitTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.dataset;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class DataSetTestFileSplitTest extends ContextTestSupport {
 
@@ -30,13 +30,13 @@ public class DataSetTestFileSplitTest extends ContextTestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/testme");
         super.setUp();
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void testFile() throws Exception {
         template.sendBody("file:target/data/testme", "Hello World\nBye World\nHi World");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileTest.java
index 1afb0b6..d0b5a15 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.dataset;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class DataSetTestFileTest extends ContextTestSupport {
 
@@ -30,13 +30,13 @@ public class DataSetTestFileTest extends ContextTestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/testme");
         super.setUp();
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void testFile() throws Exception {
         template.sendBody("file:target/data/testme", "Hello World");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestSedaTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestSedaTest.java
index 21c1825..ec6fce5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestSedaTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestSedaTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.dataset;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DataSetTestSedaTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
index 093f525..e23a6c6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
@@ -20,9 +20,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileDataSetConsumerTest extends ContextTestSupport {
 
@@ -59,10 +60,10 @@ public class FileDataSetConsumerTest extends ContextTestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         dataSet = new FileDataSet(testDataFileName);
-        Assert.assertEquals("Unexpected DataSet size", 1, dataSet.getSize());
+        assertEquals(1, dataSet.getSize(), "Unexpected DataSet size");
         super.setUp();
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
index 0b786ab..ceafa9b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
@@ -20,9 +20,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileDataSetConsumerWithSplitTest extends ContextTestSupport {
 
@@ -60,10 +61,10 @@ public class FileDataSetConsumerWithSplitTest extends ContextTestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         dataSet = new FileDataSet(testDataFileName, "\n");
-        Assert.assertEquals("Unexpected DataSet size", testDataFileRecordCount, dataSet.getSize());
+        assertEquals(testDataFileRecordCount, dataSet.getSize(), "Unexpected DataSet size");
         super.setUp();
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
index 7ada9ae..2380438 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
@@ -20,22 +20,23 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileDataSetProducerTest extends ContextTestSupport {
 
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
+    @TempDir
+    public Path tempFolder;
 
     protected FileDataSet dataSet;
 
@@ -74,19 +75,19 @@ public class FileDataSetProducerTest extends ContextTestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         File fileDataset = createFileDatasetWithSystemEndOfLine();
         dataSet = new FileDataSet(fileDataset);
-        Assert.assertEquals("Unexpected DataSet size", 1, dataSet.getSize());
+        assertEquals(1, dataSet.getSize(), "Unexpected DataSet size");
         super.setUp();
     }
 
     private File createFileDatasetWithSystemEndOfLine() throws IOException {
-        tempFolder.create();
-        File fileDataset = tempFolder.newFile("file-dataset-test.txt");
-        Files.copy(new ByteArrayInputStream(testPayload.getBytes()), fileDataset.toPath(), StandardCopyOption.REPLACE_EXISTING);
-        return fileDataset;
+        Files.createDirectories(tempFolder);
+        Path fileDataset = tempFolder.resolve("file-dataset-test.txt");
+        Files.copy(new ByteArrayInputStream(testPayload.getBytes()), fileDataset, StandardCopyOption.REPLACE_EXISTING);
+        return fileDataset.toFile();
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
index 915ec1f..eafab64 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
@@ -20,22 +20,23 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileDataSetProducerWithSplitTest extends ContextTestSupport {
 
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
+    @TempDir
+    public Path tempFolder;
 
     protected FileDataSet dataSet;
 
@@ -76,20 +77,20 @@ public class FileDataSetProducerWithSplitTest extends ContextTestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         File fileDataset = createFileDatasetWithSystemEndOfLine();
         dataSet = new FileDataSet(fileDataset, LS);
-        Assert.assertEquals("Unexpected DataSet size", testDataFileRecordCount, dataSet.getSize());
+        assertEquals(testDataFileRecordCount, dataSet.getSize(), "Unexpected DataSet size");
         super.setUp();
     }
 
     private File createFileDatasetWithSystemEndOfLine() throws IOException {
-        tempFolder.create();
-        File fileDataset = tempFolder.newFile("file-dataset-test.txt");
+        Files.createDirectories(tempFolder);
+        Path fileDataset = tempFolder.resolve("file-dataset-test.txt");
         ByteArrayInputStream content = new ByteArrayInputStream(String.format("Line 1%nLine 2%nLine 3%nLine 4%nLine 5%nLine 6%nLine 7%nLine 8%nLine 9%nLine 10%n").getBytes());
-        Files.copy(content, fileDataset.toPath(), StandardCopyOption.REPLACE_EXISTING);
-        return fileDataset;
+        Files.copy(content, fileDataset, StandardCopyOption.REPLACE_EXISTING);
+        return fileDataset.toFile();
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
index 2b57272..3192b2a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
@@ -23,8 +23,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ListDataSetConsumerTest extends ContextTestSupport {
 
@@ -59,7 +59,7 @@ public class ListDataSetConsumerTest extends ContextTestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         List<Object> bodies = new LinkedList<>();
         bodies.add("<hello>world!</hello>");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
index 3e05055..850cbe4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
@@ -23,8 +23,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ListDataSetProducerTest extends ContextTestSupport {
 
@@ -62,7 +62,7 @@ public class ListDataSetProducerTest extends ContextTestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         List<Object> bodies = new LinkedList<>();
         bodies.add("<hello>world!</hello>");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
index cf888c5..1cee1b3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.util.StopWatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * A route for simple performance testing that can be used when we suspect
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectEndpointRouteInlinedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectEndpointRouteInlinedTest.java
index ac3f8b2..baf194d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectEndpointRouteInlinedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectEndpointRouteInlinedTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.direct;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToStartRouteException;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class DirectEndpointRouteInlinedTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectEndpointTest.java
index 1975413..6020ca0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectEndpointTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.direct;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DirectEndpointTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoConsumerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoConsumerTest.java
index 3f9ab32..61e9ba0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoConsumerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoConsumerTest.java
@@ -21,7 +21,9 @@ import java.util.concurrent.TimeUnit;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class DirectNoConsumerTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoMultipleConsumersTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoMultipleConsumersTest.java
index 5368994..6717e58 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoMultipleConsumersTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoMultipleConsumersTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.TestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * MultipleConsumers option test.
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
index 76dfcaf..d0cf955 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Simple unit test based on user forum question.
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectProducerBlockingTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectProducerBlockingTest.java
index 87adb62..2a9fb5c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectProducerBlockingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectProducerBlockingTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.util.StopWatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class DirectProducerBlockingTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectQueueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectQueueTest.java
index 34b589b..84f830c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectQueueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectQueueTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.direct;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DirectQueueTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java
index beb5b31..f888376 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java
@@ -25,10 +25,11 @@ import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class DirectRouteTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DirectRouteTest {
 
     @Test
     public void testSedaQueue() throws Exception {
@@ -59,7 +60,7 @@ public class DirectRouteTest extends Assert {
         producer.process(exchange);
 
         // now lets sleep for a while
-        assertTrue("Did not receive the message!", invoked.get());
+        assertTrue(invoked.get(), "Did not receive the message!");
 
         container.stop();
     }
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectShouldUseSameThreadTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectShouldUseSameThreadTest.java
index 285b924..59d8383 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectShouldUseSameThreadTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectShouldUseSameThreadTest.java
@@ -21,7 +21,9 @@ 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.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Unit test to verify continuing using same thread on the consumer side.
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/SendToNonExistingDirectEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/SendToNonExistingDirectEndpointTest.java
index 92e4eb9..e3a6db7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/SendToNonExistingDirectEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/SendToNonExistingDirectEndpointTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.direct;
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class SendToNonExistingDirectEndpointTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/SendingToAlotOfDifferentDirectEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/SendingToAlotOfDifferentDirectEndpointTest.java
index 1981134..61bbeb7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/SendingToAlotOfDifferentDirectEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/SendingToAlotOfDifferentDirectEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.direct;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SendingToAlotOfDifferentDirectEndpointTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/TwoCamelContextDirectEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/TwoCamelContextDirectEndpointTest.java
index e067443..f0a66d8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/TwoCamelContextDirectEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/TwoCamelContextDirectEndpointTest.java
@@ -20,16 +20,17 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-public class TwoCamelContextDirectEndpointTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+public class TwoCamelContextDirectEndpointTest {
     private DefaultCamelContext camel1;
     private DefaultCamelContext camel2;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
 
         camel1 = new DefaultCamelContext();
@@ -53,7 +54,7 @@ public class TwoCamelContextDirectEndpointTest extends Assert {
         camel2.start();
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         camel1.stop();
         camel2.stop();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/AbstractDirectVmTestSupport.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/AbstractDirectVmTestSupport.java
index ac87c7b..ffd3b4d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/AbstractDirectVmTestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/AbstractDirectVmTestSupport.java
@@ -21,8 +21,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  *
@@ -32,7 +32,7 @@ public abstract class AbstractDirectVmTestSupport extends ContextTestSupport {
     protected ProducerTemplate template2;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
 
@@ -55,7 +55,7 @@ public abstract class AbstractDirectVmTestSupport extends ContextTestSupport {
     }
 
     @Override
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         template2.stop();
         context2.stop();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmConsumerExpressionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmConsumerExpressionTest.java
index a50d696..44c149f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmConsumerExpressionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmConsumerExpressionTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -35,7 +35,7 @@ public class DirectVmConsumerExpressionTest extends ContextTestSupport {
     private CamelContext context4;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
 
@@ -59,7 +59,7 @@ public class DirectVmConsumerExpressionTest extends ContextTestSupport {
     }
 
     @Override
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         context2.stop();
         context3.stop();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmHeaderFilterStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmHeaderFilterStrategyTest.java
index fc4aa6f..7addec2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmHeaderFilterStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmHeaderFilterStrategyTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.HeaderFilterStrategy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoConsumerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoConsumerTest.java
index 2dae41b..e38d943 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoConsumerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoConsumerTest.java
@@ -21,7 +21,9 @@ import java.util.concurrent.TimeUnit;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class DirectVmNoConsumerTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoPropertyPropagationComponentTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoPropertyPropagationComponentTest.java
index 8832a3a..8a2451f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoPropertyPropagationComponentTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoPropertyPropagationComponentTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.directvm;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoPropertyPropagationTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoPropertyPropagationTest.java
index 6a755cb..b511297 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoPropertyPropagationTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmNoPropertyPropagationTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.directvm;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmProducerBlockingTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmProducerBlockingTest.java
index 65aa249..afe5482 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmProducerBlockingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmProducerBlockingTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.util.StopWatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class DirectVmProducerBlockingTest extends ContextTestSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmShouldUseSameThreadTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmShouldUseSameThreadTest.java
index 5d12dc2..4a5f2b5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmShouldUseSameThreadTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmShouldUseSameThreadTest.java
@@ -21,7 +21,9 @@ 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.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextAdviceWithTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextAdviceWithTest.java
index fd89764..7cc89ba 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextAdviceWithTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextAdviceWithTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.builder.AdviceWithRouteBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.reifier.RouteReifier;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextDuplicateConsumerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextDuplicateConsumerTest.java
index 2037d6b..00fbd5a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextDuplicateConsumerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextDuplicateConsumerTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextTest.java
index c484865..4fb7f3b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmTwoCamelContextTest.java
@@ -17,7 +17,9 @@
 package org.apache.camel.component.directvm;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/extension/verifier/ComponentVerifierTest.java b/core/camel-core/src/test/java/org/apache/camel/component/extension/verifier/ComponentVerifierTest.java
index 5fe4713..89539c0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/extension/verifier/ComponentVerifierTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/extension/verifier/ComponentVerifierTest.java
@@ -18,22 +18,23 @@ package org.apache.camel.component.extension.verifier;
 
 import org.apache.camel.component.extension.ComponentVerifierExtension;
 import org.apache.camel.component.extension.ComponentVerifierExtension.VerificationError;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ComponentVerifierTest extends Assert {
+import static org.junit.jupiter.api.Assertions.*;
+
+public class ComponentVerifierTest {
 
     @Test
     public void testGetErrorDetails() {
         VerificationError error = ResultErrorBuilder.withCodeAndDescription(VerificationError.asCode("test_code"), "test error desc")
             .detail(VerificationError.asAttribute("test_attr_1"), "test_detail_1").detail(VerificationError.HttpAttribute.HTTP_CODE, "test_detail_2").build();
 
-        Assert.assertEquals("test_detail_1", error.getDetail(VerificationError.asAttribute("test_attr_1")));
-        Assert.assertEquals("test_detail_1", error.getDetail("test_attr_1"));
-        Assert.assertEquals("test_detail_2", error.getDetail(VerificationError.HttpAttribute.HTTP_CODE));
-        Assert.assertNull(error.getDetail(VerificationError.HttpAttribute.HTTP_TEXT));
+        assertEquals("test_detail_1", error.getDetail(VerificationError.asAttribute("test_attr_1")));
+        assertEquals("test_detail_1", error.getDetail("test_attr_1"));
+        assertEquals("test_detail_2", error.getDetail(VerificationError.HttpAttribute.HTTP_CODE));
+        assertNull(error.getDetail(VerificationError.HttpAttribute.HTTP_TEXT));
 
-        Assert.assertNull(error.getDetail(VerificationError.asAttribute("test_attr_non_existant")));
+        assertNull(error.getDetail(VerificationError.asAttribute("test_attr_non_existant")));
     }
 
     @Test
@@ -42,7 +43,7 @@ public class ComponentVerifierTest extends Assert {
             VerificationError.asCode(null);
             fail("Code must not be null");
         } catch (IllegalArgumentException exp) {
-            Assert.assertTrue(exp.getMessage().contains("null"));
+            assertTrue(exp.getMessage().contains("null"));
         }
     }
 
@@ -52,13 +53,13 @@ public class ComponentVerifierTest extends Assert {
             VerificationError.asAttribute(null);
             fail("Attribute must not be null");
         } catch (IllegalArgumentException exp) {
-            Assert.assertTrue(exp.getMessage().contains("null"));
+            assertTrue(exp.getMessage().contains("null"));
         }
     }
 
     @Test
     public void testScopeFromString() {
-        Assert.assertEquals(ComponentVerifierExtension.Scope.PARAMETERS, ComponentVerifierExtension.Scope.fromString("PaRaMeTeRS"));
+        assertEquals(ComponentVerifierExtension.Scope.PARAMETERS, ComponentVerifierExtension.Scope.fromString("PaRaMeTeRS"));
 
         try {
             ComponentVerifierExtension.Scope.fromString("unknown");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java
index ee094f5..854735f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java
@@ -23,8 +23,8 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link AntPathMatcherGenericFileFilter}.
@@ -32,7 +32,7 @@ import org.junit.Test;
 public class AntPathMatcherGenericFileFilterTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/files");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/BeanToFileTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/BeanToFileTest.java
index e4de993..332e65a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/BeanToFileTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/BeanToFileTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test that we can chain bean and file producer.
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/ConsumerTemplateFileShutdownTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/ConsumerTemplateFileShutdownTest.java
index 9ec0fe0..b5c5cf3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/ConsumerTemplateFileShutdownTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/ConsumerTemplateFileShutdownTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.file;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  *
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java
index 4587806..a607011 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class DirectoryCreateIssueTest extends ContextTestSupport {
 
@@ -33,7 +35,7 @@ public class DirectoryCreateIssueTest extends ContextTestSupport {
     private final String path = "target/data/a/b/c/d/e/f/g/h";
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/a");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileAbsoluteAndRelativeConsumerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileAbsoluteAndRelativeConsumerTest.java
index f3807e4..a822f39 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileAbsoluteAndRelativeConsumerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileAbsoluteAndRelativeConsumerTest.java
@@ -22,15 +22,15 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileAbsoluteAndRelativeConsumerTest extends ContextTestSupport {
 
     private String base;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/filerelative");
         deleteDirectory("target/data/fileabsolute");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileAbsolutePathIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileAbsolutePathIssueTest.java
index 9490ec3..21a8834 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileAbsolutePathIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileAbsolutePathIssueTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileAbsolutePathIssueTest extends ContextTestSupport {
 
@@ -32,7 +32,7 @@ public class FileAbsolutePathIssueTest extends ContextTestSupport {
     private String done;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/issue");
         deleteDirectory("target/data/done");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileBatchConsumerMemoryLeakTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileBatchConsumerMemoryLeakTest.java
index beb1f2e..51dba3a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileBatchConsumerMemoryLeakTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileBatchConsumerMemoryLeakTest.java
@@ -20,20 +20,20 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test to test CAMEL-1652
  */
-@Ignore("Manual test")
+@Disabled("Manual test")
 public class FileBatchConsumerMemoryLeakTest extends ContextTestSupport {
 
     private String fileUrl = "target/data/filesorter/";
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/filesorter");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
index d021932..c92cc68 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
@@ -23,15 +23,17 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileBeginFailureOneTimeTest extends ContextTestSupport {
 
     private MyStrategy myStrategy = new MyStrategy();
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/begin");
         super.setUp();
@@ -53,7 +55,7 @@ public class FileBeginFailureOneTimeTest extends ContextTestSupport {
 
         assertMockEndpointsSatisfied();
 
-        assertEquals("Begin should have been invoked 2 times", 2, myStrategy.getInvoked());
+        assertEquals(2, myStrategy.getInvoked(), "Begin should have been invoked 2 times");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileBrowsableEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileBrowsableEndpointTest.java
index 837e38f..0148c0b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileBrowsableEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileBrowsableEndpointTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.spi.BrowsableEndpoint;
 import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -32,7 +34,7 @@ import org.junit.Test;
 public class FileBrowsableEndpointTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/browse");
         super.setUp();
@@ -69,7 +71,7 @@ public class FileBrowsableEndpointTest extends ContextTestSupport {
 
         // and the file is still there
         File file = new File("target/data/browse/a.txt");
-        assertTrue("File should exist " + file, file.exists());
+        assertTrue(file.exists(), "File should exist " + file);
     }
 
     @Test
@@ -95,9 +97,9 @@ public class FileBrowsableEndpointTest extends ContextTestSupport {
 
         // and the files is still there
         File fileA = new File("target/data/browse/a.txt");
-        assertTrue("File should exist " + fileA, fileA.exists());
+        assertTrue(fileA.exists(), "File should exist " + fileA);
         File fileB = new File("target/data/browse/b.txt");
-        assertTrue("File should exist " + fileB, fileB.exists());
+        assertTrue(fileB.exists(), "File should exist " + fileB);
     }
 
     @Test
@@ -125,10 +127,10 @@ public class FileBrowsableEndpointTest extends ContextTestSupport {
 
         // and the files is still there
         File fileA = new File("target/data/browse/a.txt");
-        assertTrue("File should exist " + fileA, fileA.exists());
+        assertTrue(fileA.exists(), "File should exist " + fileA);
         File fileB = new File("target/data/browse/foo/b.txt");
-        assertTrue("File should exist " + fileB, fileB.exists());
+        assertTrue(fileB.exists(), "File should exist " + fileB);
         File fileC = new File("target/data/browse/bar/c.txt");
-        assertTrue("File should exist " + fileC, fileC.exists());
+        assertTrue(fileC.exists(), "File should exist " + fileC);
     }
 }
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java
index bf3ac76..7482e4f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java
@@ -25,15 +25,18 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class FileConcurrentWriteAppendSameFileTest extends ContextTestSupport {
 
     private final int size = 100;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/concurrent");
         super.setUp();
@@ -67,11 +70,11 @@ public class FileConcurrentWriteAppendSameFileTest extends ContextTestSupport {
         assertNotNull(txt);
 
         String[] lines = txt.split(LS);
-        assertEquals("Should be " + size + " lines", size, lines.length);
+        assertEquals(size, lines.length, "Should be " + size + " lines");
 
         // should be unique
         Set<String> rows = new LinkedHashSet<>(Arrays.asList(lines));
-        assertEquals("Should be " + size + " unique lines", size, rows.size());
+        assertEquals(size, rows.size(), "Should be " + size + " unique lines");
 
         log.info(txt);
     }
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java
index bd48ffc..33723f6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.ResolveEndpointFailedException;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class FileConfigureTest extends ContextTestSupport {
     private static final String EXPECT_PATH = "target" + File.separator + "data" + File.separator + "foo" + File.separator + "bar";
@@ -55,39 +57,40 @@ public class FileConfigureTest extends ContextTestSupport {
     public void testUriWithParameters() throws Exception {
         FileEndpoint endpoint = resolveMandatoryEndpoint("file:///C:/camel/temp?delay=10&useFixedDelay=true&initialDelay=10&bridgeErrorHandler=true"
                                                          + "&autoCreate=false&startingDirectoryMustExist=true&directoryMustExist=true&readLock=changed", FileEndpoint.class);
-        assertNotNull("Could not find file endpoint", endpoint);
-        assertEquals("Get a wrong option of StartingDirectoryMustExist", true, endpoint.isStartingDirectoryMustExist());
+        assertNotNull(endpoint, "Could not find file endpoint");
+        assertEquals(true, endpoint.isStartingDirectoryMustExist(), "Get a wrong option of StartingDirectoryMustExist");
 
         endpoint = resolveMandatoryEndpoint("file:///C:/camel/temp?delay=10&useFixedDelay=true&initialDelay=10&startingDirectoryMustExist=true"
                                             + "&bridgeErrorHandler=true&autoCreate=false&directoryMustExist=true&readLock=changed", FileEndpoint.class);
 
-        assertNotNull("Could not find file endpoint", endpoint);
-        assertEquals("Get a wrong option of StartingDirectoryMustExist", true, endpoint.isStartingDirectoryMustExist());
+        assertNotNull(endpoint, "Could not find file endpoint");
+        assertEquals(true, endpoint.isStartingDirectoryMustExist(), "Get a wrong option of StartingDirectoryMustExist");
 
         endpoint = resolveMandatoryEndpoint("file:///C:/camel/temp?delay=10&startingDirectoryMustExist=true&useFixedDelay=true&initialDelay=10"
                                             + "&bridgeErrorHandler=true&autoCreate=false&directoryMustExist=true&readLock=changed", FileEndpoint.class);
 
-        assertNotNull("Could not find file endpoint", endpoint);
-        assertEquals("Get a wrong option of StartingDirectoryMustExist", true, endpoint.isStartingDirectoryMustExist());
+        assertNotNull(endpoint, "Could not find file endpoint");
+        assertEquals(true, endpoint.isStartingDirectoryMustExist(), "Get a wrong option of StartingDirectoryMustExist");
 
         endpoint = resolveMandatoryEndpoint("file:///C:/camel/temp?delay=10&useFixedDelay=true&initialDelay=10", FileEndpoint.class);
 
-        assertNotNull("Could not find file endpoint", endpoint);
-        assertEquals("Get a wrong option of StartingDirectoryMustExist", false, endpoint.isStartingDirectoryMustExist());
+        assertNotNull(endpoint, "Could not find file endpoint");
+        assertEquals(false, endpoint.isStartingDirectoryMustExist(), "Get a wrong option of StartingDirectoryMustExist");
     }
 
     @Test
     public void testUriWithCharset() throws Exception {
         FileEndpoint endpoint = resolveMandatoryEndpoint("file://target/data/foo/bar?charset=UTF-8", FileEndpoint.class);
-        assertNotNull("Could not find endpoint: file://target/data/foo/bar?charset=UTF-8", endpoint);
-        assertEquals("Get a wrong charset", "UTF-8", endpoint.getCharset());
+        assertNotNull(endpoint, "Could not find endpoint: file://target/data/foo/bar?charset=UTF-8");
+        assertEquals("UTF-8", endpoint.getCharset(), "Get a wrong charset");
 
         try {
             resolveMandatoryEndpoint("file://target/data/foo/bar?charset=ASSI", FileEndpoint.class);
             // The charset is wrong
             fail("Expect a configure exception here");
         } catch (Exception ex) {
-            assertTrue("Get the wrong exception type here", ex instanceof ResolveEndpointFailedException);
+            boolean b = ex instanceof ResolveEndpointFailedException;
+            assertTrue(b, "Get the wrong exception type here");
         }
     }
 
@@ -99,12 +102,13 @@ public class FileConfigureTest extends ContextTestSupport {
             createFileConsumer("file://target/data/foo/bar?recursiv=true");
             fail("Expect a configure exception here");
         } catch (Exception ex) {
-            assertTrue("Get the wrong exception type here", ex instanceof ResolveEndpointFailedException);
+            boolean b = ex instanceof ResolveEndpointFailedException;
+            assertTrue(b, "Get the wrong exception type here");
         }
     }
 
     @Override
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         super.tearDown();
         // one of the above tests created a /target folder in the root we want
@@ -119,7 +123,7 @@ public class FileConfigureTest extends ContextTestSupport {
 
     private void assertFileEndpoint(String endpointUri, String expectedPath, boolean absolute) throws IOException {
         FileEndpoint endpoint = resolveMandatoryEndpoint(endpointUri, FileEndpoint.class);
-        assertNotNull("Could not find endpoint: " + endpointUri, endpoint);
+        assertNotNull(endpoint, "Could not find endpoint: " + endpointUri);
 
         if (!absolute) {
             File file = endpoint.getFile();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAlterFileNameHeaderIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAlterFileNameHeaderIssueTest.java
index 0aafd19..d60b3c0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAlterFileNameHeaderIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAlterFileNameHeaderIssueTest.java
@@ -22,8 +22,11 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
@@ -31,7 +34,7 @@ import org.junit.Test;
 public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/files");
         super.setUp();
@@ -62,12 +65,12 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
         assertMockEndpointsSatisfied();
         oneExchangeDone.matchesMockWaitTime();
 
-        assertFalse("Headers should have been removed", mock.getExchanges().get(0).getIn().hasHeaders());
+        assertFalse(mock.getExchanges().get(0).getIn().hasHeaders(), "Headers should have been removed");
 
         // the original file should have been deleted, as the file consumer
         // should be resilient against
         // end users deleting headers
-        assertFalse("File should been deleted", new File("target/data/files/hello.txt").exists());
+        assertFalse(new File("target/data/files/hello.txt").exists(), "File should been deleted");
     }
 
     @Test
@@ -94,7 +97,7 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
         // the original file should have been deleted, as the file consumer
         // should be resilient against
         // end users changing headers
-        assertFalse("File should been deleted", new File("target/data/files/hello.txt").exists());
+        assertFalse(new File("target/data/files/hello.txt").exists(), "File should been deleted");
     }
 
     @Test
@@ -117,12 +120,12 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
         assertMockEndpointsSatisfied();
         oneExchangeDone.matchesMockWaitTime();
 
-        assertFalse("Headers should have been removed", mock.getExchanges().get(0).getIn().hasHeaders());
+        assertFalse(mock.getExchanges().get(0).getIn().hasHeaders(), "Headers should have been removed");
 
         // the original file should have been moved, as the file consumer should
         // be resilient against
         // end users deleting headers
-        assertTrue("File should been moved", new File("target/data/files/.camel/hello.txt").exists());
+        assertTrue(new File("target/data/files/.camel/hello.txt").exists(), "File should been moved");
     }
 
     @Test
@@ -149,7 +152,7 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
         // the original file should have been moved, as the file consumer should
         // be resilient against
         // end users changing headers
-        assertTrue("File should been moved", new File("target/data/files/.camel/hello.txt").exists());
+        assertTrue(new File("target/data/files/.camel/hello.txt").exists(), "File should been moved");
     }
 
 }
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeBackoffMultiplierTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeBackoffMultiplierTest.java
index c2c7421..d0ad04a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeBackoffMultiplierTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeBackoffMultiplierTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -29,7 +29,7 @@ import org.junit.Test;
 public class FileConsumeBackoffMultiplierTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/files");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeCharsetTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeCharsetTest.java
index 1fa1f52..6cc1562 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeCharsetTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeCharsetTest.java
@@ -22,8 +22,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  *
@@ -31,7 +33,7 @@ import org.junit.Test;
 public class FileConsumeCharsetTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/files");
         super.setUp();
@@ -48,7 +50,7 @@ public class FileConsumeCharsetTest extends ContextTestSupport {
         oneExchangeDone.matchesMockWaitTime();
 
         // file should not exists
-        assertFalse("File should been deleted", new File("target/data/files/report.txt").exists());
+        assertFalse(new File("target/data/files/report.txt").exists(), "File should been deleted");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
index 95c7ef8..1e9c5c9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
@@ -22,8 +22,11 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.NotifyBuilder;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * CAMEL-5848
@@ -31,7 +34,7 @@ import org.junit.Test;
 public class FileConsumeDoneFileIssueTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/done");
 
@@ -49,7 +52,7 @@ public class FileConsumeDoneFileIssueTest extends ContextTestSupport {
         template.sendBodyAndHeader("file:target/data/done", "E", Exchange.FILE_NAME, "foo-e.txt");
         template.sendBodyAndHeader("file:target/data/done", "E", Exchange.FILE_NAME, "foo.done");
 
-        assertTrue("Done file should exists", new File("target/data/done/foo.done").exists());
+        assertTrue(new File("target/data/done/foo.done").exists(), "Done file should exists");
 
         getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder("A", "B", "C", "D", "E");
 
@@ -61,7 +64,7 @@ public class FileConsumeDoneFileIssueTest extends ContextTestSupport {
         Thread.sleep(50);
 
         // the done file should be deleted
-        assertFalse("Done file should be deleted", new File("target/data/done/foo.done").exists());
+        assertFalse(new File("target/data/done/foo.done").exists(), "Done file should be deleted");
     }
 
     @Test
@@ -75,9 +78,9 @@ public class FileConsumeDoneFileIssueTest extends ContextTestSupport {
         template.sendBodyAndHeader("file:target/data/done2", "b", Exchange.FILE_NAME, "b.txt.done");
         template.sendBodyAndHeader("file:target/data/done2", "c", Exchange.FILE_NAME, "c.txt.done");
 
-        assertTrue("Done file should exists", new File("target/data/done2/a.txt.done").exists());
-        assertTrue("Done file should exists", new File("target/data/done2/b.txt.done").exists());
-        assertTrue("Done file should exists", new File("target/data/done2/c.txt.done").exists());
+        assertTrue(new File("target/data/done2/a.txt.done").exists(), "Done file should exists");
+        assertTrue(new File("target/data/done2/b.txt.done").exists(), "Done file should exists");
+        assertTrue(new File("target/data/done2/c.txt.done").exists(), "Done file should exists");
 
         getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder("A", "B", "C");
 
@@ -89,9 +92,9 @@ public class FileConsumeDoneFileIssueTest extends ContextTestSupport {
         Thread.sleep(50);
 
         // the done file should be deleted
-        assertFalse("Done file should be deleted", new File("target/data/done2/a.txt.done").exists());
-        assertFalse("Done file should be deleted", new File("target/data/done2/b.txt.done").exists());
-        assertFalse("Done file should be deleted", new File("target/data/done2/c.txt.done").exists());
+        assertFalse(new File("target/data/done2/a.txt.done").exists(), "Done file should be deleted");
+        assertFalse(new File("target/data/done2/b.txt.done").exists(), "Done file should be deleted");
+        assertFalse(new File("target/data/done2/c.txt.done").exists(), "Done file should be deleted");
 
     }
 
@@ -106,9 +109,9 @@ public class FileConsumeDoneFileIssueTest extends ContextTestSupport {
         template.sendBodyAndHeader("file:target/data/done2", "b", Exchange.FILE_NAME, "$b.txt.done");
         template.sendBodyAndHeader("file:target/data/done2", "c", Exchange.FILE_NAME, "c$.txt.done");
 
-        assertTrue("Done file should exists", new File("target/data/done2/$a$.txt.done").exists());
-        assertTrue("Done file should exists", new File("target/data/done2/$b.txt.done").exists());
-        assertTrue("Done file should exists", new File("target/data/done2/c$.txt.done").exists());
+        assertTrue(new File("target/data/done2/$a$.txt.done").exists(), "Done file should exists");
+        assertTrue(new File("target/data/done2/$b.txt.done").exists(), "Done file should exists");
+        assertTrue(new File("target/data/done2/c$.txt.done").exists(), "Done file should exists");
 
         getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder("A", "B", "C");
 
@@ -120,9 +123,9 @@ public class FileConsumeDoneFileIssueTest extends ContextTestSupport {
         Thread.sleep(50);
 
         // the done file should be deleted
-        assertFalse("Done file should be deleted", new File("target/data/done2/$a$.txt.done").exists());
-        assertFalse("Done file should be deleted", new File("target/data/done2/$b.txt.done").exists());
-        assertFalse("Done file should be deleted", new File("target/data/done2/c$.txt.done").exists());
+        assertFalse(new File("target/data/done2/$a$.txt.done").exists(), "Done file should be deleted");
+        assertFalse(new File("target/data/done2/$b.txt.done").exists(), "Done file should be deleted");
+        assertFalse(new File("target/data/done2/c$.txt.done").exists(), "Done file should be deleted");
 
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java
index 94c6cc7..4958cf2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java
@@ -23,8 +23,11 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.NotifyBuilder;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * This class tests an issue where an input file is not picked up due to a
@@ -35,7 +38,7 @@ public class FileConsumeDynamicDoneFileNameWithTwoDotsTest extends ContextTestSu
     private static final String TARGET_DIR_NAME = "target/data/" + MethodHandles.lookup().lookupClass().getSimpleName();
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory(TARGET_DIR_NAME);
         super.setUp();
@@ -52,8 +55,8 @@ public class FileConsumeDynamicDoneFileNameWithTwoDotsTest extends ContextTestSu
         assertMockEndpointsSatisfied();
         assertTrue(notify.matchesMockWaitTime());
 
-        assertFalse("Input file should be deleted", new File(TARGET_DIR_NAME, "test.twodot.txt").exists());
-        assertFalse("Done file should be deleted", new File(TARGET_DIR_NAME, "test.twodot.done").exists());
+        assertFalse(new File(TARGET_DIR_NAME, "test.twodot.txt").exists(), "Input file should be deleted");
+        assertFalse(new File(TARGET_DIR_NAME, "test.twodot.done").exists(), "Done file should be deleted");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java
index 4592d59..4a876e5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java
@@ -22,8 +22,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * Unit test for consuming the same filename only.
@@ -31,7 +33,7 @@ import org.junit.Test;
 public class FileConsumeFilesAndDeleteTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/files");
         super.setUp();
@@ -51,7 +53,7 @@ public class FileConsumeFilesAndDeleteTest extends ContextTestSupport {
         oneExchangeDone.matchesMockWaitTime();
 
         // file should not exists
-        assertFalse("File should been deleted", new File("target/data/files/report.txt").exists());
+        assertFalse(new File("target/data/files/report.txt").exists(), "File should been deleted");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java
index eb06624..fed4ec8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for max messages per poll
@@ -31,7 +31,7 @@ public class FileConsumeMaxMessagesPerPollTest extends ContextTestSupport {
     private String fileUrl = "file://target/data/poll/?initialDelay=0&delay=10&maxMessagesPerPoll=2";
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/poll");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveRelativeNameTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveRelativeNameTest.java
index 874b4d3..538b6c9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveRelativeNameTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveRelativeNameTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for consuming multiple directories.
@@ -31,7 +31,7 @@ public class FileConsumeMoveRelativeNameTest extends ContextTestSupport {
     private String fileUrl = "file://target/data/multidir/?initialDelay=0&delay=10&recursive=true&move=.done/${file:name}.old";
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/multidir");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java
index bc65429..f231f88 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java
@@ -22,8 +22,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Unit test for consuming multiple directories.
@@ -33,7 +35,7 @@ public class FileConsumeMultipleDirectoriesTest extends ContextTestSupport {
     private String fileUrl = "file://target/data/multidir/?initialDelay=0&delay=10&recursive=true&delete=true&sortBy=file:path";
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/multidir");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentDisabledTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentDisabledTest.java
index 85bb01d..aac3309 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentDisabledTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentDisabledTest.java
@@ -20,13 +20,13 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileConsumeNoopIdempotentDisabledTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/noop");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java
index ca73f93..3a2a21a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java
@@ -20,13 +20,13 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileConsumeNoopIdempotentEnabledTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/noop");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNotEagerMaxMessagesPerPollTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNotEagerMaxMessagesPerPollTest.java
index 9d5f613..2d41ec9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNotEagerMaxMessagesPerPollTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNotEagerMaxMessagesPerPollTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for max messages per poll
@@ -32,7 +32,7 @@ public class FileConsumeNotEagerMaxMessagesPerPollTest extends ContextTestSuppor
     private String fileUrl = "file://target/data/poll/?initialDelay=0&delay=10&" + "maxMessagesPerPoll=2&eagerMaxMessagesPerPoll=false&sortBy=file:name";
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/poll");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileTest.java
index 5634c60..c8c718b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileTest.java
@@ -20,13 +20,13 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileConsumePollEnrichFileTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/enrich");
         deleteDirectory("target/data/enrichdata");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileUsingProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileUsingProcessorTest.java
index 132d547..65ae8a9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileUsingProcessorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileUsingProcessorTest.java
@@ -24,13 +24,13 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.util.FileUtil;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileConsumePollEnrichFileUsingProcessorTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/enrich");
         deleteDirectory("target/data/enrichdata");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRootDirManualTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRootDirManualTest.java
index b05c6eb..8a84995 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRootDirManualTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRootDirManualTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.file;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-@Ignore("Manual test")
+@Disabled("Manual test")
 public class FileConsumeRootDirManualTest extends ContextTestSupport {
 
     @Test
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRunLoggingLevelTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRunLoggingLevelTest.java
index d929322..ca93c4f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRunLoggingLevelTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeRunLoggingLevelTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -28,7 +28,7 @@ import org.junit.Test;
 public class FileConsumeRunLoggingLevelTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/files");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java
index 5c3311f..49ccc3a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileConsumeSimpleAbsoluteMoveToAbsoluteTest extends ContextTestSupport {
 
@@ -31,7 +31,7 @@ public class FileConsumeSimpleAbsoluteMoveToAbsoluteTest extends ContextTestSupp
     private String base;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/move");
         // use current dir as base as absolute path
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToRelativeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToRelativeTest.java
index ddac352..e881075 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToRelativeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToRelativeTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileConsumeSimpleAbsoluteMoveToRelativeTest extends ContextTestSupport {
 
@@ -31,7 +31,7 @@ public class FileConsumeSimpleAbsoluteMoveToRelativeTest extends ContextTestSupp
     private String base;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/move");
         // use current dir as base as absolute path
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java
index d82c445..792b4ff 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java
@@ -23,8 +23,11 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.NotifyBuilder;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * This class tests an issue where an input file is not picked up due to a
@@ -35,7 +38,7 @@ public class FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest extends Context
     private static final String TARGET_DIR_NAME = "target/data/" + MethodHandles.lookup().lookupClass().getSimpleName();
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory(TARGET_DIR_NAME);
         super.setUp();
@@ -52,8 +55,8 @@ public class FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest extends Context
         assertMockEndpointsSatisfied();
         assertTrue(notify.matchesMockWaitTime());
 
-        assertFalse("Input file should be deleted", new File(TARGET_DIR_NAME, "test.twodot.txt").exists());
-        assertFalse("Done file should be deleted", new File(TARGET_DIR_NAME, "test.twodot.done").exists());
+        assertFalse(new File(TARGET_DIR_NAME, "test.twodot.txt").exists(), "Input file should be deleted");
+        assertFalse(new File(TARGET_DIR_NAME, "test.twodot.done").exists(), "Done file should be deleted");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java
index c201eec..aece727 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileConsumeSimpleRelativeMoveToAbsoluteTest extends ContextTestSupport {
 
@@ -31,7 +31,7 @@ public class FileConsumeSimpleRelativeMoveToAbsoluteTest extends ContextTestSupp
     private String base;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/move");
         // use current dir as base as absolute path
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToRelativeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToRelativeTest.java
index aa4b887..3825050 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToRelativeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToRelativeTest.java
@@ -20,15 +20,15 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileConsumeSimpleRelativeMoveToRelativeTest extends ContextTestSupport {
 
     private String fileUrl = "file://target/data/move";
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/move");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
index 5b44a2f..a42fab5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for consuming the single directory only.
@@ -29,7 +29,7 @@ import org.junit.Test;
 public class FileConsumeSingleDirectoryOnlyTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/singledirectoryonly");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeTemplateTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeTemplateTest.java
index 78e68c7..0cfe4dc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeTemplateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeTemplateTest.java
@@ -18,8 +18,11 @@ package org.apache.camel.component.file;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * Using ConsumerTemplate to consume a file
@@ -27,7 +30,7 @@ import org.junit.Test;
 public class FileConsumeTemplateTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/template");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeWithDollarInPathTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeWithDollarInPathTest.java
index 50ae20d..7d8e705 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeWithDollarInPathTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeWithDollarInPathTest.java
@@ -19,15 +19,15 @@ package org.apache.camel.component.file;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileConsumeWithDollarInPathTest extends ContextTestSupport {
 
     private String dir = "target/data/edi$/dev1";
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory(dir);
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathDefaultMoveTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathDefaultMoveTest.java
index 2d10aff..78aac2d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathDefaultMoveTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathDefaultMoveTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for consuming from an absolute path
@@ -33,7 +33,7 @@ public class FileConsumerAbsolutePathDefaultMoveTest extends ContextTestSupport
     private String base;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/reports");
         // use current dir as base as absolute path
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java
index 1521dc7..b72b9a3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for consuming from an absolute path
@@ -33,7 +33,7 @@ public class FileConsumerAbsolutePathTest extends ContextTestSupport {
     private String base;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/reports");
         // use current dir as base as absolute path
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java
index dc5773b..43f9dac 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for consuming from an absolute path
@@ -33,7 +33,7 @@ public class FileConsumerAbsolutePathWithAbsoluteMoveTest extends ContextTestSup
     private String base;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/reports");
         // use current dir as base as absolute path
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java
index 5eb00ca..82af06f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for consuming from an absolute path
@@ -33,7 +33,7 @@ public class FileConsumerAbsolutePathWithRelativeMoveTest extends ContextTestSup
     private String base;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/reports");
         deleteDirectory("target/data/done");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsoluteRootPathDefaultMoveTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsoluteRootPathDefaultMoveTest.java
index 25f1175..9d97df5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsoluteRootPathDefaultMoveTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsoluteRootPathDefaultMoveTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for consuming from an absolute path at root
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java
index ad7f4db..79675e6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java
@@ -24,7 +24,9 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class FileConsumerAutoCreateDirectoryTest extends ContextTestSupport {
 
@@ -44,8 +46,8 @@ public class FileConsumerAutoCreateDirectoryTest extends ContextTestSupport {
 
         // the directory should now exists
         File dir = new File("target/data/file/foo");
-        assertTrue("Directory should be created", dir.exists());
-        assertTrue("Directory should be a directory", dir.isDirectory());
+        assertTrue(dir.exists(), "Directory should be created");
+        assertTrue(dir.isDirectory(), "Directory should be a directory");
     }
 
     @Test
@@ -66,8 +68,8 @@ public class FileConsumerAutoCreateDirectoryTest extends ContextTestSupport {
 
         // the directory should now exists
         File dir = new File(base);
-        assertTrue("Directory should be created", dir.exists());
-        assertTrue("Directory should be a directory", dir.isDirectory());
+        assertTrue(dir.exists(), "Directory should be created");
+        assertTrue(dir.isDirectory(), "Directory should be a directory");
     }
 
     @Test
@@ -86,7 +88,7 @@ public class FileConsumerAutoCreateDirectoryTest extends ContextTestSupport {
 
         // the directory should NOT exists
         File dir = new File("target/data/file/foo");
-        assertFalse("Directory should NOT be created", dir.exists());
+        assertFalse(dir.exists(), "Directory should NOT be created");
     }
 
     @Test
@@ -105,8 +107,8 @@ public class FileConsumerAutoCreateDirectoryTest extends ContextTestSupport {
 
         // the directory should exist
         File dir = new File("target/data/file/foo.bar");
-        assertTrue("Directory should be created", dir.exists());
-        assertTrue("Directory should be a directory", dir.isDirectory());
+        assertTrue(dir.exists(), "Directory should be created");
+        assertTrue(dir.isDirectory(), "Directory should be a directory");
     }
 
     @Test
@@ -127,7 +129,7 @@ public class FileConsumerAutoCreateDirectoryTest extends ContextTestSupport {
 
         // the directory should NOT exists
         File dir = new File("target/data/file/foo");
-        assertFalse("Directory should NOT be created", dir.exists());
+        assertFalse(dir.exists(), "Directory should NOT be created");
     }
 
 }
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java
index 9f8e94a7..f39cdce 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for consuming a batch of files (multiple files in one consume)
@@ -29,7 +29,7 @@ import org.junit.Test;
 public class FileConsumerBatchTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/file-batch");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java
index c1450a0..123fdae 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java
@@ -23,8 +23,10 @@ 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.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Unit test for the FileRenameStrategy using preMoveExpression and expression
@@ -33,7 +35,7 @@ import org.junit.Test;
 public class FileConsumerBeginAndCommitExpressionRenameStrategyTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/inprogress");
         deleteDirectory("target/data/done");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java
index 89d96a8..ea31256 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java
@@ -23,8 +23,10 @@ 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.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Unit test for the FileRenameStrategy using preMove and move options
@@ -32,7 +34,7 @@ import org.junit.Test;
 public class FileConsumerBeginAndCommitRenameStrategyTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/inprogress");
         deleteDirectory("target/data/done");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java
index bd6d202..7eebc3c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java
@@ -24,8 +24,11 @@ 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.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Unit test for the FileRenameStrategy using preMoveExpression options
@@ -33,7 +36,7 @@ import org.junit.Test;
 public class FileConsumerBeginExpressionRenameStrategyTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/inprogress");
         deleteDirectory("target/data/reports");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java
index b7d6692..7d54036 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java
@@ -24,8 +24,11 @@ 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.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Unit test for the FileRenameStrategy using preMove options
@@ -33,7 +36,7 @@ import org.junit.Test;
 public class FileConsumerBeginRenameStrategyTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/inprogress");
         deleteDirectory("target/data/reports");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java
index b569238..36abbcf 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java
@@ -24,7 +24,9 @@ import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
@@ -43,7 +45,7 @@ public class FileConsumerBridgeRouteExceptionHandlerTest extends ContextTestSupp
 
         assertMockEndpointsSatisfied();
 
-        assertEquals("Should pickup bye.txt file 2 times", 2, myReadLockStrategy.getCounter());
+        assertEquals(2, myReadLockStrategy.getCounter(), "Should pickup bye.txt file 2 times");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java
index 18669d7..55a3c40 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for the FileRenameStrategy using move options with absolute paths
@@ -33,7 +33,7 @@ public class FileConsumerCommitRenameAbsolutePathStrategyTest extends ContextTes
     private String base;
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/done");
         deleteDirectory("target/data/reports");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java
index 9729b91..f97374b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.converter.IOConverter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Unit test for the FileRenameStrategy using move options
@@ -33,7 +35,7 @@ import org.junit.Test;
 public class FileConsumerCommitRenameStrategyTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/done");
         deleteDirectory("target/data/reports");
@@ -75,7 +77,7 @@ public class FileConsumerCommitRenameStrategyTest extends ContextTestSupport {
 
         // content of file should be Hello London
         String content = IOConverter.toString(new File("target/data/done/london.txt"), null);
-        assertEquals("The file should have been renamed replacing any existing files", "Hello London", content);
+        assertEquals("Hello London", content, "The file should have been renamed replacing any existing files");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerConsumedFileNameTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerConsumedFileNameTest.java
index 7fa2079..942a74b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerConsumedFileNameTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerConsumedFileNameTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test that checks for the existence of the CamelFileNameConsumed header.
@@ -29,7 +29,7 @@ import org.junit.Test;
 public class FileConsumerConsumedFileNameTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/consumedfilename");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java
index 3594e39..f8ff4f9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java
@@ -27,7 +27,9 @@ import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  *
@@ -49,7 +51,7 @@ public class FileConsumerCustomExceptionHandlerTest extends ContextTestSupport {
 
         assertMockEndpointsSatisfied();
 
-        assertEquals("Should pickup bye.txt file 2 times", 2, myReadLockStrategy.getCounter());
+        assertEquals(2, myReadLockStrategy.getCounter(), "Should pickup bye.txt file 2 times");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomSchedulerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomSchedulerTest.java
index f0af560..ba6f7b3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomSchedulerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomSchedulerTest.java
@@ -26,8 +26,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.spi.ScheduledPollConsumerScheduler;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileConsumerCustomSchedulerTest extends ContextTestSupport {
 
@@ -41,7 +43,7 @@ public class FileConsumerCustomSchedulerTest extends ContextTestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/file/custom");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDeleteAndFailureTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDeleteAndFailureTest.java
index 7a446c8..aaf61fc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDeleteAndFailureTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDeleteAndFailureTest.java
@@ -21,13 +21,13 @@ 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.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileConsumerDeleteAndFailureTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/failed");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryFilterTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryFilterTest.java
index e1f3af3..282baca 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryFilterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryFilterTest.java
@@ -26,8 +26,11 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Unit test for the file filter option using directories
@@ -45,7 +48,7 @@ public class FileConsumerDirectoryFilterTest extends ContextTestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/directoryfilter");
         super.setUp();
@@ -73,7 +76,7 @@ public class FileConsumerDirectoryFilterTest extends ContextTestSupport {
 
         assertEquals("okDir", list.get(0));
         // windows or unix paths
-        assertTrue(list.get(0), list.get(1).equals("okDir/hello.txt") || list.get(1).equals("okDir\\hello.txt"));
+        assertTrue(list.get(1).equals("okDir/hello.txt") || list.get(1).equals("okDir\\hello.txt"), list.get(0));
         assertEquals("skipDir", list.get(2));
         assertEquals("skipDir2", list.get(3));
     }
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryMustExistBridgeErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryMustExistBridgeErrorHandlerTest.java
index 73ea841..7924e59 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryMustExistBridgeErrorHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryMustExistBridgeErrorHandlerTest.java
@@ -18,11 +18,13 @@ package org.apache.camel.component.file;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FileConsumerDirectoryMustExistBridgeErrorHandlerTest extends ContextTestSupport {
 
     @Override
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/doesnotexists");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
index 902af13..d970073 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test that file consumer will not match directories (CAMEL-920)
@@ -31,7 +31,7 @@ public class FileConsumerDirectoryNotMatchedTest extends ContextTestSupport {
     private String fileUrl = "file://target/data/dirnotmatched/?initialDelay=0&delay=10&recursive=true&include=.*txt$";
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/dirnotmatched");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java
index 37692cb..0e2d316 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test that file consumer will exclude pre and postfixes
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExtendedAttributesTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExtendedAttributesTest.java
index d4a1ed4..629819d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExtendedAttributesTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExtendedAttributesTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.util.FileUtil;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Unit test for consuming a batch of files (multiple files in one consume)
@@ -35,7 +37,7 @@ public class FileConsumerExtendedAttributesTest extends ContextTestSupport {
     private static final String FILE = "attributes.txt";
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory(ROOT);
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
index 788e0fb..e7982de 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
@@ -25,8 +25,11 @@ import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.ValidationException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * Unit test for consuming files but the exchange fails and is handled by the
@@ -35,7 +38,7 @@ import org.junit.Test;
 public class FileConsumerFailureHandledTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/messages/input");
         super.setUp();
@@ -102,12 +105,13 @@ public class FileConsumerFailureHandledTest extends ContextTestSupport {
     private static void assertFiles(String filename, boolean deleted) throws InterruptedException {
         // file should be deleted as delete=true in parameter in the route below
         File file = new File("target/data/messages/input/" + filename);
-        assertEquals("File " + filename + " should be deleted: " + deleted, deleted, !file.exists());
+        Object o2 = !file.exists();
+        assertEquals(deleted, o2, "File " + filename + " should be deleted: " + deleted);
 
         // and no lock files
         String lock = filename + FileComponent.DEFAULT_LOCK_FILE_POSTFIX;
         file = new File("target/data/messages/input/" + lock);
-        assertFalse("File " + lock + " should be deleted", file.exists());
+        assertFalse(file.exists(), "File " + lock + " should be deleted");
     }
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
index 37c12e8..61d898a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.language.simple.SimpleLanguage.simple;
 
@@ -32,7 +32,7 @@ import static org.apache.camel.language.simple.SimpleLanguage.simple;
 public class FileConsumerFileExpressionTest extends ContextTestSupport {
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/filelanguage");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java
index 71aacc1..a909e4d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java
@@ -27,10 +27,11 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.bean.MethodNotFoundException;
 import org.apache.camel.spi.PollingConsumerPollStrategy;
 import org.apache.camel.spi.Registry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Unit test for expression option for file consumer.
@@ -43,7 +44,7 @@ public class FileConsumerFileExpressionThrowExceptionTest extends ContextTestSup
     private static final CountDownLatch LATCH = new CountDownLatch(1);
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/filelanguage");
         super.setUp();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
index b3d51c0..5a60f76 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for the file filter option
@@ -39,7 +39,7 @@ public class FileConsumerFileFilterTest extends ContextTestSupport {
     }
 
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         deleteDirectory("target/data/filefilter");
         super.setUp();
... 42112 lines suppressed ...

Reply | Threaded
Open this post in threaded view
|

[camel] 03/21: [CAMEL-11807] Upgrade camel-management to junit5

gnodet
In reply to this post by gnodet
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 5f08cdb6d0b7628ac46cb0d6664e3216f71d4fc7
Author: Guillaume Nodet <[hidden email]>
AuthorDate: Fri May 29 12:11:19 2020 +0200

    [CAMEL-11807] Upgrade camel-management to junit5
---
 core/camel-management/pom.xml                      |  9 ++-
 .../component/controlbus/ControlBusStatsTest.java  |  5 +-
 .../LanguageLoadScriptFromFileCachedTest.java      |  6 +-
 .../component/xslt/ManagedXsltOutputBytesTest.java |  4 +-
 .../camel/component/xslt/XsltContentCacheTest.java |  6 +-
 .../DynamicRouterConvertBodyToIssueTest.java       |  6 +-
 .../camel/management/AddEventNotifierTest.java     |  8 ++-
 .../camel/management/BacklogDebuggerTest.java      | 75 ++++++++++++----------
 .../camel/management/BacklogTracerFilterTest.java  |  9 ++-
 .../management/BacklogTracerIdOnAllNodesTest.java  |  9 ++-
 .../management/BacklogTracerPatternRouteTest.java  |  9 ++-
 .../camel/management/BacklogTracerPatternTest.java |  9 ++-
 .../management/BacklogTracerStreamCachingTest.java | 10 ++-
 .../apache/camel/management/BacklogTracerTest.java | 26 ++++----
 .../org/apache/camel/management/BigRouteTest.java  |  2 +-
 .../management/CamelChoiceWithManagementTest.java  |  6 +-
 .../management/CamelContextDisableJmxTest.java     |  7 +-
 .../management/DefaultManagementAgentMockTest.java |  6 +-
 .../DualManagedThreadPoolProfileTest.java          |  4 +-
 .../DualManagedThreadPoolWithIdTest.java           |  4 +-
 .../management/ExceptionWithManagementTest.java    |  2 +-
 .../JmxInstrumentationCustomMBeanTest.java         | 14 ++--
 ...mxInstrumentationDisableOnCamelContextTest.java | 14 ++--
 .../management/JmxInstrumentationDisableTest.java  | 14 ++--
 ...ationOnlyRegisterProcessorWithCustomIdTest.java | 16 +++--
 .../JmxInstrumentationUsingDefaultsTest.java       | 75 ++++++++++------------
 .../JmxInstrumentationUsingPlatformMBSTest.java    | 11 ++--
 .../JmxInstrumentationUsingPropertiesTest.java     |  8 ++-
 .../JmxNotificationEventNotifierTest.java          |  9 ++-
 .../camel/management/JmxRecipientListTest.java     | 25 ++++----
 .../org/apache/camel/management/LoadTimerTest.java |  4 +-
 .../apache/camel/management/LoadTripletTest.java   | 10 +--
 .../camel/management/LoggingEventNotifierTest.java |  4 +-
 .../management/ManagedAggregateControllerTest.java |  6 +-
 .../management/ManagedBeanIntrospectionTest.java   | 11 ++--
 .../ManagedBrowsableEndpointAsXmlFileTest.java     | 11 ++--
 .../ManagedBrowsableEndpointAsXmlTest.java         |  6 +-
 .../ManagedBrowsableEndpointEmptyTest.java         |  4 +-
 .../management/ManagedBrowsableEndpointTest.java   |  6 +-
 .../apache/camel/management/ManagedCBRTest.java    | 20 +++---
 .../ManagedCamelContextAutoStartupTest.java        |  9 ++-
 .../ManagedCamelContextDumpRoutesAsXmlTest.java    |  5 +-
 ...ManagedCamelContextDumpRoutesCoverageAsXml.java |  3 +
 .../ManagedCamelContextDumpStatsAsXmlTest.java     |  5 +-
 .../ManagedCamelContextNewProxyTest.java           |  4 +-
 .../ManagedCamelContextPropertiesTest.java         |  7 +-
 .../management/ManagedCamelContextRestartTest.java | 12 ++--
 .../ManagedCamelContextSuspendResumeTest.java      |  8 ++-
 .../ManagedCamelContextSuspendStartTest.java       |  8 ++-
 .../camel/management/ManagedCamelContextTest.java  | 20 ++++--
 ...ManagedCamelContextUpdateRoutesFromXmlTest.java |  4 +-
 ...RoutesWithPropertyPlaceholdersFromXmlPTest.java |  4 +-
 .../ManagedCanekContextExchangeStatisticsTest.java |  4 +-
 .../apache/camel/management/ManagedChoiceTest.java |  5 +-
 .../camel/management/ManagedComponentTest.java     | 12 ++--
 .../camel/management/ManagedConsumerCacheTest.java | 10 ++-
 .../camel/management/ManagedConvertBodyTest.java   |  4 +-
 .../camel/management/ManagedCustomBeanTest.java    |  4 +-
 .../management/ManagedCustomComponentNameTest.java | 12 ++--
 .../management/ManagedCustomLoadBalancerTest.java  |  4 +-
 .../camel/management/ManagedCustomPolicyTest.java  | 11 ++--
 .../management/ManagedCustomProcessorTest.java     |  4 +-
 .../camel/management/ManagedDataFormatTest.java    |  5 +-
 .../ManagedDefaultReactiveExecutorTest.java        |  7 +-
 .../camel/management/ManagedDelayerTest.java       | 14 ++--
 .../management/ManagedDualCamelContextTest.java    |  9 ++-
 .../camel/management/ManagedDuplicateIdTest.java   |  5 +-
 .../camel/management/ManagedDynamicRouterTest.java |  5 +-
 .../management/ManagedEndpointBaseUriTest.java     |  5 +-
 .../management/ManagedEndpointExplainTest.java     |  4 +-
 .../management/ManagedEndpointRegistryTest.java    |  8 ++-
 .../camel/management/ManagedEndpointTest.java      |  4 +-
 .../ManagedEndpointUtilizationStatisticsTest.java  |  5 +-
 .../camel/management/ManagedEnricherTest.java      |  5 +-
 .../management/ManagedErrorHandlerOptionsTest.java |  6 +-
 .../ManagedErrorHandlerRedeliveryTest.java         |  7 +-
 .../camel/management/ManagedErrorHandlerTest.java  |  9 ++-
 .../ManagedFailoverLoadBalancerTest.java           |  5 +-
 .../management/ManagedFileIdempotentClearTest.java | 12 ++--
 .../ManagedFileIdempotentConsumerTest.java         | 12 ++--
 .../apache/camel/management/ManagedFilterTest.java |  4 +-
 .../ManagedFromRestGetEmbeddedRouteTest.java       |  6 +-
 .../camel/management/ManagedFromRestGetTest.java   |  6 +-
 .../management/ManagedFromRestPlaceholderTest.java |  6 +-
 .../camel/management/ManagedHealthCheckTest.java   |  6 +-
 .../ManagedInflightRepositoryBrowseTest.java       |  5 +-
 .../management/ManagedInflightRepositoryTest.java  |  4 +-
 .../management/ManagedInflightStatisticsTest.java  |  6 +-
 .../management/ManagedInlinedProcessorTest.java    |  5 +-
 .../camel/management/ManagedInterceptFromTest.java |  2 +-
 .../camel/management/ManagedInterceptTest.java     |  4 +-
 .../camel/management/ManagedLoadBalancerTest.java  |  4 +-
 .../camel/management/ManagedLogEndpointTest.java   |  7 +-
 .../apache/camel/management/ManagedLoopTest.java   |  4 +-
 .../camel/management/ManagedMarshalTest.java       |  4 +-
 .../ManagedMemoryIdempotentClearTest.java          | 14 ++--
 .../ManagedMemoryIdempotentConsumerTest.java       | 14 ++--
 .../management/ManagedMessageHistoryTest.java      | 10 ++-
 .../camel/management/ManagedMulticastTest.java     |  4 +-
 .../management/ManagedNamePatternFixedTest.java    |  7 +-
 .../ManagedNamePatternIncludeHostNameTest.java     |  6 +-
 .../ManagedNamePatternJvmSystemPropertyTest.java   | 15 +++--
 .../camel/management/ManagedNamePatternTest.java   |  6 +-
 .../management/ManagedNonManagedServiceTest.java   |  4 +-
 .../camel/management/ManagedPollEnricherTest.java  |  5 +-
 .../camel/management/ManagedProcessTest.java       |  4 +-
 ...gedProducerRecipientListRegisterAlwaysTest.java | 11 ++--
 .../ManagedProducerRecipientListTest.java          |  4 +-
 ...edProducerRouteAddRemoveRegisterAlwaysTest.java |  5 +-
 .../camel/management/ManagedProducerTest.java      | 11 ++--
 .../management/ManagedRandomLoadBalancerTest.java  |  5 +-
 .../camel/management/ManagedRecipientListTest.java |  5 +-
 .../management/ManagedRedeliverRouteOnlyTest.java  |  4 +-
 .../camel/management/ManagedRedeliverTest.java     |  4 +-
 .../camel/management/ManagedRefProducerTest.java   | 15 +++--
 .../ManagedRegisterCamelContextTest.java           |  4 +-
 .../management/ManagedRegisterEndpointTest.java    |  4 +-
 .../ManagedRegisterExchangeStatisticsTest.java     |  4 +-
 .../camel/management/ManagedRegisterRouteTest.java | 12 ++--
 .../management/ManagedRegisterTwoRoutesTest.java   |  5 +-
 .../ManagedRemoveRouteAggregateThreadPoolTest.java |  9 ++-
 .../camel/management/ManagedResequencerTest.java   |  4 +-
 .../ManagedResetIncludeProcessorsTest.java         |  4 +-
 .../management/ManagedResetIncludeRoutesTest.java  |  4 +-
 .../camel/management/ManagedResourceTest.java      | 23 ++++---
 .../camel/management/ManagedRestRegistryTest.java  |  9 ++-
 .../ManagedRoundRobinLoadBalancerTest.java         |  4 +-
 .../management/ManagedRouteAddFromRouteTest.java   |  8 ++-
 .../management/ManagedRouteAddRemoveTest.java      |  9 ++-
 ...outeAddSecondRouteNotRegisterNewRoutesTest.java |  9 ++-
 .../management/ManagedRouteAddSecondRouteTest.java |  8 ++-
 .../management/ManagedRouteAutoStartupTest.java    |  7 +-
 .../ManagedRouteDirectWhileIssueLeakTest.java      |  5 +-
 .../ManagedRouteDumpRouteAsXmlPlaceholderTest.java |  6 +-
 .../management/ManagedRouteDumpRouteAsXmlTest.java |  6 +-
 ...DumpStatsAsXmlAndResetWithCustomDomainTest.java |  5 +-
 ...ManagedRouteDumpStatsAsXmlCustomDomainTest.java |  5 +-
 .../management/Mana