[camel] branch master updated: Fixed CS in camel-spring

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated: Fixed CS in camel-spring

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 8c5b9e6  Fixed CS in camel-spring
8c5b9e6 is described below

commit 8c5b9e65a81aa55e0ae26f4ae6c15ec8ae13c756
Author: aldettinger <[hidden email]>
AuthorDate: Fri Sep 14 19:16:14 2018 +0200

    Fixed CS in camel-spring
---
 .../java/org/apache/camel/spring/CamelBeanPostProcessor.java   |  1 +
 .../java/org/apache/camel/spring/CamelContextFactoryBean.java  |  1 +
 .../org/apache/camel/spring/CamelRestContextFactoryBean.java   |  1 +
 .../org/apache/camel/spring/CamelRouteContextFactoryBean.java  |  1 +
 .../org/apache/camel/spring/handler/CamelNamespaceHandler.java |  1 +
 .../src/main/java/org/apache/camel/spring/util/MainRunner.java |  1 -
 .../util/spring/SSLContextClientParametersFactoryBean.java     |  1 -
 .../camel/util/spring/SSLContextParametersFactoryBean.java     |  1 -
 .../util/spring/SSLContextServerParametersFactoryBean.java     |  1 -
 .../camel/util/spring/SecureRandomParametersFactoryBean.java   |  1 -
 .../camel/component/bean/AutowireConstructorRouteTest.java     |  3 +--
 .../camel/component/bean/AutowireConstructorRouteTwoTest.java  |  3 +--
 .../java/org/apache/camel/component/bean/BeanBindingTest.java  |  3 +--
 .../java/org/apache/camel/component/bean/BeanRouteTest.java    |  4 +---
 .../java/org/apache/camel/component/event/EventRouteTest.java  |  3 +--
 .../camel/component/log/CustomExchangeFormatterTest.java       |  3 +--
 .../org/apache/camel/component/log/SpringLogMarkerTest.java    |  3 +--
 .../java/org/apache/camel/component/log/SpringLogTest.java     |  3 +--
 .../properties/BaseSpringPropertiesComponentTest.java          |  3 +--
 .../CamelSpringPropertyPlaceholderConfigurer2Test.java         |  3 +--
 .../CamelSpringPropertyPlaceholderConfigurer3Test.java         |  8 +++-----
 .../CamelSpringPropertyPlaceholderConfigurerNestedTest.java    |  3 +--
 .../CamelSpringPropertyPlaceholderConfigurerTest.java          |  3 +--
 .../component/properties/SpringBuilderRefBeanInjectTest.java   |  3 +--
 .../component/properties/SpringBuilderRefPropertiesTest.java   |  3 +--
 .../properties/SpringBuilderRefPropertyInjectTest.java         |  3 +--
 .../SpringErrorHandlerInlinedPropertiesPlaceholderTest.java    |  3 +--
 .../SpringErrorHandlerPropertiesPlaceholderTest.java           |  3 +--
 .../component/properties/SpringPackagePropertiesTest.java      |  3 +--
 .../component/properties/SpringPackageScanPropertiesTest.java  |  3 +--
 .../properties/SpringPropertiesComponentCacheDisabledTest.java |  1 -
 .../component/properties/SpringPropertiesComponentRefTest.java |  3 +--
 .../component/properties/SpringPropertiesComponentTest.java    |  3 +--
 .../component/properties/SpringPropertiesResolverTest.java     |  3 +--
 .../test/java/org/apache/camel/component/rest/RestRefTest.java |  3 +--
 .../camel/component/rest/SpringFromRestDuplicateTest.java      |  6 ++----
 .../org/apache/camel/language/SpringSimpleEmptyStringTest.java |  3 +--
 .../org/apache/camel/language/SpringSimpleExpressionTest.java  |  3 +--
 .../org/apache/camel/language/SpringSimpleNewlineTest.java     |  3 +--
 .../language/SpringSimplePropertyPlaceholderClashTest.java     |  3 +--
 .../java/org/apache/camel/language/SpringSimpleRegexTest.java  |  3 +--
 .../org/apache/camel/language/SpringSimpleWeirdIssueTest.java  |  3 +--
 .../camel/language/SpringTokenXMLPairNamespaceSplitTest.java   |  3 +--
 .../org/apache/camel/language/SpringXMLTokenSplitTest.java     |  3 +--
 .../java/org/apache/camel/language/spel/SpelNonSpringTest.java |  3 +--
 .../java/org/apache/camel/language/spel/SpelRouteTest.java     |  4 ++--
 .../java/org/apache/camel/language/spel/SpelSpringTest.java    |  3 +--
 .../src/test/java/org/apache/camel/language/spel/SpelTest.java |  3 +--
 .../language/spel/SpringSimpleMultiLineExpressionTest.java     |  3 +--
 .../org/apache/camel/processor/RemoveHeadersExcludeTest.java   |  3 +--
 .../apache/camel/spring/ApplicationContextClassLoaderTest.java |  1 -
 .../org/apache/camel/spring/ApplicationContextTestSupport.java |  1 +
 .../java/org/apache/camel/spring/CamelContextAwareTest.java    |  6 ++----
 .../org/apache/camel/spring/CamelContextFactoryBeanTest.java   |  8 +++-----
 .../camel/spring/CamelContextLazyLoadTypeConvertersTest.java   |  3 +--
 .../java/org/apache/camel/spring/CamelGlobalOptionsTest.java   |  1 -
 .../org/apache/camel/spring/CamelLoadRoutesFromXMLTest.java    |  3 +--
 .../apache/camel/spring/CustomProcessorWithNamespacesTest.java |  6 ++----
 .../test/java/org/apache/camel/spring/DefaultJMXAgentTest.java |  9 ++++-----
 .../java/org/apache/camel/spring/DefaultStreamCachingTest.java |  5 ++---
 .../test/java/org/apache/camel/spring/DisableJmxAgentTest.java |  3 +--
 .../apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java    |  3 +--
 .../java/org/apache/camel/spring/EndpointReferenceTest.java    |  3 +--
 .../test/java/org/apache/camel/spring/EndpointToIdRefTest.java |  1 -
 .../test/java/org/apache/camel/spring/InjectedBeanTest.java    |  2 --
 .../java/org/apache/camel/spring/JMXAgentPropertiesTest.java   |  3 +--
 .../src/test/java/org/apache/camel/spring/JMXAgentTest.java    |  3 +--
 .../apache/camel/spring/LifecycleStrategyInjectionTest.java    |  1 -
 .../src/test/java/org/apache/camel/spring/MainDummyTest.java   |  5 ++---
 .../src/test/java/org/apache/camel/spring/MainExampleTest.java |  5 ++---
 .../src/test/java/org/apache/camel/spring/MainTest.java        |  5 ++---
 .../camel/spring/MultipleLifecycleStrategyInjectionTest.java   |  1 -
 .../java/org/apache/camel/spring/RegistryInjectionTest.java    |  3 +--
 .../camel/spring/RoutingUsingCamelContextFactoryTest.java      |  6 ++----
 .../camel/spring/SendMessageOnRouteStartAndStopTest.java       |  8 +++-----
 .../camel/spring/SpringCamelContextShutdownAfterBeanTest.java  |  3 +--
 .../camel/spring/SpringCamelContextShutdownBeforeBeanTest.java |  3 +--
 .../camel/spring/SpringChangeFunctionStartFunctionEndTest.java |  4 +---
 .../org/apache/camel/spring/SpringEndpointPropertyTest.java    |  3 +--
 .../apache/camel/spring/SpringLogDebugBodyMaxCharsTest.java    |  1 +
 .../src/test/java/org/apache/camel/spring/SpringMDCTest.java   |  3 +--
 .../camel/spring/aop/SpringAopClassLevelCamelBeanTest.java     |  3 +--
 .../java/org/apache/camel/spring/bind/BeanAsEndpointTest.java  |  3 +--
 .../test/java/org/apache/camel/spring/bind/BeanInfoTest.java   |  8 +++-----
 .../org/apache/camel/spring/bind/ProcessorAsEndpointTest.java  |  4 +---
 .../org/apache/camel/spring/config/AnotherCamelProxyTest.java  |  6 ++----
 .../camel/spring/config/CamelContextAutoStartupTest.java       |  8 +++-----
 .../camel/spring/config/CamelContextFactoryBeanTest.java       |  8 +++-----
 .../org/apache/camel/spring/config/CamelPropertiesTest.java    |  3 +--
 .../java/org/apache/camel/spring/config/CamelProxyTest.java    |  3 +--
 .../org/apache/camel/spring/config/CamelProxyUsingRefTest.java |  6 ++----
 .../org/apache/camel/spring/config/CamelSpringPackageTest.java |  3 +--
 .../spring/config/DefaultPackageResolverConfigureTest.java     |  3 +--
 .../spring/config/DualCamelContextEndpointOutsideTest.java     |  3 +--
 .../spring/config/ErrorHandlerCamelContextRefNotFoundTest.java |  6 ++----
 .../spring/config/ErrorHandlerRouteContextRefNotFoundTest.java |  6 ++----
 .../java/org/apache/camel/spring/config/ErrorHandlerTest.java  |  3 +--
 .../spring/config/OnExceptionNoExceptionConfiguredTest.java    |  4 +---
 .../config/OneRouteRefOnExceptionAndDLCErrorHandlerTest.java   |  3 +--
 .../OneRouteRefOnExceptionAndTwoDLCErrorHandlerTest.java       |  3 +--
 .../apache/camel/spring/config/OneRouteRefOnExceptionTest.java |  3 +--
 .../OneRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java   |  3 +--
 .../camel/spring/config/OneRouteRefReverseOnExceptionTest.java |  3 +--
 .../camel/spring/config/RouteAutoStartupPropertiesTest.java    |  8 +++-----
 .../org/apache/camel/spring/config/RouteBuilderRef2Test.java   |  3 +--
 .../org/apache/camel/spring/config/RouteBuilderRefTest.java    |  3 +--
 .../apache/camel/spring/config/RouteRefIncludeXmlFileTest.java |  3 +--
 .../spring/config/RouteRefMultipleCamelContextRefsTest.java    |  5 ++---
 .../apache/camel/spring/config/RouteRefMultipleRefsTest.java   |  3 +--
 .../apache/camel/spring/config/RouteRefMultipleRoutesTest.java |  3 +--
 ...outeRefPropertyPlaceholderMultipleCamelContextRefsTest.java |  5 ++---
 .../test/java/org/apache/camel/spring/config/RouteRefTest.java |  3 +--
 .../SpringCamelContextCustomDefaultThreadPoolProfileTest.java  |  3 +--
 .../config/SpringCamelContextCustomThreadPoolProfileTest.java  |  3 +--
 .../camel/spring/config/SpringCamelContextDependsOnTest.java   |  3 +--
 .../camel/spring/config/SpringCamelContextNoDependsOnTest.java |  3 +--
 ...ngCamelContextSimpleCustomDefaultThreadPoolProfileTest.java |  3 +--
 .../config/SpringCamelContextThreadPoolProfilesTest.java       |  3 +--
 .../camel/spring/config/SpringErrorHandlerConfigTest.java      |  3 +--
 .../spring/config/SpringProduceInjectedPrototypeBeanTest.java  |  3 +--
 .../spring/config/SpringProduceInjectedSingletonBeanTest.java  |  3 +--
 .../org/apache/camel/spring/config/SpringRouteNoFromTest.java  |  6 ++----
 .../apache/camel/spring/config/SpringRouteNoOutputTest.java    |  6 ++----
 .../config/TwoRouteRefOnExceptionAndDLCErrorHandlerTest.java   |  3 +--
 .../apache/camel/spring/config/TwoRouteRefOnExceptionTest.java |  3 +--
 .../TwoRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java   |  3 +--
 .../camel/spring/config/TwoRouteRefReverseOnExceptionTest.java |  3 +--
 .../scan/RouteExclusionFromWithinSpringTestSupportTest.java    |  3 +--
 .../camel/spring/config/scan/SpringComponentScanTest.java      |  8 +++-----
 .../scan/SpringComponentScanWithDeprecatedPackagesTest.java    |  8 +++-----
 .../ContextScanOnExceptionAndDLCErrorHandlerReverseTest.java   |  3 +--
 .../ContextScanOnExceptionAndDLCErrorHandlerTest.java          |  3 +--
 .../apache/camel/spring/converter/ResourceConverterTest.java   |  3 +--
 .../org/apache/camel/spring/example/ContentBasedRouteTest.java |  7 ++-----
 .../org/apache/camel/spring/example/FooEventRouteTest.java     |  3 +--
 .../java/org/apache/camel/spring/example/PojoConsumerTest.java |  6 ++----
 .../camel/spring/example/PojoDualCamelContextConsumerTest.java |  8 +++-----
 .../java/org/apache/camel/spring/example/PojoSenderTest.java   |  7 ++-----
 .../org/apache/camel/spring/example/PojoVmConsumerTest.java    |  6 ++----
 .../java/org/apache/camel/spring/example/SimpleRouteTest.java  |  4 +---
 .../apache/camel/spring/example/SpringExpressionTrimTest.java  |  3 +--
 .../apache/camel/spring/file/SpringFileLanguageCBRTest.java    |  6 ++----
 .../camel/spring/handler/ErrorHandlerDefinitionParserTest.java | 10 ++++------
 .../spring/impl/SpringProduceConsumeImplicitPropertyTest.java  |  3 +--
 .../camel/spring/interceptor/ContainerWideInterceptorTest.java |  8 +++-----
 .../camel/spring/interceptor/DelayerInterceptorTest.java       |  3 +--
 .../spring/interceptor/MixedPropagationTransactedTest.java     |  6 ++----
 .../spring/interceptor/MixedStreamCachingInterceptorTest.java  |  5 +++--
 .../spring/interceptor/MixedTransactionPropagationTest.java    |  6 ++----
 .../spring/interceptor/NoStreamCachingInterceptorTest.java     |  5 +++--
 .../interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.java  |  1 +
 .../SpringTransactionalClientDataSourceTransactedTest.java     |  6 ++----
 ...lientDataWithOnExceptionAndRollbackUsingTransactedTest.java |  3 +--
 .../camel/spring/interceptor/StreamCachingInterceptorTest.java |  4 ++--
 .../apache/camel/spring/interceptor/TraceFormatterTest.java    |  3 +--
 .../camel/spring/interceptor/TracerConfigurationTest.java      |  3 +--
 .../interceptor/TransactedInterceptSendToEndpointTest.java     |  3 +--
 .../interceptor/TransactionalClientDataSourceAsyncTest.java    |  3 +--
 .../interceptor/TransactionalClientDataSourceHandledTest.java  |  3 +--
 .../TransactionalClientDataSourceMinimalConfigurationTest.java |  6 ++----
 .../TransactionalClientDataSourceMixedTransactedTest.java      |  3 +--
 .../TransactionalClientDataSourceNotTransactedTest.java        |  3 +--
 ...TransactionalClientDataSourceOnExceptionRedeliveryTest.java |  3 +--
 .../TransactionalClientDataSourceRedeliveryTest.java           |  3 +--
 .../spring/interceptor/TransactionalClientDataSourceTest.java  |  3 +--
 ...ionalClientDataSourceTransactedWithFileOnExceptionTest.java |  3 +--
 .../TransactionalClientDataSourceTransactedWithFileTest.java   |  6 ++----
 ...lClientDataSourceWithOnExceptionHandledAndRollbackTest.java |  3 +--
 ...ceWithOnExceptionHandledAndRollbackUsingTransactedTest.java |  3 +--
 ...ansactionalClientDataSourceWithOnExceptionRollbackTest.java |  3 +--
 .../TransactionalClientDataSourceWithOnExceptionTest.java      |  3 +--
 ...ransactionalClientDataSourceWithSpringRouteBuilderTest.java |  1 -
 .../interceptor/TransactionalClientWithAnnotatedBeanTest.java  |  4 +---
 .../interceptor/TransactionalClientWithRollbackTest.java       |  6 ++----
 .../spring/issues/CamelContextModelErrorHandlerIssueTest.java  |  3 ++-
 .../camel/spring/issues/CamelRouteRefInjectionIssueTest.java   |  3 +--
 .../org/apache/camel/spring/issues/CustomIdIssuesTest.java     |  3 +--
 .../spring/issues/FileWireTapWithXMLPayloadIssueTest.java      |  6 ++----
 .../org/apache/camel/spring/issues/MisspelledRouteRefTest.java |  6 ++----
 .../camel/spring/issues/ProduceSplitMethodCallIssueTest.java   |  3 +--
 .../issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java     |  3 +--
 .../SpringAdviceWithContextScopedErrorHandlerIssueTest.java    |  3 +--
 .../apache/camel/spring/issues/SpringCatchNestedFailTest.java  |  3 +--
 .../issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java |  1 +
 .../camel/spring/issues/SpringFinallyNestedFailTest.java       |  3 +--
 .../SpringInstanceFactoryBeanCamelContextScanIssueTest.java    |  3 +--
 .../spring/issues/SpringInstanceFactoryBeanIssueTest.java      |  3 +--
 .../camel/spring/issues/SpringMainStartFailedIssueTest.java    |  3 +--
 .../java/org/apache/camel/spring/issues/SpringPackageTest.java |  3 +--
 .../issues/SpringPropertyPlaceholderFileEndpointIssueTest.java |  3 +--
 .../spring/issues/SpringPropertyPlaceholderIssueTest.java      |  3 +--
 .../camel/spring/issues/SpringRenameFileOnCommitIssueTest.java |  6 ++----
 .../spring/issues/SpringSingletonScopedBeanIssueTest.java      |  3 +--
 .../issues/SpringSplitterDetermineErrorHandlerIssueTest.java   |  3 +--
 ...actionErrorHandlerAndContextScopedOnExceptionIssueTest.java |  6 ++----
 .../issues/SpringTryCatchFinallyAndErrorHandlerTest.java       |  3 +--
 .../camel/spring/issues/SpringTryCatchWithSplitIssueTest.java  |  1 +
 .../issues/SpringTryCatchWithSplitNotHandledIssueTest.java     |  1 +
 .../apache/camel/spring/issues/SpringTryNestedFailTest.java    |  3 +--
 .../spring/issues/SpringTwoCamelContextDirectEndpointTest.java |  5 ++---
 .../org/apache/camel/spring/issues/StringDataFormatTest.java   |  3 +--
 .../contextscan/SpringRouteIsComponentAnnotatedTest.java       |  3 +--
 .../contextscan2/SpringRouteIsComponentAnnotated2Test.java     |  3 +--
 .../issues/packagescan/SkipNonPublicRouteBuilderTest.java      |  3 +--
 .../DualCamelContextManagedAutoAssignedNameTest.java           |  4 ++--
 .../camel/spring/management/DualCamelContextManagedTest.java   |  4 ++--
 .../spring/management/JmxInstrumentationWithConnectorTest.java |  3 +--
 .../management/ManagedEndpointInjectRefEndpointTest.java       |  4 ++--
 .../apache/camel/spring/management/ManagedRefEndpointTest.java |  4 ++--
 .../management/SpringCamelContextStartingFailedEventTest.java  |  3 +--
 .../spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java     |  3 +--
 .../SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java           |  3 +--
 .../camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java  |  3 +--
 .../spring/management/SpringJmxEndpointInjectBeanRefTest.java  |  3 +--
 .../management/SpringJmxEndpointInjectBeanRefTwoTest.java      |  3 +--
 .../spring/management/SpringJmxEndpointInjectBeanTest.java     |  3 +--
 .../management/SpringJmxRecipientListRegisterAlwaysTest.java   |  3 +--
 .../camel/spring/management/SpringJmxRecipientListTest.java    |  3 +--
 .../camel/spring/management/SpringManagedCamelContextTest.java |  1 +
 .../spring/management/SpringManagedCustomProcessorTest.java    |  3 +--
 .../camel/spring/management/SpringManagedErrorHandlerTest.java |  1 +
 .../camel/spring/management/SpringManagedSedaEndpointTest.java |  3 +--
 .../spring/management/SpringManagedStatisticsLevelOffTest.java |  1 +
 .../management/SpringManagedStatisticsLevelRoutesOnlyTest.java |  1 +
 .../management/SpringManagedTransactedProcessorTest.java       |  4 ++--
 .../test/java/org/apache/camel/spring/mock/BeanMockTest.java   |  3 +--
 .../spring/mock/InterceptSendToMockEndpointStrategyTest.java   |  3 +--
 .../pollingconsumer/FileConsumerSpringSchedulerTest.java       |  3 +--
 .../CamelCustomPostProcessorOnRouteBuilderTest.java            |  3 +--
 .../PlainSpringCustomPostProcessorOnRouteBuilderTest.java      |  3 +--
 .../processor/DualSpringManagedThreadsThreadPoolTest.java      |  3 +--
 .../spring/processor/JavaDslTransactedNoTXManagerTest.java     |  3 +--
 .../camel/spring/processor/SpringAOPAfterFinallyTest.java      |  1 +
 .../org/apache/camel/spring/processor/SpringAOPAfterTest.java  |  1 +
 .../camel/spring/processor/SpringAOPAroundFinallyTest.java     |  1 +
 .../org/apache/camel/spring/processor/SpringAOPBeforeTest.java |  1 +
 .../camel/spring/processor/SpringAOPNestedRouteTest.java       |  1 +
 .../processor/SpringAggregatorWithCustomStrategyTest.java      |  4 ++--
 .../camel/spring/processor/SpringCBRHeaderPredicateTest.java   |  1 +
 .../org/apache/camel/spring/processor/SpringChoiceTest.java    |  1 +
 .../camel/spring/processor/SpringComplexBlockWithEndTest.java  |  4 ++--
 .../apache/camel/spring/processor/SpringConvertBodyTest.java   |  1 +
 .../camel/spring/processor/SpringCustomExpressionTest.java     |  3 +--
 .../camel/spring/processor/SpringCustomPredicateTest.java      |  3 +--
 .../SpringDeadLetterChannelInvalidDeadLetterUriTest.java       |  3 +--
 .../SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java |  3 +--
 .../SpringDeadLetterChannelUseOriginalBodyNewTest.java         |  1 +
 .../processor/SpringDeadLetterChannelUseOriginalBodyTest.java  |  1 +
 .../SpringDeadLetterChannelUseOriginalBodyWithFileTest.java    |  1 +
 .../SpringDefaultErrorHandlerOnExceptionTraceTest.java         |  1 +
 .../camel/spring/processor/SpringDelayerPerRouteTest.java      |  1 +
 .../org/apache/camel/spring/processor/SpringDelayerTest.java   |  1 +
 .../SpringDoubleLoadBalancerMisconfigurationTest.java          |  6 ++----
 .../apache/camel/spring/processor/SpringEnricherRefTest.java   |  7 +++----
 .../org/apache/camel/spring/processor/SpringEnricherTest.java  |  6 ++----
 .../SpringErrorHandlerRedeliveryPolicyProfileTest.java         |  3 +--
 .../apache/camel/spring/processor/SpringFaultRouteTest.java    |  1 +
 .../apache/camel/spring/processor/SpringFilterNoChildTest.java |  6 ++----
 .../org/apache/camel/spring/processor/SpringFilterTest.java    |  1 +
 .../apache/camel/spring/processor/SpringFromEndpointTest.java  |  1 +
 .../camel/spring/processor/SpringFromMultipleEndpointTest.java |  1 +
 .../camel/spring/processor/SpringHandleFaultPerRouteTest.java  |  1 +
 .../SpringIdempotentConsumerNoSkipDuplicateFilterTest.java     |  3 +--
 .../processor/SpringIdempotentConsumerNoSkipDuplicateTest.java |  3 +--
 .../camel/spring/processor/SpringIdempotentConsumerTest.java   |  3 +--
 .../apache/camel/spring/processor/SpringInterceptFromTest.java |  4 +---
 .../spring/processor/SpringInterceptFromUriRegexTest.java      |  1 +
 .../spring/processor/SpringInterceptFromUriSimpleLogTest.java  |  1 +
 .../spring/processor/SpringInterceptFromUriWildcardTest.java   |  1 +
 .../spring/processor/SpringInterceptFromWhenNoStopTest.java    |  1 +
 .../camel/spring/processor/SpringInterceptFromWhenTest.java    |  1 +
 .../processor/SpringInterceptFromWhenWithChoiceTest.java       |  1 +
 .../spring/processor/SpringInterceptFromWithStopTest.java      |  4 +---
 .../processor/SpringInterceptSendToEndpointDynamicTest.java    |  4 ++--
 .../SpringInterceptSendToEndpointInOnExceptionTest.java        |  1 +
 .../processor/SpringInterceptSendToEndpointSkipTest.java       |  4 ++--
 .../spring/processor/SpringInterceptSendToEndpointTest.java    |  4 ++--
 .../processor/SpringInterceptSendToEndpointWhenTest.java       |  4 ++--
 .../spring/processor/SpringInterceptSimpleRouteStopTest.java   |  1 +
 .../camel/spring/processor/SpringInterceptSimpleRouteTest.java |  1 +
 .../spring/processor/SpringInterceptSimpleRouteTraceTest.java  |  1 +
 .../processor/SpringInterceptSimpleRouteWhenStopTest.java      |  1 +
 .../spring/processor/SpringInterceptSimpleRouteWhenTest.java   |  1 +
 .../apache/camel/spring/processor/SpringLoopDoWhileTest.java   |  3 +--
 .../spring/processor/SpringManagedThreadsThreadPoolTest.java   |  3 +--
 .../camel/spring/processor/SpringMarkRollbackOnlyTest.java     |  1 +
 .../apache/camel/spring/processor/SpringMethodCallTest.java    |  3 +--
 .../spring/processor/SpringMulticastNoStopOnExceptionTest.java |  1 +
 .../spring/processor/SpringMulticastStopOnExceptionTest.java   |  1 +
 .../apache/camel/spring/processor/SpringNormalizerTest.java    |  1 +
 ...SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.java |  1 +
 .../processor/SpringOnCompletionAndInterceptGlobalTest.java    |  1 +
 .../spring/processor/SpringOnCompletionAndInterceptTest.java   |  1 +
 .../camel/spring/processor/SpringOnCompletionGlobalTest.java   |  1 +
 .../spring/processor/SpringOnCompletionGlobalTraceTest.java    |  1 +
 .../spring/processor/SpringOnCompletionOnCompleteOnlyTest.java |  1 +
 .../spring/processor/SpringOnCompletionOnFailureOnlyTest.java  |  1 +
 .../SpringOnCompletionRouteScopeOverrideGlobalScopeTest.java   |  1 +
 .../apache/camel/spring/processor/SpringOnCompletionTest.java  |  1 +
 .../camel/spring/processor/SpringOnCompletionWhenTest.java     |  1 +
 .../camel/spring/processor/SpringPollEnricherRefTest.java      |  1 +
 .../apache/camel/spring/processor/SpringPollEnricherTest.java  |  1 +
 .../camel/spring/processor/SpringRandomLoadBalanceTest.java    |  1 +
 .../SpringRecipientListIgnoreInvalidEndpointsTest.java         |  1 +
 .../processor/SpringRecipientListWithArrayHeaderTest.java      |  1 +
 .../SpringRecipientListWithStringDelimitedHeaderTest.java      |  1 +
 .../apache/camel/spring/processor/SpringRemoveHeaderTest.java  |  1 +
 .../processor/SpringRemovePropertiesWithExclusionTest.java     |  1 +
 .../processor/SpringRemovePropertiesWithoutExclusionTest.java  |  1 +
 .../camel/spring/processor/SpringRemovePropertyTest.java       |  1 +
 .../apache/camel/spring/processor/SpringResequencerTest.java   |  1 +
 .../spring/processor/SpringRoundRobinLoadBalanceTest.java      |  1 +
 .../spring/processor/SpringRouteContextProduceBeanTest.java    |  3 +--
 .../camel/spring/processor/SpringRouteNoAutoStartupTest.java   |  1 +
 .../apache/camel/spring/processor/SpringRoutePoliciesTest.java |  3 +--
 .../spring/processor/SpringRouteStartupOrderSimpleTest.java    |  1 +
 .../camel/spring/processor/SpringRouteStartupOrderTest.java    |  1 +
 .../processor/SpringRouteStartupOrderWithDefaultTest.java      |  1 +
 .../org/apache/camel/spring/processor/SpringRouteStopTest.java |  1 +
 .../spring/processor/SpringRouteTopLevelMisconfiguredTest.java |  3 +--
 .../SpringRouteWithConstantFieldFromExchangeFailTest.java      |  3 +--
 .../processor/SpringRoutingSlipIgnoreInvalidEndpointsTest.java |  1 +
 .../apache/camel/spring/processor/SpringRoutingSlipTest.java   |  1 +
 .../java/org/apache/camel/spring/processor/SpringSagaTest.java |  3 +--
 .../camel/spring/processor/SpringScheduledThreadPoolTest.java  |  3 +--
 .../camel/spring/processor/SpringScriptExternalTest.java       |  6 ++----
 .../org/apache/camel/spring/processor/SpringScriptTest.java    |  6 ++----
 .../org/apache/camel/spring/processor/SpringSetBodyTest.java   |  3 +--
 .../camel/spring/processor/SpringSetExchangePatternTest.java   |  1 +
 .../processor/SpringSetExchangePatternWithCustomIdTest.java    |  3 +--
 .../apache/camel/spring/processor/SpringSetFaultBodyTest.java  |  3 +--
 .../camel/spring/processor/SpringSetHeaderNameDynamicTest.java |  3 +--
 .../org/apache/camel/spring/processor/SpringSetHeaderTest.java |  3 +--
 .../spring/processor/SpringSetHeaderWithConstantTest.java      |  3 +--
 .../spring/processor/SpringSetHeaderXPathResultTypeTest.java   |  3 +--
 .../apache/camel/spring/processor/SpringSetOutHeaderTest.java  |  3 +--
 .../spring/processor/SpringSetOutHeaderWithConstantTest.java   |  3 +--
 .../spring/processor/SpringSetPropertyNameDynamicTest.java     |  3 +--
 .../apache/camel/spring/processor/SpringSetPropertyTest.java   |  1 +
 .../org/apache/camel/spring/processor/SpringSortBodyTest.java  |  1 +
 .../camel/spring/processor/SpringSortExpressionTest.java       |  1 +
 .../apache/camel/spring/processor/SpringSplitterBodyTest.java  |  3 +--
 .../camel/spring/processor/SpringSplitterMethodCallTest.java   |  1 +
 .../spring/processor/SpringSplitterNoStopOnExceptionTest.java  |  1 +
 .../spring/processor/SpringSplitterStopOnExceptionTest.java    |  1 +
 .../camel/spring/processor/SpringStaticRecipientListTest.java  |  1 +
 .../camel/spring/processor/SpringStickyLoadBalanceTest.java    |  1 +
 .../spring/processor/SpringStreamCachingPerRouteTest.java      |  1 +
 .../camel/spring/processor/SpringThreadNamePatternTest.java    |  3 +--
 .../camel/spring/processor/SpringThreadsCorePoolTest.java      |  3 +--
 .../camel/spring/processor/SpringThrottlerGroupingTest.java    |  1 +
 .../org/apache/camel/spring/processor/SpringThrottlerTest.java |  1 +
 .../processor/SpringThrottlingInflightRoutePolicyTest.java     |  1 +
 .../camel/spring/processor/SpringThrowExceptionTest.java       |  1 +
 .../org/apache/camel/spring/processor/SpringTokenizerTest.java |  1 +
 .../camel/spring/processor/SpringTopicLoadBalanceTest.java     |  1 +
 .../processor/SpringTraceInterceptorWithOutBodyTraceTest.java  |  1 +
 .../apache/camel/spring/processor/SpringTracePerRouteTest.java |  1 +
 .../org/apache/camel/spring/processor/SpringTransformTest.java |  4 +---
 .../spring/processor/SpringTryCatchMisconfiguredTest.java      |  3 +--
 .../SpringTryCatchMustHaveExceptionConfiguredTest.java         |  3 +--
 .../camel/spring/processor/SpringTryProcessorHandledTest.java  |  1 +
 .../processor/SpringTryProcessorMultipleExceptionTest.java     |  1 +
 .../camel/spring/processor/SpringTryProcessorOnWhenTest.java   |  1 +
 .../spring/processor/SpringWeightedRandomLoadBalanceTest.java  |  1 +
 .../processor/SpringWeightedRoundRobinLoadBalanceTest.java     |  1 +
 .../org/apache/camel/spring/processor/SpringWireTapTest.java   |  1 +
 .../processor/SpringWireTapUsingFireAndForgetCopyTest.java     |  3 +--
 .../spring/processor/SpringWireTapUsingFireAndForgetTest.java  |  4 ++--
 .../apache/camel/spring/processor/SpringXPathFilterTest.java   |  1 +
 ...SpringXPathFilterWithNamespaceOnImportRouteContextTest.java |  3 +--
 .../SpringXPathFilterWithNamespaceOnRouteContextTest.java      |  3 +--
 .../spring/processor/SpringXPathFilterWithNamespaceTest.java   |  4 ++--
 .../apache/camel/spring/processor/SpringXPathHeaderTest.java   |  4 +---
 .../camel/spring/processor/TransformWithExpressionTest.java    |  6 ++----
 .../spring/processor/aggregator/SpringAggregatorTest.java      |  1 +
 .../SpringAsyncDeadLetterChannelExecutorServiceRefTest.java    |  3 +--
 .../idempotent/FileConsumerIdempotentLoadStoreTest.java        |  6 ++----
 .../processor/idempotent/FileConsumerIdempotentTest.java       |  6 ++----
 .../onexception/DeadLetterChannelHandledExampleTest.java       |  3 +--
 .../onexception/SpringContextScopeOnExceptionTest.java         |  3 +--
 .../SpringDeadLetterChannelOnExceptionOnRedeliveryTest.java    |  1 +
 .../SpringOnExceptionFromChoiceUseOriginalBodyTest.java        |  1 +
 .../SpringOnExceptionNotNormalizedClassNameTest.java           |  3 +--
 .../processor/onexception/SpringOnExceptionSubRouteTest.java   |  3 +--
 .../SpringOnExceptionSubRouteWithDefaultErrorHandlerTest.java  |  1 +
 .../onexception/SpringOnExceptionUseOriginalBodyTest.java      |  1 +
 .../spring/processor/scattergather/ScatterGatherTest.java      |  3 +--
 .../apache/camel/spring/processor/tracing/TracingTestBase.java |  3 +--
 .../apache/camel/spring/produce/generics/MyServiceImpl.java    |  1 -
 .../apache/camel/spring/produce/generics/MyServiceInvoker.java |  1 -
 .../apache/camel/spring/produce/generics/MyServiceTest.java    |  2 --
 .../spring/remoting/EchoSpringRemotingPojoDirectTest.java      |  3 +--
 .../camel/spring/remoting/EchoSpringRemotingPojoTest.java      |  3 +--
 .../EchoSpringRemotingThrowingRuntimeExceptionTest.java        |  3 +--
 .../spring/remoting/MultiArgumentsWithDefaultBinding.java      |  1 +
 ...rgumentsWithDefaultBindingSpringRemotingPojoDirectTest.java |  3 +--
 .../apache/camel/spring/remoting/MyMultiArgumentService.java   |  1 +
 .../remoting/MyMultiArgumentSpringRemotingPojoDirectTest.java  |  3 +--
 .../camel/spring/remoting/SpringRemotingBeanConverterTest.java |  5 ++---
 .../apache/camel/spring/remoting/SpringRemotingRouteTest.java  |  5 ++---
 .../spring/remoting/SpringRemotingTwoCamelContextTest.java     |  6 ++----
 .../camel/spring/routebuilder/CamelRouteBuilderTest.java       |  3 +--
 .../camel/spring/scan/DefaultPackageScanClassResolverTest.java |  6 ++----
 .../org/apache/camel/spring/scan/PackageScanFiltersTest.java   |  6 ++----
 .../camel/spring/scan/PatternBasedPackageScanFilterTest.java   |  6 ++----
 .../java/org/apache/camel/spring/scan/ScanTestSupport.java     |  1 +
 .../spring/spi/BridgePropertyPlaceholderConfigurerTest.java    |  3 +--
 .../spi/BridgePropertyPlaceholderConfigurerUtilIssueTest.java  |  3 +--
 .../org/apache/camel/spring/spi/ParentContextRegistryTest.java |  3 +--
 .../java/org/apache/camel/spring/util/EndpointHelperTest.java  |  3 +--
 .../test/java/org/apache/camel/spring/util/MainRunnerTest.java |  3 +--
 .../org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java |  4 +---
 413 files changed, 493 insertions(+), 725 deletions(-)

diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
index b444a0c..6496866 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
index da4fa8d..d4709c0 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRestContextFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRestContextFactoryBean.java
index 8fbc69f..ed1ca8c 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRestContextFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRestContextFactoryBean.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRouteContextFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRouteContextFactoryBean.java
index 768beac..a6bed99 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRouteContextFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRouteContextFactoryBean.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
index d75a079..1683c40 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import javax.xml.bind.Binder;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java b/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
index a9e0b7a..5c8d4c7 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
@@ -23,7 +23,6 @@ import java.util.Arrays;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.beans.factory.InitializingBean;
 
 import static org.apache.camel.util.ObjectHelper.name;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextClientParametersFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextClientParametersFactoryBean.java
index 8a37bed..2f91c17 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextClientParametersFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextClientParametersFactoryBean.java
@@ -23,7 +23,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.core.xml.util.jsse.AbstractSSLContextClientParametersFactoryBean;
 import org.apache.camel.spring.util.CamelContextResolverHelper;
 import org.apache.camel.util.jsse.SSLContextClientParameters;
-
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextParametersFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextParametersFactoryBean.java
index d91ff80..ac24708 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextParametersFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextParametersFactoryBean.java
@@ -24,7 +24,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.core.xml.util.jsse.AbstractSSLContextParametersFactoryBean;
 import org.apache.camel.spring.util.CamelContextResolverHelper;
 import org.apache.camel.util.jsse.SSLContextParameters;
-
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextServerParametersFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextServerParametersFactoryBean.java
index 9839f02..dafa410 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextServerParametersFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/util/spring/SSLContextServerParametersFactoryBean.java
@@ -23,7 +23,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.core.xml.util.jsse.AbstractSSLContextServerParametersFactoryBean;
 import org.apache.camel.spring.util.CamelContextResolverHelper;
 import org.apache.camel.util.jsse.SSLContextServerParameters;
-
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SecureRandomParametersFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/util/spring/SecureRandomParametersFactoryBean.java
index cf879b4..6e92ed5 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/util/spring/SecureRandomParametersFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/util/spring/SecureRandomParametersFactoryBean.java
@@ -23,7 +23,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.core.xml.util.jsse.AbstractSecureRandomParametersFactoryBean;
 import org.apache.camel.spring.util.CamelContextResolverHelper;
 import org.apache.camel.util.jsse.SecureRandomParameters;
-
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTest.java
index 57c6214..f97ab16 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.bean;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.java
index d256142..49f547c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/bean/AutowireConstructorRouteTwoTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.bean;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
index 28afb4b..f1714bf 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanBindingTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.bean;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
index bbc28fd..05bdcb1 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
@@ -16,10 +16,8 @@
  */
 package org.apache.camel.component.bean;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
-
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java
index 2f836b2..1e39404 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.event;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java
index 2336424..5b4bdfd 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.log;
 
-import org.junit.Test;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogMarkerTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogMarkerTest.java
index 14bb0d1..83fd898 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogMarkerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogMarkerTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.log;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogTest.java
index b91de53..5d05cf6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/log/SpringLogTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.log;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/BaseSpringPropertiesComponentTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/BaseSpringPropertiesComponentTest.java
index 075b811..42545c7 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/BaseSpringPropertiesComponentTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/BaseSpringPropertiesComponentTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.java
index 11d4e93..8ba7e3a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer2Test.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer3Test.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer3Test.java
index ce49e48..b0dbacf 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer3Test.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurer3Test.java
@@ -15,17 +15,15 @@
  * limitations under the License.
  */
 package org.apache.camel.component.properties;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
 import java.util.List;
 import java.util.Properties;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.spring.SpringTestSupport;
 import org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.java
index 71cbbc9..d522fe1 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.java
index 4e19175..fcd1d3a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.java
index 1b00238..6c674c6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefBeanInjectTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.java
index 516631e..01a261c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertiesTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.java
index 15e6df5..bfd417d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringBuilderRefPropertyInjectTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java
index 378ffc2..6c26d34 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java
index 09db599..a45a839 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackagePropertiesTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackagePropertiesTest.java
index 13292e5..114dc63 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackagePropertiesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackagePropertiesTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.java
index 4394689..5a3a370 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPackageScanPropertiesTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentCacheDisabledTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentCacheDisabledTest.java
index 6fb05fc..6e9d2ff 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentCacheDisabledTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentCacheDisabledTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.properties;
 import org.junit.After;
-
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.java
index f1675de..5ccc953 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentRefTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
index 0cad85f..c14b55d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.spring.CamelContextFactoryBean;
+import org.junit.Test;
 
 public class SpringPropertiesComponentTest extends BaseSpringPropertiesComponentTest {
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesResolverTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesResolverTest.java
index 2ec5dc4..7bc4bb4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesResolverTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesResolverTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.properties;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java
index 693d6bc..393c353 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.rest;
 
-import org.junit.Test;
-
 import org.apache.camel.model.ToDefinition;
 import org.apache.camel.model.rest.RestDefinition;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java
index 499d714..26a5470 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java
@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.component.rest;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleEmptyStringTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleEmptyStringTest.java
index c0c92ef..d7a8abe 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleEmptyStringTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleEmptyStringTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.language;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleExpressionTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleExpressionTest.java
index 63da649..6967087 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleExpressionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleExpressionTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.language;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleNewlineTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleNewlineTest.java
index fc53268..bd780fa 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleNewlineTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleNewlineTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.language;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java
index b7a57cd..c71981c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.language;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleRegexTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleRegexTest.java
index 194f988..6c11b77 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleRegexTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleRegexTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.language;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleWeirdIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleWeirdIssueTest.java
index 5a62942..c280ddc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleWeirdIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleWeirdIssueTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.language;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.java
index 4ee4f4f..8c4254f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.language;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringXMLTokenSplitTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/SpringXMLTokenSplitTest.java
index fce298d..22845b8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/SpringXMLTokenSplitTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/SpringXMLTokenSplitTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.language;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelNonSpringTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelNonSpringTest.java
index 8dac8f2..41e19c3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelNonSpringTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelNonSpringTest.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.language.spel;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ExpressionEvaluationException;
 import org.apache.camel.LanguageTestSupport;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.SimpleRegistry;
 import org.apache.camel.language.spel.bean.Dummy;
+import org.junit.Test;
 
 /**
  * Test access to beans defined in non-Spring context from SpEL expressions/predicates.
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
index f4d5a7d..b75074b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.language.spel;
 
-import org.junit.Test;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
 import static org.apache.camel.language.spel.SpelExpression.spel;
 
 public class SpelRouteTest extends ContextTestSupport {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelSpringTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelSpringTest.java
index bcc5b74..7f67133 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelSpringTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelSpringTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.language.spel;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.LanguageTestSupport;
 import org.apache.camel.spring.processor.SpringTestHelper;
+import org.junit.Test;
 
 /**
  * Test access to beans defined in Spring XML file from SpEL expressions/predicates.
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelTest.java
index 704b2df..2f1671e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.language.spel;
 
-import org.junit.Test;
-
 import org.apache.camel.LanguageTestSupport;
+import org.junit.Test;
 
 public class SpelTest extends LanguageTestSupport {
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpringSimpleMultiLineExpressionTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpringSimpleMultiLineExpressionTest.java
index 3d12e06..922afd1 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpringSimpleMultiLineExpressionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpringSimpleMultiLineExpressionTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.language.spel;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java b/components/camel-spring/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java
index 64caa7d..bcdbd8f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/processor/RemoveHeadersExcludeTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.processor;
 
-import org.junit.Test;
-
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextClassLoaderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextClassLoaderTest.java
index 2fe6790..67be116 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextClassLoaderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextClassLoaderTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.spring;
 
 import org.junit.Test;
-
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java b/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
index 1400988..f7b1fdb 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
@@ -17,6 +17,7 @@
 package org.apache.camel.spring;
 
 import junit.framework.TestCase;
+
 import org.apache.camel.util.IOHelper;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
index 39ab415..f48df1e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.spring;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import java.util.Map;
 
 import org.apache.camel.impl.DefaultConsumerTemplate;
 import org.apache.camel.impl.DefaultProducerTemplate;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
index 00e6c34..a030db3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
@@ -15,20 +15,18 @@
  * limitations under the License.
  */
 package org.apache.camel.spring;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import java.net.URL;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.junit.Assert;
 import org.apache.camel.impl.DefaultModelJAXBContextFactory;
 import org.apache.camel.impl.DefaultUuidGenerator;
 import org.apache.camel.impl.SimpleUuidGenerator;
 import org.apache.camel.spi.ModelJAXBContextFactory;
 import org.apache.camel.spi.UuidGenerator;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.StaticApplicationContext;
 import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.builder.Input;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextLazyLoadTypeConvertersTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextLazyLoadTypeConvertersTest.java
index 3c4669b..e4725ac 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextLazyLoadTypeConvertersTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextLazyLoadTypeConvertersTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import org.apache.camel.TypeConverter;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelGlobalOptionsTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelGlobalOptionsTest.java
index e71900e..b6113b1 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelGlobalOptionsTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelGlobalOptionsTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.spring;
 
 import org.junit.Test;
-
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelLoadRoutesFromXMLTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelLoadRoutesFromXMLTest.java
index 43b9f39..702b378 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelLoadRoutesFromXMLTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelLoadRoutesFromXMLTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import java.io.InputStream;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.model.RoutesDefinition;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
index e440e48..7125fed 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.spring;
-import org.junit.After;
-
-import org.junit.Test;
-
 import java.util.List;
 
 import org.apache.camel.Exchange;
@@ -29,6 +25,8 @@ import org.apache.camel.Route;
 import org.apache.camel.TestSupport;
 import org.apache.camel.spring.example.MyProcessor;
 import org.apache.camel.util.IOHelper;
+import org.junit.After;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
index 0713168..aa2bbb5 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
@@ -15,19 +15,18 @@
  * limitations under the License.
  */
 package org.apache.camel.spring;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
 import java.lang.management.ManagementFactory;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+
 import javax.management.MBeanServer;
 import javax.management.MBeanServerConnection;
 import javax.management.MBeanServerFactory;
 import javax.management.ObjectName;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
index 93aaf64..da52e6f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.util.IOHelper;
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
index b270e75..c6ce25d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import javax.management.ObjectName;
 
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java
index 1827a95..a2acb46 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import org.apache.camel.model.ModelHelper;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
index 4cf35b5..979228b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.NoSuchEndpointException;
@@ -25,6 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultRouteContext;
 import org.apache.camel.spi.RouteContext;
 import org.apache.camel.spring.example.DummyBean;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointToIdRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointToIdRefTest.java
index 8e56a2a..dae44dc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointToIdRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointToIdRefTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.spring;
 
 import org.junit.Test;
-
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
index c97e82d..d6a3ad6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
@@ -16,9 +16,7 @@
  */
 package org.apache.camel.spring;
 import org.junit.Before;
-
 import org.junit.Test;
-
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java
index 44f2b55..bbb4cd0 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentPropertiesTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.ManagementAgent;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java
index ae1f9ba..18dac20 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.spring;
-import org.junit.After;
-
 import javax.management.MBeanServerConnection;
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
 
+import org.junit.After;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
index 089ccd6..657159f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.spring;
 
 import org.junit.Test;
-
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/MainDummyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/MainDummyTest.java
index 2e363f3..b00ec67 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/MainDummyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/MainDummyTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.CamelContext;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class MainDummyTest extends Assert {
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/MainExampleTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/MainExampleTest.java
index 3aec182..23ee4eb 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/MainExampleTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/MainExampleTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.example.MyProcessor;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/MainTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/MainTest.java
index b214eb6..a46a997 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/MainTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/MainTest.java
@@ -16,16 +16,15 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import java.util.List;
 
-import org.junit.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.example.MyProcessor;
+import org.junit.Assert;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java
index e21db0f..e93378e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.spring;
 
 import org.junit.Test;
-
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java
index 4a6df44..9bd38e7 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.impl.PropertyPlaceholderDelegateRegistry;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
index 89303d4..2ceacfe 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.spring;
-import org.junit.After;
-
-import org.junit.Test;
-
 import java.util.List;
 
 import org.apache.camel.Exchange;
@@ -29,6 +25,8 @@ import org.apache.camel.Route;
 import org.apache.camel.TestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.util.IOHelper;
+import org.junit.After;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java
index 905d3a8..5097a84 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.spring;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
 import java.io.File;
 
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.java
index 083fd3f..604b693 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownAfterBeanTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.java
index a66fe7d..8d8a01f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringCamelContextShutdownBeforeBeanTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringChangeFunctionStartFunctionEndTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringChangeFunctionStartFunctionEndTest.java
index 3d7afcb..8baa6cf 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringChangeFunctionStartFunctionEndTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringChangeFunctionStartFunctionEndTest.java
@@ -15,11 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.spring;
+import org.apache.camel.language.simple.SimpleLanguage;
 import org.junit.After;
-
 import org.junit.Test;
-
-import org.apache.camel.language.simple.SimpleLanguage;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java
index 567f9b6..fdeed8c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import org.apache.camel.component.seda.SedaEndpoint;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.java
index 7ee10c4..a9d2058 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.LogDebugBodyMaxCharsTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTest.java
index d58bba0..47901e9 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 import org.slf4j.MDC;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java
index b6ab18e..59c772e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.aop;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
index 2f534af..e708d09 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.bind;
 
-import org.junit.Test;
-
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanInfoTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanInfoTest.java
index 7d48608..2777d90 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanInfoTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanInfoTest.java
@@ -15,13 +15,8 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.bind;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.Assert;
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.bean.BeanInfo;
@@ -30,6 +25,9 @@ import org.apache.camel.component.bean.DefaultParameterMappingStrategy;
 import org.apache.camel.component.bean.MethodInvocation;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultExchange;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
index 20e76b7..78fa305 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
@@ -16,15 +16,13 @@
  */
 package org.apache.camel.spring.bind;
 
-import org.junit.Test;
-
 import java.util.List;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.NoSuchEndpointException;
 import org.apache.camel.spring.SpringTestSupport;
-
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/AnotherCamelProxyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/AnotherCamelProxyTest.java
index d8a2e78..30c2edb 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/AnotherCamelProxyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/AnotherCamelProxyTest.java
@@ -16,11 +16,9 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
-import org.junit.Assert;
-
 import org.apache.camel.util.IOHelper;
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
index ca2caf7..19bdb04 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
@@ -15,15 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.config;
-import org.junit.After;
-
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.util.IOHelper;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java
index 2af2bad..16c29cd 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java
@@ -15,11 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.config;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
 import java.util.List;
 
 import org.apache.camel.CamelContext;
@@ -30,6 +25,9 @@ import org.apache.camel.impl.EventDrivenConsumerRoute;
 import org.apache.camel.management.JmxSystemPropertyKeys;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.util.IOHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.support.AbstractApplicationContext;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelPropertiesTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelPropertiesTest.java
index 1e409d8..f6aeb63 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelPropertiesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelPropertiesTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
index cb5bafd..6a92167 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.TestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.util.IOHelper;
+import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyUsingRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyUsingRefTest.java
index 9471cdb..0d6f45f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyUsingRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyUsingRefTest.java
@@ -16,11 +16,9 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
-import org.junit.Assert;
-
 import org.apache.camel.util.IOHelper;
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelSpringPackageTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelSpringPackageTest.java
index 575b09b..8de28d7 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelSpringPackageTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelSpringPackageTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DefaultPackageResolverConfigureTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/DefaultPackageResolverConfigureTest.java
index 53cf1ab..4691391 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DefaultPackageResolverConfigureTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/DefaultPackageResolverConfigureTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.impl.DefaultPackageScanClassResolver;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
index fb6f0de..121358d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
 import org.apache.camel.util.ServiceHelper;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
index 5479b78..5a96ebb 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.config;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
index c79ee08..e0816f7 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.config;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
index 4508669..b30438e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import java.util.List;
 
 import org.apache.camel.Channel;
@@ -27,6 +25,7 @@ import org.apache.camel.processor.DeadLetterChannel;
 import org.apache.camel.processor.RedeliveryPolicy;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.java
index 1ddc31f..4e51e6a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OnExceptionNoExceptionConfiguredTest.java
@@ -15,11 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.config;
+import org.apache.camel.spring.SpringTestSupport;
 import org.junit.Before;
-
 import org.junit.Test;
-
-import org.apache.camel.spring.SpringTestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandlerTest.java
index e911856..1af41b9 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndDLCErrorHandlerTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandlerTest.java
index 2ce7c9d..8f21c6f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionAndTwoDLCErrorHandlerTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionTest.java
index fb2eacb..1de9e06 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefOnExceptionTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
index a382449..a02d09f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionTest.java
index 9eb60a4..caea201 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/OneRouteRefReverseOnExceptionTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java
index cc4aed3..8b0a34b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java
@@ -15,15 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.config;
-import org.junit.After;
-
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.util.IOHelper;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java
index 45a82c9..9e5a5b2 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java
index 4dda0d7..4999245 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.util.IOHelper;
+import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.java
index adcb886..6d07ceb 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java
index 7a3bbbe..2c6936a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRefsTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRefsTest.java
index a12c81c..6f21d2b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRefsTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRefsTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.java
index acab2a5..6e65e48 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleRoutesTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.java
index fd39e3b..24ec413 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefTest.java
index 6dc8ff2..ffa2e66 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
index 94bad56..1384456 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.ThreadPoolRejectedPolicy;
 import org.apache.camel.spi.ThreadPoolProfile;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java
index 5f8e1c0..188bb13 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ThreadPoolRejectedPolicy;
 import org.apache.camel.spi.ThreadPoolProfile;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java
index 2d1b0c0..72876fc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java
index e5a763c..690aea0 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java
index 4854a82..e91f332 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ThreadPoolRejectedPolicy;
 import org.apache.camel.spi.ThreadPoolProfile;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java
index dae3066..b96c211 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -26,6 +24,7 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.ThreadPoolRejectedPolicy;
 import org.apache.camel.spi.ThreadPoolProfile;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.java
index bdfccb8..62b15df 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringErrorHandlerConfigTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java
index f44f789..3e0696c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java
index 03a43f2..666296d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoFromTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoFromTest.java
index 8e81c7a..6244e7b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoFromTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoFromTest.java
@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.config;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoOutputTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoOutputTest.java
index 0050957..4687dc7 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoOutputTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringRouteNoOutputTest.java
@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.config;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandlerTest.java
index f56e508..68e1289 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionAndDLCErrorHandlerTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionTest.java
index dde0137..21c3e1a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefOnExceptionTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
index 77e1050..c2e6e92 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionTest.java
index daac0da..7a081ba 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/TwoRouteRefReverseOnExceptionTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.config;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/RouteExclusionFromWithinSpringTestSupportTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/RouteExclusionFromWithinSpringTestSupportTest.java
index 45449ca..ab90ece 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/RouteExclusionFromWithinSpringTestSupportTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/RouteExclusionFromWithinSpringTestSupportTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.config.scan;
 
-import org.junit.Test;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
 import org.apache.camel.spring.config.scan.route.MyExcludedRouteBuilder;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java
index 90113f3..c39a391 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java
@@ -15,17 +15,15 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.config.scan;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.util.IOHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java
index 443ccce..bb31e90 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java
@@ -16,15 +16,13 @@
  */
 
 package org.apache.camel.spring.config.scan;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.util.IOHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverseTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverseTest.java
index 7541245..9f5411a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverseTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerReverseTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.contextscan;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerTest.java
index fa022f1..f4de4d6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/contextscan/ContextScanOnExceptionAndDLCErrorHandlerTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.contextscan;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/converter/ResourceConverterTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/converter/ResourceConverterTest.java
index 448ac2b..e644c31 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/converter/ResourceConverterTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/converter/ResourceConverterTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.spring.converter;
 
-import org.junit.Test;
-
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -27,6 +25,7 @@ import org.apache.camel.TypeConverter;
 import org.apache.camel.converter.IOConverter;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
index 3cd4a46..a3f3e7d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
@@ -15,13 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.example;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventRouteTest.java
index 9feb152..b717d47 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventRouteTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.example;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
index d376fd9..76d63f8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.example;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoDualCamelContextConsumerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoDualCamelContextConsumerTest.java
index 307720a..648199d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoDualCamelContextConsumerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoDualCamelContextConsumerTest.java
@@ -15,15 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.example;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.TestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
index 4c0551c..5c1cdb5 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
@@ -15,13 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.example;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
index aec21d1..705976c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.example;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java
index ff8c01c..cd02295 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java
@@ -16,11 +16,9 @@
  */
 package org.apache.camel.spring.example;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
-
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringExpressionTrimTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringExpressionTrimTest.java
index cdc28e5..c1e8490 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringExpressionTrimTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringExpressionTrimTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.example;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java
index c98da3c..f846026 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java
@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.file;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
index a74da78..93981e4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
@@ -15,12 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.handler;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.DeadLetterChannelBuilder;
@@ -29,6 +23,10 @@ import org.apache.camel.builder.LoggingErrorHandlerBuilder;
 import org.apache.camel.processor.RedeliveryPolicy;
 import org.apache.camel.spring.spi.TransactionErrorHandlerBuilder;
 import org.apache.camel.util.IOHelper;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class ErrorHandlerDefinitionParserTest extends Assert {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.java
index 4472780..ab88fe7 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringProduceConsumeImplicitPropertyTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.impl;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java
index c4cd5e3..4a6b2b0 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java
@@ -15,15 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.interceptor;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.TestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java
index c0f384a..b15c38b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
index 8114893..6324f80 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
@@ -15,16 +15,14 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.interceptor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import javax.sql.DataSource;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringRouteBuilder;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedStreamCachingInterceptorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedStreamCachingInterceptorTest.java
index 42bfea3..ca25ef7 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedStreamCachingInterceptorTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedStreamCachingInterceptorTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import java.io.StringReader;
+
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.camel.CamelContext;
@@ -26,6 +25,8 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.StreamCache;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
index a6ab8eb..e5ef463 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
@@ -15,16 +15,14 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.interceptor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import javax.sql.DataSource;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringRouteBuilder;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/NoStreamCachingInterceptorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/NoStreamCachingInterceptorTest.java
index 0a431d3..e839c5d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/NoStreamCachingInterceptorTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/NoStreamCachingInterceptorTest.java
@@ -16,15 +16,16 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import java.io.StringReader;
+
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.java
index 32db59a..1fb1d0e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringAdviceWithTwoRoutesOnExceptionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.interceptor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.interceptor.AdviceWithTwoRoutesOnExceptionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java
index 2a254b9..ef0a36c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.interceptor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import javax.sql.DataSource;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithOnExceptionAndRollbackUsingTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithOnExceptionAndRollbackUsingTransactedTest.java
index f713e1b..dfed053 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithOnExceptionAndRollbackUsingTransactedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataWithOnExceptionAndRollbackUsingTransactedTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
index 3cbdedf..13fbbbc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import java.io.StringReader;
+
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.camel.CamelContext;
@@ -26,6 +25,7 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.StreamCache;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TraceFormatterTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TraceFormatterTest.java
index bb7a7f5..7c30a6a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TraceFormatterTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TraceFormatterTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TracerConfigurationTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TracerConfigurationTest.java
index 4decf01..3b8c94c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TracerConfigurationTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TracerConfigurationTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java
index 7952c62..7de4e3e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringRouteBuilder;
+import org.junit.Test;
 
 /**
  * Easier transaction configuration as we do not have to setup a transaction error handler
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
index d75e6f6..c2b67a1 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.async.MyAsyncComponent;
 import org.apache.camel.spring.SpringRouteBuilder;
 import org.apache.camel.spring.spi.SpringTransactionPolicy;
+import org.junit.Test;
 
 /**
  * Unit test to demonstrate the transactional client pattern.
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java
index 2355725..e302783 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringRouteBuilder;
+import org.junit.Test;
 
 /**
  * Unit test to demonstrate the transactional client pattern.
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java
index 5300d83..a2c2a72 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.interceptor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import javax.sql.DataSource;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java
index 0705923..c0acea2 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringRouteBuilder;
+import org.junit.Test;
 
 /**
  * Same route but not transacted
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java
index 98f58e7..f586b75 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringRouteBuilder;
+import org.junit.Test;
 
 /**
  * Same route but not transacted
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java
index 5a49bf2..b257c67 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringRouteBuilder;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java
index ea962ba..05f1b83 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringRouteBuilder;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
index cdab36d..5a8fca5 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringRouteBuilder;
 import org.apache.camel.spring.spi.SpringTransactionPolicy;
+import org.junit.Test;
 
 /**
  * Unit test to demonstrate the transactional client pattern.
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
index f131fa1..b867899 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringRouteBuilder;
+import org.junit.Test;
 
 import static org.awaitility.Awaitility.await;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
index 93a237a..dfa4547 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
@@ -15,15 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.interceptor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringRouteBuilder;
+import org.junit.Before;
+import org.junit.Test;
 
 import static org.awaitility.Awaitility.await;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java
index 8406b13..c1cea31 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringRouteBuilder;
 import org.apache.camel.spring.spi.SpringTransactionPolicy;
+import org.junit.Test;
 
 /**
  * Unit test to demonstrate the transactional client pattern.
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java
index 41dff36..6a215f5 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringRouteBuilder;
+import org.junit.Test;
 
 /**
  * Unit test to demonstrate the transactional client pattern.
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java
index 21ca922..4b4ecc3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.RollbackExchangeException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringRouteBuilder;
 import org.apache.camel.spring.spi.SpringTransactionPolicy;
+import org.junit.Test;
 
 /**
  * Unit test to demonstrate the transactional client pattern.
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java
index 9661203..916d642 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.interceptor;
 
-import org.junit.Test;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringRouteBuilder;
 import org.apache.camel.spring.spi.SpringTransactionPolicy;
+import org.junit.Test;
 
 /**
  * Unit test to demonstrate the transactional client pattern.
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithSpringRouteBuilderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithSpringRouteBuilderTest.java
index e98a523..0885411 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithSpringRouteBuilderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithSpringRouteBuilderTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.spring.interceptor;
 import org.junit.Before;
-
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithAnnotatedBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithAnnotatedBeanTest.java
index 2d263bc..d8415a4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithAnnotatedBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithAnnotatedBeanTest.java
@@ -15,11 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.interceptor;
+import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
-
 import org.junit.Test;
-
-import org.apache.camel.component.mock.MockEndpoint;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
index 1da4c8c..58a033d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.interceptor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import javax.sql.DataSource;
 
 import org.apache.camel.RollbackExchangeException;
@@ -27,6 +23,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringRouteBuilder;
 import org.apache.camel.spring.SpringTestSupport;
 import org.apache.camel.spring.spi.SpringTransactionPolicy;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.java
index bcf9763..8ba2494 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.java
@@ -18,13 +18,14 @@ package org.apache.camel.spring.issues;
 
 import java.io.File;
 import java.io.StringWriter;
+
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
-import org.junit.Assert;
 import org.apache.camel.spring.CamelContextFactoryBean;
 import org.apache.camel.spring.SpringModelJAXBContextFactory;
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.java
index a05e309..5a71957 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CamelRouteRefInjectionIssueTest.java
@@ -17,10 +17,9 @@
 
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
index 2deed95..d7ae64f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.model.ChoiceDefinition;
 import org.apache.camel.model.FromDefinition;
 import org.apache.camel.model.LogDefinition;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.WhenDefinition;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java
index 9f152cd..f38c357 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java
@@ -15,13 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.issues;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java
index eef287e..e3ec719 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java
@@ -16,13 +16,11 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
-import org.junit.Assert;
-
 import org.apache.camel.CamelException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.Main;
+import org.junit.Assert;
+import org.junit.Test;
 
 import static org.apache.camel.TestSupport.assertIsInstanceOf;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java
index aab7fee..76b2743 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java
index 8e777a9..d790222 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
index c0c366e..7aaa39d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.AdviceWithRouteBuilder;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCatchNestedFailTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCatchNestedFailTest.java
index a8d8792..060d2a9 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCatchNestedFailTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCatchNestedFailTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java
index 9d8475f..ecb8e1c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.issues;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.issues.CharlesSplitAndTryCatchRollbackIssueTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.java
index ae18a36..b397438 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringFinallyNestedFailTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.java
index 5c64857..0926252 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanCamelContextScanIssueTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.java
index 541f10f..4576bef 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInstanceFactoryBeanIssueTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
index 14a1417..f063083 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.TestSupport;
 import org.apache.camel.spring.Main;
+import org.junit.Test;
 
 public class SpringMainStartFailedIssueTest extends TestSupport {
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPackageTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPackageTest.java
index 7a71686..85d838d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPackageTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPackageTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java
index 3b56624..fe0f397 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.java
index e777eab..fe50426 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderIssueTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java
index 32747c2..5f9a472 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java
@@ -15,13 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.issues;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.java
index 5d920e7..f863034 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSingletonScopedBeanIssueTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.java
index a187f07..f1e9bcc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringSplitterDetermineErrorHandlerIssueTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java
index d85ae9f..ed40631 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java
@@ -15,15 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.issues;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import javax.sql.DataSource;
 
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.java
index 038ff50..dc63f57 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.java
index 1154732..36ce2a1 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitIssueTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.issues;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.issues.TryCatchWithSplitIssueTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitNotHandledIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitNotHandledIssueTest.java
index 18b4482..8005518 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitNotHandledIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryCatchWithSplitNotHandledIssueTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.issues;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.issues.TryCatchWithSplitNotHandledIssueTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryNestedFailTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryNestedFailTest.java
index d9f8ac1..c10a11d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryNestedFailTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTryNestedFailTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java
index 67e06f1..35cfca3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/StringDataFormatTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/StringDataFormatTest.java
index 0ad6c73..6911d95 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/StringDataFormatTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/StringDataFormatTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.issues;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.java
index dcc1442..6a6425f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan/SpringRouteIsComponentAnnotatedTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.issues.contextscan;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.java
index 234a943..1d3a5f2 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan2/SpringRouteIsComponentAnnotated2Test.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.issues.contextscan2;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/packagescan/SkipNonPublicRouteBuilderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/packagescan/SkipNonPublicRouteBuilderTest.java
index 16d40c6..034a349 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/packagescan/SkipNonPublicRouteBuilderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/packagescan/SkipNonPublicRouteBuilderTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.issues.packagescan;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
index f270160..fddc18e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import java.util.Iterator;
 import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
index ccc6a47..ed8af44 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java
index 1af9487..ad63cb4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import org.apache.camel.management.DefaultManagementAgent;
 import org.apache.camel.spi.ManagementAgent;
 import org.apache.camel.spring.EndpointReferenceTest;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
index e74c4b8..ef555e3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
@@ -16,15 +16,15 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import java.util.Iterator;
 import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
index 61aa234..24e6337 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
@@ -16,15 +16,15 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import java.util.Iterator;
 import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
index 920272b..4788018 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.ResolveEndpointFailedException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
index 2160520..c4cc5a8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
index 3fe4514..ea84bef 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
index 4c25a98..1bf358c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
index 24ce9f1..8939a25 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
index c1e7394..be0281b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
index ffaa559..c873961 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
index 7bce850..42051ea 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
index a28fb5c..73b93f8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
index d661362..fedf597 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.management;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import javax.management.openmbean.TabularData;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
index ff5e6db..191fcca 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import javax.management.Attribute;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
@@ -25,6 +23,7 @@ import javax.management.ObjectName;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.java
index ee49974..1eb5f78 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.management;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.management.ManagedErrorHandlerTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
index 1181a32..b392810 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
index 31b6829..bbe9b7d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.management;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.management.ManagedStatisticsLevelOffTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
index d4ba03a..90ce3a6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.management;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.management.ManagedStatisticsLevelRoutesOnlyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
index 4251a51..82caad2 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.spring.management;
 
-import org.junit.Test;
-
 import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java
index c3ec6c2..12d4a81 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.mock;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.ApplicationContextTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.java
index a327122..c4f2d56 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.mock;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java
index 378c0fc..a3ffd0a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.pollingconsumer;
-import org.junit.Before;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java
index 376cebf..bbc0302 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.postprocessor;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java
index d291609..f4d3e79 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.postprocessor;
 
-import org.junit.Test;
-
 import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
index e8ddfae..8aac06c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java
index 2336803..f190f59 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
 
 /**
  *
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAfterFinallyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAfterFinallyTest.java
index 9b4c77a..3fa87b6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAfterFinallyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAfterFinallyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.AOPAfterFinallyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAfterTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAfterTest.java
index 5310818..3c0ac7b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAfterTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAfterTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.AOPAfterTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAroundFinallyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAroundFinallyTest.java
index f1b45f1..5ef6283 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAroundFinallyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPAroundFinallyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.AOPAroundFinallyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPBeforeTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPBeforeTest.java
index 0cce85f..f68ada3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPBeforeTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPBeforeTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.AOPBeforeTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPNestedRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPNestedRouteTest.java
index d4e070d..056efcf 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPNestedRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAOPNestedRouteTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.AOPNestedRouteTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomStrategyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomStrategyTest.java
index 7709009..154c2f6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomStrategyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomStrategyTest.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCBRHeaderPredicateTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCBRHeaderPredicateTest.java
index 68a3785..2c65dfb 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCBRHeaderPredicateTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCBRHeaderPredicateTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.CBRHeaderPredicateTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringChoiceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringChoiceTest.java
index 0a70113..039907a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringChoiceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringChoiceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.ChoiceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
index 18127d7..b796932 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
+import org.junit.Test;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringConvertBodyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringConvertBodyTest.java
index ea1d6b3..e471d11 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringConvertBodyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringConvertBodyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.ConvertBodyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringConvertBodyTest extends ConvertBodyTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java
index 40f38b7..34d5f40 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomPredicateTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomPredicateTest.java
index c140c0b..d0319fc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomPredicateTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomPredicateTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Predicate;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
index fe8673a..0dd6d6a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.NoSuchEndpointException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
index e0c5dc2..07a90bc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.ResolveEndpointFailedException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.java
index c6c989b..5822394 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyNewTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.DeadLetterChannelUseOriginalInBodyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.java
index 4b948b8..cfc82c3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.DeadLetterChannelUseOriginalInBodyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyWithFileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyWithFileTest.java
index 76c594e..9050366 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyWithFileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyWithFileTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.DeadLetterChannelUseOriginalInBodyWithFileTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerOnExceptionTraceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerOnExceptionTraceTest.java
index f73deef..b5935e6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerOnExceptionTraceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerOnExceptionTraceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.DefaultErrorHandlerOnExceptionTraceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringDefaultErrorHandlerOnExceptionTraceTest extends DefaultErrorHandlerOnExceptionTraceTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerPerRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerPerRouteTest.java
index cdd2eee..a01ee87 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerPerRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerPerRouteTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.DelayerPerRouteTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerTest.java
index 35702b6..c6516d6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDelayerTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.DelayerTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringDelayerTest extends DelayerTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
index 26255f7..523dd88 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.RuntimeCamelException;
+import org.junit.Before;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherRefTest.java
index 676d8f9..c4a1d19 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherRefTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
+import org.junit.Test;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringEnricherRefTest extends ContextTestSupport {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherTest.java
index c6c6111..cf9090c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringEnricherTest.java
@@ -15,13 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.java
index 1b67b11..4d3a4dd 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringErrorHandlerRedeliveryPolicyProfileTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java
index 8ec9765..b58d92e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFaultRouteTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.FaultRouteTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
index 96dc405..0fb3dcd 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
@@ -15,13 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterTest.java
index 102d29e..f3cf9fd 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.FilterTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromEndpointTest.java
index 261d34d..f5cd477 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromEndpointTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.FromEndpointTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromMultipleEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromMultipleEndpointTest.java
index ab9e7d5..e704e31 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromMultipleEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFromMultipleEndpointTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.FromMultipleEndpointTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringHandleFaultPerRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringHandleFaultPerRouteTest.java
index 9ff14eb..0052e3f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringHandleFaultPerRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringHandleFaultPerRouteTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.HandleFaultPerRouteTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.java
index 6da965f..da7e017 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateFilterTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.java
index a1e0355..8d94cb7 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerNoSkipDuplicateTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.java
index 5a5d82b..ac3e6f5 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringIdempotentConsumerTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromTest.java
index 100dea8..2963fce 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromTest.java
@@ -16,12 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.java
index 259e2af..d9372ee 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriRegexTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptFromUriRegexTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringInterceptFromUriRegexTest extends InterceptFromUriRegexTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.java
index ed30d8f..a078756 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriSimpleLogTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptFromUriSimpleLogTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringInterceptFromUriSimpleLogTest extends InterceptFromUriSimpleLogTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.java
index 550b848..4b3cea4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromUriWildcardTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptFromUriWildcardTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringInterceptFromUriWildcardTest extends InterceptFromUriWildcardTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.java
index a77aa0c..cefcb42 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenNoStopTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptFromWhenNoStopTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringInterceptFromWhenNoStopTest extends InterceptFromWhenNoStopTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.java
index 94d9862..c5d48ba 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptFromWhenTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringInterceptFromWhenTest extends InterceptFromWhenTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.java
index 9f070a0..417f1c9 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWhenWithChoiceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptFromWhenWithChoiceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringInterceptFromWhenWithChoiceTest extends InterceptFromWhenWithChoiceTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.java
index af813b0..079fb2a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptFromWithStopTest.java
@@ -16,12 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointDynamicTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointDynamicTest.java
index f35d031..51d65d3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointDynamicTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointDynamicTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
+import org.junit.Test;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointInOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointInOnExceptionTest.java
index 8207818..7d2bd84 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointInOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointInOnExceptionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptSendToEndpointInOnException;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointSkipTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointSkipTest.java
index 2afbbfc..63e1399 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointSkipTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointSkipTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
+import org.junit.Test;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointTest.java
index 22eb465..2dbe682 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
+import org.junit.Test;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointWhenTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointWhenTest.java
index 845bb82..015014b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointWhenTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSendToEndpointWhenTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
+import org.junit.Test;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.java
index c3c484b..2ae7549 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteStopTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptSimpleRouteStopTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringInterceptSimpleRouteStopTest extends InterceptSimpleRouteStopTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.java
index 8074d1b..d32708d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptSimpleRouteTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringInterceptSimpleRouteTest extends InterceptSimpleRouteTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTraceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTraceTest.java
index 973e88a..d43c5e2 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTraceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteTraceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptSimpleRouteTraceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringInterceptSimpleRouteTraceTest extends InterceptSimpleRouteTraceTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.java
index 3964167..2d681c3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenStopTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptSimpleRouteWhenStopTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringInterceptSimpleRouteWhenStopTest extends InterceptSimpleRouteWhenStopTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.java
index 909fc66..885655b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringInterceptSimpleRouteWhenTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.intercept.InterceptSimpleRouteWhenTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringInterceptSimpleRouteWhenTest extends InterceptSimpleRouteWhenTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopDoWhileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopDoWhileTest.java
index 4a3c2ff..077f77b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopDoWhileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopDoWhileTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.LoopDoWhileTest;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
index 8596ecc..2bf4ae1 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMarkRollbackOnlyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMarkRollbackOnlyTest.java
index b424ae2..1158c03 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMarkRollbackOnlyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMarkRollbackOnlyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.MarkRollbackOnlyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringMarkRollbackOnlyTest extends MarkRollbackOnlyTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMethodCallTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMethodCallTest.java
index 164757c..9256482 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMethodCallTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMethodCallTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.java
index dac3c12..faf56fb 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastNoStopOnExceptionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.MulticastNoStopOnExceptionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.java
index 70e1c06..a35ca43 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastStopOnExceptionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.MulticastStopOnExceptionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringNormalizerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringNormalizerTest.java
index aacb506..77a77af 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringNormalizerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringNormalizerTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.NormalizerTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringNormalizerTest extends NormalizerTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.java
index 5d0bba1..4b73bdf 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.OnCompletionAndInterceptAndOnExceptionGlobalTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.java
index 3aec97f..2483143 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptGlobalTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.OnCompletionAndInterceptGlobalTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.java
index 0446935..bb3b580 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionAndInterceptTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.OnCompletionAndInterceptTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.java
index e7d9644..51887e8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.OnCompletionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTraceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTraceTest.java
index 8996aea..3ae31bd 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTraceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionGlobalTraceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.OnCompletionGlobalTraceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringOnCompletionGlobalTraceTest extends OnCompletionGlobalTraceTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.java
index 62dae78..0208626 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnCompleteOnlyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.OnCompletionOnCompleteOnlyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.java
index cc5200d..52eaf3e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionOnFailureOnlyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.OnCompletionOnFailureOnlyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.java
index 7c86441..27d7ed8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionRouteScopeOverrideGlobalScopeTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.OnCompletionRouteScopeOverrideGlobalScopeTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionTest.java
index 4f997e1..c09a7be 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.OnCompletionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.java
index 56ba036..2264125 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringOnCompletionWhenTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.OnCompletionWhenTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherRefTest.java
index be0f7fe..c5f4386 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherRefTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.enricher.PollEnricherTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringPollEnricherRefTest extends PollEnricherTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherTest.java
index edf551f..91cfc12 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringPollEnricherTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.enricher.PollEnricherTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringPollEnricherTest extends PollEnricherTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRandomLoadBalanceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRandomLoadBalanceTest.java
index 557cd8a..b0cfb00 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRandomLoadBalanceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRandomLoadBalanceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RandomLoadBalanceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRandomLoadBalanceTest extends RandomLoadBalanceTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListIgnoreInvalidEndpointsTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListIgnoreInvalidEndpointsTest.java
index 1e0f1eb..a086046 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListIgnoreInvalidEndpointsTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListIgnoreInvalidEndpointsTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RecipientListIgnoreInvalidEndpointsTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRecipientListIgnoreInvalidEndpointsTest extends RecipientListIgnoreInvalidEndpointsTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithArrayHeaderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithArrayHeaderTest.java
index 39a4718..ae57d73 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithArrayHeaderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithArrayHeaderTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RecipientListWithArrayHeaderTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRecipientListWithArrayHeaderTest extends RecipientListWithArrayHeaderTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java
index df2d901..556dfc8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RecipientListWithStringDelimitedHeaderTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRecipientListWithStringDelimitedHeaderTest extends RecipientListWithStringDelimitedHeaderTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeaderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeaderTest.java
index ade1ca3..fe73e54 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeaderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemoveHeaderTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RemoveHeaderTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRemoveHeaderTest extends RemoveHeaderTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithExclusionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithExclusionTest.java
index f28d6f2..f981079 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithExclusionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithExclusionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RemovePropertiesWithExclusionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRemovePropertiesWithExclusionTest extends RemovePropertiesWithExclusionTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithoutExclusionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithoutExclusionTest.java
index e4523f7..9453dc4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithoutExclusionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertiesWithoutExclusionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RemovePropertiesWithoutExclusionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRemovePropertiesWithoutExclusionTest extends RemovePropertiesWithoutExclusionTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertyTest.java
index 29ff801..aa3cb2d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRemovePropertyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RemovePropertyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRemovePropertyTest extends RemovePropertyTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringResequencerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringResequencerTest.java
index e6b14c7..cb27d35 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringResequencerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringResequencerTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.ResequencerTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoundRobinLoadBalanceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoundRobinLoadBalanceTest.java
index 3d183ad..32fbb21 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoundRobinLoadBalanceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoundRobinLoadBalanceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RoundRobinLoadBalanceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRoundRobinLoadBalanceTest extends RoundRobinLoadBalanceTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.java
index d5adddf..d77d251 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteContextProduceBeanTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteNoAutoStartupTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteNoAutoStartupTest.java
index d470fd5..12447ce 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteNoAutoStartupTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteNoAutoStartupTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RouteNoAutoStartupTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutePoliciesTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutePoliciesTest.java
index db975fd..f4dbf52 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutePoliciesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutePoliciesTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Route;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
 import org.apache.camel.support.RoutePolicySupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderSimpleTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderSimpleTest.java
index 04754ad..1c94885 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderSimpleTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderSimpleTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RouteStartupOrderSimpleTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderTest.java
index cd2fa21..fe3ea30 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RouteStartupOrderTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderWithDefaultTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderWithDefaultTest.java
index 353c5ab..f6b596d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderWithDefaultTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStartupOrderWithDefaultTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RouteStartupOrderWithDefaultTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStopTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStopTest.java
index 026b639..c1f1e78 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStopTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteStopTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RouteStopTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRouteStopTest extends RouteStopTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteTopLevelMisconfiguredTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteTopLevelMisconfiguredTest.java
index 3d2b64a..3cd31af 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteTopLevelMisconfiguredTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteTopLevelMisconfiguredTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.RuntimeCamelException;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java
index 250f236..97de57e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.processor.RouteWithConstantFieldFromExchangeFailTest;
+import org.junit.Before;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipIgnoreInvalidEndpointsTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipIgnoreInvalidEndpointsTest.java
index f1fa58b..119fc47 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipIgnoreInvalidEndpointsTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipIgnoreInvalidEndpointsTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.routingslip.RoutingSlipIgnoreInvalidEndpointsTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRoutingSlipIgnoreInvalidEndpointsTest extends RoutingSlipIgnoreInvalidEndpointsTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipTest.java
index 46c7ce1..d1329d0 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRoutingSlipTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.routingslip.RoutingSlipTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringRoutingSlipTest extends RoutingSlipTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java
index d417968..2a23566 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java
index d9efcc5..24df7d7 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
 import org.apache.camel.util.concurrent.SizedScheduledExecutorService;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptExternalTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptExternalTest.java
index 5cced95..6960bb3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptExternalTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptExternalTest.java
@@ -15,13 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptTest.java
index 9002a51..79d7bec 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScriptTest.java
@@ -15,13 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetBodyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetBodyTest.java
index 2d60c93..6943084 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetBodyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetBodyTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternTest.java
index b36724a2..dd88881 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternTest.java
@@ -20,6 +20,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.SetExchangePatternTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java
index c7a5896..334195d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java
@@ -17,10 +17,9 @@
 
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.SetExchangePatternTest;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetFaultBodyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetFaultBodyTest.java
index 0c97991..b7cfd2a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetFaultBodyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetFaultBodyTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderNameDynamicTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderNameDynamicTest.java
index 7445e21..e66bc1b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderNameDynamicTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderNameDynamicTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderTest.java
index 931f010..33048df 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest.java
index 113dce1..ad941bc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderWithConstantTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.java
index 609f80b..e8948ae 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetHeaderXPathResultTypeTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetOutHeaderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetOutHeaderTest.java
index 2d95a3e..82a5254 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetOutHeaderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetOutHeaderTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetOutHeaderWithConstantTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetOutHeaderWithConstantTest.java
index 1cf31ac..1fec5e1 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetOutHeaderWithConstantTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetOutHeaderWithConstantTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyNameDynamicTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyNameDynamicTest.java
index f31137e..3773239 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyNameDynamicTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyNameDynamicTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyTest.java
index 754ab12..cb0a66a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetPropertyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.SetPropertyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringSetPropertyTest extends SetPropertyTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortBodyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortBodyTest.java
index 61d19f4..1a82bfc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortBodyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortBodyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.SortBodyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringSortBodyTest extends SortBodyTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortExpressionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortExpressionTest.java
index 7c737ee..1577d62 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortExpressionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSortExpressionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.SortExpressionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringSortExpressionTest extends SortExpressionTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterBodyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterBodyTest.java
index 5f26072..f2fae53 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterBodyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterBodyTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterMethodCallTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterMethodCallTest.java
index 8475d86..d0c7e62 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterMethodCallTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterMethodCallTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.SplitterMethodCallTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.java
index 4d2c2b9..e1e4be8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterNoStopOnExceptionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.SplitterNoStopOnExceptionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.java
index 2336c98..c5437cf 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterStopOnExceptionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.SplitterStopOnExceptionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStaticRecipientListTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStaticRecipientListTest.java
index b879237..1204e63 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStaticRecipientListTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStaticRecipientListTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.StaticRecipientListTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringStaticRecipientListTest extends StaticRecipientListTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStickyLoadBalanceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStickyLoadBalanceTest.java
index 0a9402b..a9d76fb 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStickyLoadBalanceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStickyLoadBalanceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.StickyLoadBalanceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringStickyLoadBalanceTest extends StickyLoadBalanceTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingPerRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingPerRouteTest.java
index d9b9317..a0a654e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingPerRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStreamCachingPerRouteTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.StreamCachingPerRouteTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadNamePatternTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadNamePatternTest.java
index d2f3644..adcf3ba 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadNamePatternTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadNamePatternTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsCorePoolTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsCorePoolTest.java
index d4e8b04..0e6cd7d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsCorePoolTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThreadsCorePoolTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerGroupingTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerGroupingTest.java
index 7d82398..2497e34 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerGroupingTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerGroupingTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.ThrottlingGroupingTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringThrottlerGroupingTest extends ThrottlingGroupingTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerTest.java
index c0eabf2..f9a9042 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlerTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.ThrottlerTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringThrottlerTest extends ThrottlerTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlingInflightRoutePolicyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlingInflightRoutePolicyTest.java
index ad6c7d5..90e1a88 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlingInflightRoutePolicyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrottlingInflightRoutePolicyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.ThrottlingInflightRoutePolicyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionTest.java
index 1decdbe..c61b44d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringThrowExceptionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.ThrowExceptionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
                                   
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTokenizerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTokenizerTest.java
index ad7558c..dc2ee66 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTokenizerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTokenizerTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.SplitterMethodCallTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTopicLoadBalanceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTopicLoadBalanceTest.java
index a634b4b..9d9ae03 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTopicLoadBalanceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTopicLoadBalanceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.TopicLoadBalanceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringTopicLoadBalanceTest extends TopicLoadBalanceTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java
index a232e03..6ce0502 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.TraceInterceptorWithOutBodyTraceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringTraceInterceptorWithOutBodyTraceTest extends TraceInterceptorWithOutBodyTraceTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTracePerRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTracePerRouteTest.java
index 0444cc3..ae2b1c4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTracePerRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTracePerRouteTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.TracePerRouteTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTransformTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTransformTest.java
index c027c85..38bd1fc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTransformTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTransformTest.java
@@ -16,12 +16,10 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
index d9541c7..f10b14c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.RuntimeCamelException;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
index f3c641b..efbd16b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.RuntimeCamelException;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorHandledTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorHandledTest.java
index 860cf20..065d67c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorHandledTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorHandledTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.TryProcessorHandledTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringTryProcessorHandledTest extends TryProcessorHandledTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.java
index b4acce4..698f5ee 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorMultipleExceptionTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.TryProcessorMultipleExceptionTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringTryProcessorMultipleExceptionTest extends TryProcessorMultipleExceptionTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.java
index b7eed39..74228d9 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryProcessorOnWhenTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.TryProcessorOnWhenTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringTryProcessorOnWhenTest extends TryProcessorOnWhenTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRandomLoadBalanceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRandomLoadBalanceTest.java
index 65ce688..e35dd19 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRandomLoadBalanceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRandomLoadBalanceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RandomLoadBalanceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringWeightedRandomLoadBalanceTest extends RandomLoadBalanceTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRoundRobinLoadBalanceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRoundRobinLoadBalanceTest.java
index 4c66eed..1fdcc4e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRoundRobinLoadBalanceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWeightedRoundRobinLoadBalanceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.RandomLoadBalanceTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringWeightedRoundRobinLoadBalanceTest extends RandomLoadBalanceTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapTest.java
index 3a87774..e1f1611 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.WireTapTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringWireTapTest extends WireTapTest {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.java
index 8aad21f..c9328b1 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetCopyTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java
index a415719..2753247 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 public class SpringWireTapUsingFireAndForgetTest extends ContextTestSupport {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterTest.java
index 36a792f..265e41e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.XPathFilterTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnImportRouteContextTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnImportRouteContextTest.java
index 0424bd3..e2756b2 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnImportRouteContextTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnImportRouteContextTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.XPathFilterTest;
+import org.junit.Before;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnRouteContextTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnRouteContextTest.java
index 9f176d3..a3082e4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnRouteContextTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceOnRouteContextTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.XPathFilterTest;
+import org.junit.Before;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceTest.java
index c3ace5f4..b6de6aa 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathFilterWithNamespaceTest.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.XPathFilterTest;
+import org.junit.Before;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderTest.java
index 90587f0..82cf4bd 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringXPathHeaderTest.java
@@ -17,12 +17,10 @@
 
 package org.apache.camel.spring.processor;
 
-import org.junit.Test;
-
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
index f06fb0e..87f376f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java
index 3dab7ab..4c7d708 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregatorTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor.aggregator;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.aggregator.AggregatorTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.java
index 7517aca..f21cf7e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/async/SpringAsyncDeadLetterChannelExecutorServiceRefTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.processor.async;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
index 7218f67..0b5171f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor.idempotent;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import java.io.File;
 import java.io.FileOutputStream;
 
@@ -28,6 +24,8 @@ import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.IdempotentRepository;
 import org.apache.camel.util.FileUtil;
+import org.junit.Before;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
index dacd838..93a2f46 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.processor.idempotent;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import java.io.File;
 
 import org.apache.camel.CamelContext;
@@ -27,6 +23,8 @@ import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.IdempotentRepository;
 import org.apache.camel.util.FileUtil;
+import org.junit.Before;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java
index ae917ec..68c875c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor.onexception;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.java
index 052f4a9..b19a694 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor.onexception;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringDeadLetterChannelOnExceptionOnRedeliveryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringDeadLetterChannelOnExceptionOnRedeliveryTest.java
index c2dd832..d71ea5f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringDeadLetterChannelOnExceptionOnRedeliveryTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringDeadLetterChannelOnExceptionOnRedeliveryTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor.onexception;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.DeadLetterChannelOnExceptionOnRedeliveryTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.java
index f4eafd5..f6ffd44 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor.onexception;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.onexception.OnExceptionFromChoiceUseOriginalBodyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionNotNormalizedClassNameTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionNotNormalizedClassNameTest.java
index 1334b2b..4be61a7 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionNotNormalizedClassNameTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionNotNormalizedClassNameTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor.onexception;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java
index 530c4e6..6ec3da5 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.processor.onexception;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteWithDefaultErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteWithDefaultErrorHandlerTest.java
index f905dd3..5456f09 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteWithDefaultErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionSubRouteWithDefaultErrorHandlerTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.spring.processor.onexception;
 
 import org.apache.camel.CamelContext;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.java
index 94c0a7a..2a9565c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.processor.onexception;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.onexception.OnExceptionUseOriginalBodyTest;
+
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
 /**
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/ScatterGatherTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/ScatterGatherTest.java
index e4983e6..4df8ad2 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/ScatterGatherTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/ScatterGatherTest.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.spring.processor.scattergather;
 
-import org.junit.Test;
-
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java
index 72b74df..46428ed 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.spring.processor.tracing;
 
-import org.junit.Test;
-
 import java.util.List;
 
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.interceptor.TraceHandlerTestHandler;
 import org.apache.camel.processor.interceptor.Tracer;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 
 public abstract class TracingTestBase extends SpringTestSupport {
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java
index 0699f5b..56f653b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java
@@ -17,7 +17,6 @@
 package org.apache.camel.spring.produce.generics;
 
 import org.apache.camel.Consume;
-
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java
index 3e2003e..5b86446 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java
@@ -17,7 +17,6 @@
 package org.apache.camel.spring.produce.generics;
 
 import org.apache.camel.Produce;
-
 import org.springframework.stereotype.Component;
 
 @Component
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceTest.java
index db9c45f..4e7cbfa 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceTest.java
@@ -17,9 +17,7 @@
 package org.apache.camel.spring.produce.generics;
 
 import org.apache.camel.spring.SpringRunWithTestSupport;
-
 import org.junit.Test;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java
index 10bf355..79b69ef 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.remoting;
 
-import org.junit.Test;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoTest.java
index c7d6e85..23d3dfa 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.remoting;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingThrowingRuntimeExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingThrowingRuntimeExceptionTest.java
index c62b207..d40aef6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingThrowingRuntimeExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingThrowingRuntimeExceptionTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.remoting;
 
-import org.junit.Test;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBinding.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBinding.java
index 313be4e..7f9e461 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBinding.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBinding.java
@@ -17,6 +17,7 @@
 package org.apache.camel.spring.remoting;
 
 import java.util.Date;
+
 import org.apache.camel.Produce;
 
 public class MultiArgumentsWithDefaultBinding {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingSpringRemotingPojoDirectTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingSpringRemotingPojoDirectTest.java
index f1188f7..cd2be2c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingSpringRemotingPojoDirectTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MultiArgumentsWithDefaultBindingSpringRemotingPojoDirectTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.remoting;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentService.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentService.java
index 4462a39..e8b6823 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentService.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentService.java
@@ -17,6 +17,7 @@
 package org.apache.camel.spring.remoting;
 
 import static junit.framework.TestCase.assertEquals;
+
 import org.apache.camel.Consume;
 
 public class MyMultiArgumentService implements MyMultiArgumentServiceInterface {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentSpringRemotingPojoDirectTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentSpringRemotingPojoDirectTest.java
index f6c4531..2b5f16b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentSpringRemotingPojoDirectTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentSpringRemotingPojoDirectTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.remoting;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingBeanConverterTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingBeanConverterTest.java
index 9bd7754..5a5806e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingBeanConverterTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingBeanConverterTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.remoting;
 
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.util.IOHelper;
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java
index 8516054..1729832 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.remoting;
 
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.util.IOHelper;
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingTwoCamelContextTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingTwoCamelContextTest.java
index a1faa95..c0dbefd 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingTwoCamelContextTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingTwoCamelContextTest.java
@@ -16,13 +16,11 @@
  */
 package org.apache.camel.spring.remoting;
 
-import org.junit.Test;
-
-import org.junit.Assert;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.util.IOHelper;
+import org.junit.Assert;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/CamelRouteBuilderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/CamelRouteBuilderTest.java
index 017f5f8..e8c1631 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/CamelRouteBuilderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/CamelRouteBuilderTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.routebuilder;
 
-import org.junit.Test;
-
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java
index 35bf473..305adc6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.scan;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import java.lang.annotation.Annotation;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -29,6 +25,8 @@ import org.apache.camel.impl.DefaultPackageScanClassResolver;
 import org.apache.camel.spring.scan.a.ScanTargetOne;
 import org.apache.camel.spring.scan.b.ScanTargetTwo;
 import org.apache.camel.spring.scan.c.ScanTargetThree;
+import org.junit.Before;
+import org.junit.Test;
 
 public class DefaultPackageScanClassResolverTest extends org.apache.camel.spring.scan.ScanTestSupport {
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java
index 8cb0eff..c50fe50 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java
@@ -16,14 +16,10 @@
  */
 package org.apache.camel.spring.scan;
 
-import org.junit.Test;
-
 import java.lang.annotation.Annotation;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.junit.Assert;
-
 import org.apache.camel.impl.scan.AnnotatedWithAnyPackageScanFilter;
 import org.apache.camel.impl.scan.AnnotatedWithPackageScanFilter;
 import org.apache.camel.impl.scan.AssignableToPackageScanFilter;
@@ -34,6 +30,8 @@ import org.apache.camel.spring.scan.a.ScanTargetOne;
 import org.apache.camel.spring.scan.b.ScanTargetTwo;
 import org.apache.camel.spring.scan.c.ScanTargetThree;
 import org.apache.camel.util.CollectionHelper;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class PackageScanFiltersTest extends Assert {
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java
index d8adb0c..52defc8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.spring.scan;
-import org.junit.Before;
-
-import org.junit.Test;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.RandomAccessFile;
@@ -31,6 +27,8 @@ import java.util.jar.JarFile;
 
 import org.apache.camel.core.xml.PatternBasedPackageScanFilter;
 import org.apache.camel.util.CollectionHelper;
+import org.junit.Before;
+import org.junit.Test;
 
 public class PatternBasedPackageScanFilterTest extends org.apache.camel.spring.scan.ScanTestSupport {
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java b/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
index aebc8a4..e2552ac 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import junit.framework.TestCase;
+
 import org.apache.camel.core.xml.PatternBasedPackageScanFilter;
 
 public abstract class ScanTestSupport extends TestCase {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerTest.java
index 3abd85d..25c8085 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.spi;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerUtilIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerUtilIssueTest.java
index 91b7940..0d25072 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerUtilIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurerUtilIssueTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.spring.spi;
 
-import org.junit.Test;
-
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/spi/ParentContextRegistryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/spi/ParentContextRegistryTest.java
index 4017a7c..b0d71c5 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/spi/ParentContextRegistryTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/spi/ParentContextRegistryTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.spring.spi;
 
-import org.junit.Test;
-
 import java.util.Collections;
 import java.util.List;
 
 import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/util/EndpointHelperTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/util/EndpointHelperTest.java
index 7b84027..8eabe70 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/util/EndpointHelperTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/util/EndpointHelperTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.spring.util;
 
-import org.junit.Test;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.spring.SpringTestSupport;
 import org.apache.camel.util.EndpointHelper;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/util/MainRunnerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/util/MainRunnerTest.java
index c43e9a2..76b63c4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/util/MainRunnerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/util/MainRunnerTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.spring.util;
 
-import org.junit.Test;
-
 import org.apache.camel.TestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java
index 1612d52..c0d3bd6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java
@@ -16,15 +16,13 @@
  */
 package org.apache.camel.spring.xml;
 
-import org.junit.Test;
-
 import java.util.List;
 
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
 import org.apache.camel.builder.RouteBuilderTest;
 import org.apache.camel.spring.SpringCamelContext;
-
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;