You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2018/10/12 07:55:42 UTC

[camel] 28/43: [CAMEL-10469] Remove @version in java source code

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

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

commit 20772773e38d5ae55f180aae0f8a942dfd4aac7e
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Oct 1 17:31:06 2018 +0200

    [CAMEL-10469] Remove @version in java source code
---
 .../src/main/java/org/apache/camel/AlreadyStoppedException.java   | 2 --
 camel-core/src/main/java/org/apache/camel/AsyncCallback.java      | 2 --
 camel-core/src/main/java/org/apache/camel/AsyncProcessor.java     | 2 --
 camel-core/src/main/java/org/apache/camel/AttachmentObjects.java  | 2 --
 camel-core/src/main/java/org/apache/camel/Attachments.java        | 2 --
 camel-core/src/main/java/org/apache/camel/BatchConsumer.java      | 2 --
 camel-core/src/main/java/org/apache/camel/BeanInject.java         | 2 --
 camel-core/src/main/java/org/apache/camel/BinaryPredicate.java    | 2 --
 camel-core/src/main/java/org/apache/camel/Body.java               | 2 --
 camel-core/src/main/java/org/apache/camel/BytesSource.java        | 2 --
 .../main/java/org/apache/camel/CamelAuthorizationException.java   | 2 --
 camel-core/src/main/java/org/apache/camel/CamelContext.java       | 2 --
 camel-core/src/main/java/org/apache/camel/CamelContextAware.java  | 2 --
 camel-core/src/main/java/org/apache/camel/CamelException.java     | 2 --
 .../src/main/java/org/apache/camel/CamelExchangeException.java    | 2 --
 .../src/main/java/org/apache/camel/CamelExecutionException.java   | 2 --
 camel-core/src/main/java/org/apache/camel/Channel.java            | 2 --
 camel-core/src/main/java/org/apache/camel/Component.java          | 2 --
 camel-core/src/main/java/org/apache/camel/Consume.java            | 2 --
 camel-core/src/main/java/org/apache/camel/Consumer.java           | 2 --
 camel-core/src/main/java/org/apache/camel/Converter.java          | 2 --
 camel-core/src/main/java/org/apache/camel/DynamicRouter.java      | 1 -
 camel-core/src/main/java/org/apache/camel/Endpoint.java           | 1 -
 camel-core/src/main/java/org/apache/camel/EndpointInject.java     | 2 --
 camel-core/src/main/java/org/apache/camel/Exchange.java           | 1 -
 camel-core/src/main/java/org/apache/camel/ExchangePattern.java    | 2 --
 camel-core/src/main/java/org/apache/camel/ExchangeProperties.java | 1 -
 camel-core/src/main/java/org/apache/camel/ExchangeProperty.java   | 1 -
 .../src/main/java/org/apache/camel/ExchangeTimedOutException.java | 2 --
 .../src/main/java/org/apache/camel/ExecutorServiceAware.java      | 2 --
 .../src/main/java/org/apache/camel/ExpectedBodyTypeException.java | 2 --
 camel-core/src/main/java/org/apache/camel/Expression.java         | 2 --
 .../main/java/org/apache/camel/ExpressionEvaluationException.java | 2 --
 .../java/org/apache/camel/ExpressionIllegalSyntaxException.java   | 2 --
 .../java/org/apache/camel/FailedToCreateConsumerException.java    | 2 --
 .../java/org/apache/camel/FailedToCreateProducerException.java    | 2 --
 .../main/java/org/apache/camel/FailedToCreateRouteException.java  | 2 --
 .../main/java/org/apache/camel/FailedToStartRouteException.java   | 2 --
 camel-core/src/main/java/org/apache/camel/FallbackConverter.java  | 2 --
 camel-core/src/main/java/org/apache/camel/Handler.java            | 2 --
 camel-core/src/main/java/org/apache/camel/Header.java             | 1 -
 camel-core/src/main/java/org/apache/camel/Headers.java            | 1 -
 camel-core/src/main/java/org/apache/camel/InOnly.java             | 2 --
 camel-core/src/main/java/org/apache/camel/InOut.java              | 2 --
 .../src/main/java/org/apache/camel/InvalidPayloadException.java   | 2 --
 .../java/org/apache/camel/InvalidPayloadRuntimeException.java     | 2 --
 camel-core/src/main/java/org/apache/camel/InvokeOnHeader.java     | 1 -
 camel-core/src/main/java/org/apache/camel/InvokeOnHeaders.java    | 1 -
 camel-core/src/main/java/org/apache/camel/IsSingleton.java        | 2 --
 camel-core/src/main/java/org/apache/camel/LoggingLevel.java       | 2 --
 .../src/main/java/org/apache/camel/ManagementStatisticsLevel.java | 2 --
 camel-core/src/main/java/org/apache/camel/Message.java            | 2 --
 .../src/main/java/org/apache/camel/MultipleConsumersSupport.java  | 2 --
 camel-core/src/main/java/org/apache/camel/Navigate.java           | 2 --
 .../main/java/org/apache/camel/NoFactoryAvailableException.java   | 2 --
 .../src/main/java/org/apache/camel/NoSuchBeanException.java       | 2 --
 .../src/main/java/org/apache/camel/NoSuchEndpointException.java   | 2 --
 .../src/main/java/org/apache/camel/NoSuchHeaderException.java     | 2 --
 .../src/main/java/org/apache/camel/NoSuchLanguageException.java   | 2 --
 .../src/main/java/org/apache/camel/NoSuchPropertyException.java   | 2 --
 .../java/org/apache/camel/NoTypeConversionAvailableException.java | 2 --
 camel-core/src/main/java/org/apache/camel/Ordered.java            | 2 --
 camel-core/src/main/java/org/apache/camel/OutHeaders.java         | 1 -
 camel-core/src/main/java/org/apache/camel/Pattern.java            | 2 --
 camel-core/src/main/java/org/apache/camel/PollingConsumer.java    | 2 --
 camel-core/src/main/java/org/apache/camel/Predicate.java          | 2 --
 camel-core/src/main/java/org/apache/camel/Processor.java          | 2 --
 camel-core/src/main/java/org/apache/camel/Produce.java            | 2 --
 camel-core/src/main/java/org/apache/camel/Producer.java           | 2 --
 .../main/java/org/apache/camel/ProxyInstantiationException.java   | 2 --
 camel-core/src/main/java/org/apache/camel/RecipientList.java      | 2 --
 .../java/org/apache/camel/ResolveEndpointFailedException.java     | 2 --
 .../src/main/java/org/apache/camel/RollbackExchangeException.java | 2 --
 camel-core/src/main/java/org/apache/camel/RoutingSlip.java        | 1 -
 .../src/main/java/org/apache/camel/RuntimeCamelException.java     | 2 --
 .../src/main/java/org/apache/camel/RuntimeConfiguration.java      | 2 --
 .../src/main/java/org/apache/camel/RuntimeExchangeException.java  | 2 --
 .../main/java/org/apache/camel/RuntimeExpressionException.java    | 2 --
 .../src/main/java/org/apache/camel/RuntimeTransformException.java | 2 --
 camel-core/src/main/java/org/apache/camel/Service.java            | 2 --
 camel-core/src/main/java/org/apache/camel/ServiceStatus.java      | 2 --
 .../src/main/java/org/apache/camel/ShutdownableService.java       | 2 --
 camel-core/src/main/java/org/apache/camel/StartupListener.java    | 1 -
 camel-core/src/main/java/org/apache/camel/StreamCache.java        | 2 --
 camel-core/src/main/java/org/apache/camel/StringSource.java       | 2 --
 camel-core/src/main/java/org/apache/camel/TimeoutMap.java         | 2 --
 camel-core/src/main/java/org/apache/camel/Traceable.java          | 2 --
 .../src/main/java/org/apache/camel/TypeConversionException.java   | 2 --
 camel-core/src/main/java/org/apache/camel/TypeConverter.java      | 2 --
 .../src/main/java/org/apache/camel/TypeConverterExists.java       | 2 --
 .../main/java/org/apache/camel/TypeConverterLoaderException.java  | 2 --
 .../src/main/java/org/apache/camel/ValidationException.java       | 2 --
 .../src/main/java/org/apache/camel/WaitForTaskToComplete.java     | 2 --
 .../java/org/apache/camel/api/management/ManagedInstance.java     | 2 --
 .../java/org/apache/camel/api/management/PerformanceCounter.java  | 2 --
 .../java/org/apache/camel/builder/BinaryPredicateSupport.java     | 2 --
 camel-core/src/main/java/org/apache/camel/builder/Builder.java    | 2 --
 .../src/main/java/org/apache/camel/builder/BuilderSupport.java    | 2 --
 .../src/main/java/org/apache/camel/builder/DataFormatClause.java  | 2 --
 .../java/org/apache/camel/builder/DeadLetterChannelBuilder.java   | 2 --
 .../java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java | 2 --
 .../main/java/org/apache/camel/builder/ErrorHandlerBuilder.java   | 2 --
 .../java/org/apache/camel/builder/ErrorHandlerBuilderRef.java     | 2 --
 .../java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java | 2 --
 .../src/main/java/org/apache/camel/builder/ExpressionBuilder.java | 2 --
 .../src/main/java/org/apache/camel/builder/ExpressionClause.java  | 2 --
 .../java/org/apache/camel/builder/ExpressionClauseSupport.java    | 2 --
 .../main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java | 2 --
 .../src/main/java/org/apache/camel/builder/NotifyBuilder.java     | 2 --
 .../src/main/java/org/apache/camel/builder/PredicateBuilder.java  | 2 --
 .../src/main/java/org/apache/camel/builder/ProcessorBuilder.java  | 2 --
 .../src/main/java/org/apache/camel/builder/ProxyBuilder.java      | 2 --
 .../src/main/java/org/apache/camel/builder/RouteBuilder.java      | 2 --
 .../src/main/java/org/apache/camel/builder/SimpleBuilder.java     | 2 --
 .../src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java | 2 --
 .../src/main/java/org/apache/camel/builder/ValueBuilder.java      | 2 --
 .../main/java/org/apache/camel/builder/xml/DomResultHandler.java  | 2 --
 .../org/apache/camel/builder/xml/DomResultHandlerFactory.java     | 2 --
 .../main/java/org/apache/camel/builder/xml/FileResultHandler.java | 2 --
 .../org/apache/camel/builder/xml/FileResultHandlerFactory.java    | 2 --
 .../java/org/apache/camel/builder/xml/InvalidXPathExpression.java | 2 --
 .../org/apache/camel/builder/xml/MessageVariableResolver.java     | 2 --
 .../src/main/java/org/apache/camel/builder/xml/Namespaces.java    | 2 --
 .../src/main/java/org/apache/camel/builder/xml/ResultHandler.java | 2 --
 .../java/org/apache/camel/builder/xml/ResultHandlerFactory.java   | 2 --
 .../java/org/apache/camel/builder/xml/StreamResultHandler.java    | 2 --
 .../org/apache/camel/builder/xml/StreamResultHandlerFactory.java  | 2 --
 .../java/org/apache/camel/builder/xml/StringResultHandler.java    | 2 --
 .../org/apache/camel/builder/xml/StringResultHandlerFactory.java  | 2 --
 .../src/main/java/org/apache/camel/builder/xml/XsltBuilder.java   | 2 --
 .../main/java/org/apache/camel/builder/xml/XsltUriResolver.java   | 2 --
 .../org/apache/camel/component/bean/AbstractBeanProcessor.java    | 2 --
 .../apache/camel/component/bean/AmbiguousMethodCallException.java | 2 --
 .../apache/camel/component/bean/AnnotationExpressionFactory.java  | 2 --
 .../camel/component/bean/BeanAnnotationExpressionFactory.java     | 3 ---
 .../main/java/org/apache/camel/component/bean/BeanConstants.java  | 3 ---
 .../src/main/java/org/apache/camel/component/bean/BeanHolder.java | 2 --
 .../main/java/org/apache/camel/component/bean/BeanTypeHolder.java | 2 --
 .../org/apache/camel/component/bean/CamelInvocationHandler.java   | 2 --
 .../java/org/apache/camel/component/bean/ConstantBeanHolder.java  | 2 --
 .../apache/camel/component/bean/ConstantStaticTypeBeanHolder.java | 2 --
 .../org/apache/camel/component/bean/ConstantTypeBeanHolder.java   | 2 --
 .../camel/component/bean/DefaultAnnotationExpressionFactory.java  | 2 --
 .../camel/component/bean/DefaultParameterMappingStrategy.java     | 2 --
 .../src/main/java/org/apache/camel/component/bean/MethodBean.java | 2 --
 .../src/main/java/org/apache/camel/component/bean/MethodInfo.java | 2 --
 .../java/org/apache/camel/component/bean/MethodInfoCache.java     | 2 --
 .../java/org/apache/camel/component/bean/MethodInvocation.java    | 2 --
 .../org/apache/camel/component/bean/MethodNotFoundException.java  | 3 ---
 .../main/java/org/apache/camel/component/bean/ParameterInfo.java  | 2 --
 .../org/apache/camel/component/bean/ParameterMappingStrategy.java | 2 --
 .../main/java/org/apache/camel/component/bean/ProxyHelper.java    | 2 --
 .../main/java/org/apache/camel/component/bean/RegistryBean.java   | 2 --
 .../camel/component/bean/XPathAnnotationExpressionFactory.java    | 2 --
 .../java/org/apache/camel/component/beanclass/ClassComponent.java | 2 --
 .../java/org/apache/camel/component/browse/BrowseComponent.java   | 2 --
 .../apache/camel/component/dataformat/DataFormatComponent.java    | 2 --
 .../src/main/java/org/apache/camel/component/dataset/DataSet.java | 2 --
 .../java/org/apache/camel/component/dataset/DataSetComponent.java | 2 --
 .../java/org/apache/camel/component/dataset/DataSetConsumer.java  | 2 --
 .../java/org/apache/camel/component/dataset/DataSetSupport.java   | 2 --
 .../main/java/org/apache/camel/component/dataset/FileDataSet.java | 2 --
 .../main/java/org/apache/camel/component/dataset/ListDataSet.java | 2 --
 .../java/org/apache/camel/component/dataset/SimpleDataSet.java    | 2 --
 .../java/org/apache/camel/component/direct/DirectComponent.java   | 2 --
 .../java/org/apache/camel/component/direct/DirectConsumer.java    | 2 --
 .../component/direct/DirectConsumerNotAvailableException.java     | 2 --
 .../java/org/apache/camel/component/direct/DirectProducer.java    | 2 --
 .../component/directvm/DirectVmConsumerNotAvailableException.java | 2 --
 .../java/org/apache/camel/component/file/GenericFileExist.java    | 2 --
 .../org/apache/camel/component/file/GenericFileOnCompletion.java  | 2 --
 .../camel/component/file/GenericFileOperationFailedException.java | 2 --
 .../org/apache/camel/component/language/LanguageComponent.java    | 2 --
 .../org/apache/camel/component/language/LanguageProducer.java     | 2 --
 .../main/java/org/apache/camel/component/log/LogComponent.java    | 2 --
 .../java/org/apache/camel/component/mock/AssertionClause.java     | 2 --
 .../main/java/org/apache/camel/component/mock/MockComponent.java  | 2 --
 .../main/java/org/apache/camel/component/mock/MockEndpoint.java   | 2 --
 .../src/main/java/org/apache/camel/component/mock/TimeClause.java | 2 --
 .../camel/component/properties/DefaultPropertiesResolver.java     | 2 --
 .../org/apache/camel/component/properties/PropertiesResolver.java | 2 --
 .../main/java/org/apache/camel/component/seda/SedaComponent.java  | 2 --
 .../main/java/org/apache/camel/component/seda/SedaConsumer.java   | 2 --
 .../main/java/org/apache/camel/component/seda/SedaProducer.java   | 3 ---
 .../main/java/org/apache/camel/component/test/TestComponent.java  | 2 --
 .../java/org/apache/camel/component/timer/TimerComponent.java     | 2 --
 .../main/java/org/apache/camel/component/timer/TimerConsumer.java | 2 --
 .../org/apache/camel/component/validator/ValidatorComponent.java  | 2 --
 .../src/main/java/org/apache/camel/component/vm/VmComponent.java  | 2 --
 .../main/java/org/apache/camel/converter/AttachmentConverter.java | 2 --
 .../src/main/java/org/apache/camel/converter/CamelConverter.java  | 2 --
 .../main/java/org/apache/camel/converter/CollectionConverter.java | 2 --
 .../src/main/java/org/apache/camel/converter/IOConverter.java     | 2 --
 .../src/main/java/org/apache/camel/converter/NIOConverter.java    | 2 --
 .../src/main/java/org/apache/camel/converter/ObjectConverter.java | 2 --
 .../main/java/org/apache/camel/converter/jaxp/DomConverter.java   | 2 --
 .../main/java/org/apache/camel/converter/jaxp/StaxConverter.java  | 2 --
 .../org/apache/camel/converter/jaxp/StreamSourceConverter.java    | 2 --
 .../main/java/org/apache/camel/converter/jaxp/XmlConverter.java   | 2 --
 .../src/main/java/org/apache/camel/impl/BreakpointSupport.java    | 2 --
 .../main/java/org/apache/camel/impl/CamelPostProcessorHelper.java | 2 --
 .../src/main/java/org/apache/camel/impl/ConditionSupport.java     | 2 --
 camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java | 2 --
 .../src/main/java/org/apache/camel/impl/DefaultAsyncProducer.java | 2 --
 .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java  | 2 --
 .../org/apache/camel/impl/DefaultCamelContextNameStrategy.java    | 2 --
 .../main/java/org/apache/camel/impl/DefaultComponentResolver.java | 2 --
 .../src/main/java/org/apache/camel/impl/DefaultConsumer.java      | 2 --
 .../main/java/org/apache/camel/impl/DefaultConsumerTemplate.java  | 2 --
 .../java/org/apache/camel/impl/DefaultDataFormatResolver.java     | 2 --
 .../src/main/java/org/apache/camel/impl/DefaultDebugger.java      | 2 --
 .../src/main/java/org/apache/camel/impl/DefaultEndpoint.java      | 2 --
 .../src/main/java/org/apache/camel/impl/DefaultExchange.java      | 2 --
 .../main/java/org/apache/camel/impl/DefaultExchangeHolder.java    | 2 --
 .../java/org/apache/camel/impl/DefaultFactoryFinderResolver.java  | 2 --
 .../java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java   | 2 --
 .../java/org/apache/camel/impl/DefaultInflightRepository.java     | 2 --
 .../main/java/org/apache/camel/impl/DefaultLanguageResolver.java  | 2 --
 .../src/main/java/org/apache/camel/impl/DefaultMessage.java       | 2 --
 .../src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java | 2 --
 .../org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java | 2 --
 .../main/java/org/apache/camel/impl/DefaultPollingEndpoint.java   | 2 --
 .../src/main/java/org/apache/camel/impl/DefaultProducer.java      | 2 --
 .../main/java/org/apache/camel/impl/DefaultProducerTemplate.java  | 2 --
 camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java  | 2 --
 .../src/main/java/org/apache/camel/impl/DefaultRouteContext.java  | 2 --
 .../main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java | 2 --
 .../java/org/apache/camel/impl/DefaultScheduledPollConsumer.java  | 2 --
 .../main/java/org/apache/camel/impl/DefaultShutdownStrategy.java  | 2 --
 .../main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java | 2 --
 .../java/org/apache/camel/impl/EventDrivenPollingConsumer.java    | 2 --
 .../org/apache/camel/impl/ExplicitCamelContextNameStrategy.java   | 2 --
 .../main/java/org/apache/camel/impl/InterceptSendToEndpoint.java  | 2 --
 .../apache/camel/impl/InterceptSendToMockEndpointStrategy.java    | 2 --
 .../org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java | 2 --
 camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java | 2 --
 .../src/main/java/org/apache/camel/impl/MessageSupport.java       | 2 --
 .../main/java/org/apache/camel/impl/PollingConsumerSupport.java   | 2 --
 .../src/main/java/org/apache/camel/impl/ProcessorEndpoint.java    | 2 --
 .../main/java/org/apache/camel/impl/ProcessorPollingConsumer.java | 2 --
 camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java | 5 +----
 .../apache/camel/impl/PropertyPlaceholderDelegateRegistry.java    | 2 --
 camel-core/src/main/java/org/apache/camel/impl/RouteService.java  | 2 --
 .../main/java/org/apache/camel/impl/ScheduledPollEndpoint.java    | 2 --
 .../main/java/org/apache/camel/impl/SerializationDataFormat.java  | 2 --
 camel-core/src/main/java/org/apache/camel/impl/ServicePool.java   | 2 --
 .../src/main/java/org/apache/camel/impl/StringDataFormat.java     | 2 --
 .../java/org/apache/camel/impl/SynchronousDelegateProducer.java   | 2 --
 .../java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java | 2 --
 .../camel/impl/converter/AnnotationTypeConverterLoader.java       | 2 --
 .../java/org/apache/camel/impl/converter/ArrayTypeConverter.java  | 2 --
 .../apache/camel/impl/converter/AsyncProcessorTypeConverter.java  | 2 --
 .../apache/camel/impl/converter/BaseTypeConverterRegistry.java    | 2 --
 .../java/org/apache/camel/impl/converter/CachingInjector.java     | 2 --
 .../org/apache/camel/impl/converter/DefaultTypeConverter.java     | 2 --
 .../java/org/apache/camel/impl/converter/FutureTypeConverter.java | 2 --
 .../camel/impl/converter/InstanceMethodFallbackTypeConverter.java | 2 --
 .../apache/camel/impl/converter/InstanceMethodTypeConverter.java  | 2 --
 .../camel/impl/converter/StaticMethodFallbackTypeConverter.java   | 2 --
 .../apache/camel/impl/converter/StaticMethodTypeConverter.java    | 2 --
 .../java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java  | 1 -
 .../java/org/apache/camel/impl/osgi/tracker/BundleTracker.java    | 1 -
 .../apache/camel/impl/osgi/tracker/BundleTrackerCustomizer.java   | 1 -
 camel-core/src/main/java/org/apache/camel/language/Bean.java      | 2 --
 .../main/java/org/apache/camel/language/LanguageAnnotation.java   | 2 --
 .../main/java/org/apache/camel/language/LanguageExpression.java   | 2 --
 .../src/main/java/org/apache/camel/language/NamespacePrefix.java  | 2 --
 camel-core/src/main/java/org/apache/camel/language/Simple.java    | 2 --
 camel-core/src/main/java/org/apache/camel/language/XPath.java     | 2 --
 .../main/java/org/apache/camel/language/bean/BeanLanguage.java    | 2 --
 .../camel/language/bean/RuntimeBeanExpressionException.java       | 2 --
 camel-core/src/main/java/org/apache/camel/main/Main.java          | 2 --
 camel-core/src/main/java/org/apache/camel/main/MainSupport.java   | 2 --
 .../camel/management/DefaultManagementLifecycleStrategy.java      | 1 -
 .../apache/camel/management/DefaultManagementMBeanAssembler.java  | 2 --
 .../org/apache/camel/management/DefaultManagementStrategy.java    | 1 -
 .../org/apache/camel/management/DelegatePerformanceCounter.java   | 2 --
 .../apache/camel/management/InstrumentationInterceptStrategy.java | 2 --
 .../org/apache/camel/management/InstrumentationProcessor.java     | 2 --
 .../org/apache/camel/management/JmxNotificationEventNotifier.java | 2 --
 .../java/org/apache/camel/management/JmxSystemPropertyKeys.java   | 2 --
 .../java/org/apache/camel/management/LoggingEventNotifier.java    | 2 --
 .../org/apache/camel/management/ManagedManagementStrategy.java    | 1 -
 .../java/org/apache/camel/management/PublishEventNotifier.java    | 2 --
 .../org/apache/camel/management/event/AbstractContextEvent.java   | 2 --
 .../org/apache/camel/management/event/AbstractExchangeEvent.java  | 2 --
 .../org/apache/camel/management/event/AbstractRouteEvent.java     | 2 --
 .../camel/management/event/CamelContextResumeFailureEvent.java    | 3 ---
 .../apache/camel/management/event/CamelContextResumedEvent.java   | 3 ---
 .../apache/camel/management/event/CamelContextResumingEvent.java  | 3 ---
 .../apache/camel/management/event/CamelContextStartedEvent.java   | 3 ---
 .../apache/camel/management/event/CamelContextStartingEvent.java  | 3 ---
 .../camel/management/event/CamelContextStartupFailureEvent.java   | 3 ---
 .../camel/management/event/CamelContextStopFailureEvent.java      | 3 ---
 .../apache/camel/management/event/CamelContextStoppedEvent.java   | 3 ---
 .../apache/camel/management/event/CamelContextStoppingEvent.java  | 3 ---
 .../apache/camel/management/event/CamelContextSuspendedEvent.java | 3 ---
 .../camel/management/event/CamelContextSuspendingEvent.java       | 3 ---
 .../org/apache/camel/management/event/DefaultEventFactory.java    | 2 --
 .../org/apache/camel/management/event/ExchangeCompletedEvent.java | 3 ---
 .../org/apache/camel/management/event/ExchangeCreatedEvent.java   | 2 --
 .../org/apache/camel/management/event/ExchangeFailedEvent.java    | 3 ---
 .../camel/management/event/ExchangeFailureHandledEvent.java       | 3 ---
 .../camel/management/event/ExchangeFailureHandlingEvent.java      | 3 ---
 .../apache/camel/management/event/ExchangeRedeliveryEvent.java    | 3 ---
 .../org/apache/camel/management/event/ExchangeSendingEvent.java   | 1 -
 .../java/org/apache/camel/management/event/ExchangeSentEvent.java | 1 -
 .../main/java/org/apache/camel/management/event/FailureEvent.java | 1 -
 .../java/org/apache/camel/management/event/RouteAddedEvent.java   | 3 ---
 .../java/org/apache/camel/management/event/RouteRemovedEvent.java | 3 ---
 .../java/org/apache/camel/management/event/RouteStartedEvent.java | 3 ---
 .../java/org/apache/camel/management/event/RouteStoppedEvent.java | 3 ---
 .../apache/camel/management/event/ServiceStartupFailureEvent.java | 3 ---
 .../apache/camel/management/event/ServiceStopFailureEvent.java    | 3 ---
 .../apache/camel/management/mbean/ManagedAggregateProcessor.java  | 3 ---
 .../org/apache/camel/management/mbean/ManagedBacklogTracer.java   | 3 ---
 .../org/apache/camel/management/mbean/ManagedBeanProcessor.java   | 3 ---
 .../apache/camel/management/mbean/ManagedBrowsableEndpoint.java   | 3 ---
 .../org/apache/camel/management/mbean/ManagedCamelContext.java    | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedChoice.java     | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedClaimCheck.java | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedComponent.java  | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedConsumer.java   | 3 ---
 .../org/apache/camel/management/mbean/ManagedConsumerCache.java   | 3 ---
 .../org/apache/camel/management/mbean/ManagedConvertBody.java     | 3 ---
 .../apache/camel/management/mbean/ManagedCustomLoadBalancer.java  | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedDelayer.java    | 3 ---
 .../org/apache/camel/management/mbean/ManagedDynamicRouter.java   | 3 ---
 .../apache/camel/management/mbean/ManagedEndpointRegistry.java    | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedEnricher.java   | 3 ---
 .../org/apache/camel/management/mbean/ManagedErrorHandler.java    | 3 ---
 .../org/apache/camel/management/mbean/ManagedEventNotifier.java   | 3 ---
 .../camel/management/mbean/ManagedFailoverLoadBalancer.java       | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedFilter.java     | 3 ---
 .../main/java/org/apache/camel/management/mbean/ManagedLog.java   | 3 ---
 .../main/java/org/apache/camel/management/mbean/ManagedLoop.java  | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedMarshal.java    | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedMulticast.java  | 3 ---
 .../org/apache/camel/management/mbean/ManagedPollEnricher.java    | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedProcess.java    | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedProcessor.java  | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedProducer.java   | 3 ---
 .../org/apache/camel/management/mbean/ManagedProducerCache.java   | 3 ---
 .../apache/camel/management/mbean/ManagedRandomLoadBalancer.java  | 3 ---
 .../org/apache/camel/management/mbean/ManagedRecipientList.java   | 3 ---
 .../org/apache/camel/management/mbean/ManagedRemoveHeader.java    | 3 ---
 .../org/apache/camel/management/mbean/ManagedRemoveHeaders.java   | 3 ---
 .../apache/camel/management/mbean/ManagedRemoveProperties.java    | 3 ---
 .../org/apache/camel/management/mbean/ManagedRemoveProperty.java  | 3 ---
 .../org/apache/camel/management/mbean/ManagedResequencer.java     | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedRollback.java   | 3 ---
 .../camel/management/mbean/ManagedRoundRobinLoadBalancer.java     | 3 ---
 .../org/apache/camel/management/mbean/ManagedRoutingSlip.java     | 3 ---
 .../apache/camel/management/mbean/ManagedRuntimeCamelCatalog.java | 3 ---
 .../apache/camel/management/mbean/ManagedSamplingThrottler.java   | 3 ---
 .../camel/management/mbean/ManagedScheduledPollConsumer.java      | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedScript.java     | 3 ---
 .../camel/management/mbean/ManagedSendDynamicProcessor.java       | 3 ---
 .../org/apache/camel/management/mbean/ManagedSendProcessor.java   | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedSetBody.java    | 3 ---
 .../apache/camel/management/mbean/ManagedSetExchangePattern.java  | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedSetHeader.java  | 3 ---
 .../org/apache/camel/management/mbean/ManagedSetProperty.java     | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedSplitter.java   | 3 ---
 .../apache/camel/management/mbean/ManagedStickyLoadBalancer.java  | 3 ---
 .../main/java/org/apache/camel/management/mbean/ManagedStop.java  | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedThreadPool.java | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedThreads.java    | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedThrottler.java  | 3 ---
 .../management/mbean/ManagedThrottlingInflightRoutePolicy.java    | 3 ---
 .../org/apache/camel/management/mbean/ManagedThrowException.java  | 3 ---
 .../apache/camel/management/mbean/ManagedTopicLoadBalancer.java   | 3 ---
 .../org/apache/camel/management/mbean/ManagedTransformer.java     | 3 ---
 .../apache/camel/management/mbean/ManagedTransformerRegistry.java | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedUnmarshal.java  | 3 ---
 .../java/org/apache/camel/management/mbean/ManagedValidate.java   | 3 ---
 .../apache/camel/management/mbean/ManagedValidatorRegistry.java   | 3 ---
 .../camel/management/mbean/ManagedWeightedLoadBalancer.java       | 3 ---
 .../apache/camel/management/mbean/ManagedWireTapProcessor.java    | 3 ---
 .../src/main/java/org/apache/camel/model/AggregateDefinition.java | 2 --
 .../src/main/java/org/apache/camel/model/BeanDefinition.java      | 2 --
 camel-core/src/main/java/org/apache/camel/model/Block.java        | 2 --
 .../src/main/java/org/apache/camel/model/CatchDefinition.java     | 2 --
 .../src/main/java/org/apache/camel/model/ChoiceDefinition.java    | 2 --
 camel-core/src/main/java/org/apache/camel/model/Constants.java    | 2 --
 .../src/main/java/org/apache/camel/model/DelayDefinition.java     | 2 --
 .../main/java/org/apache/camel/model/DescriptionDefinition.java   | 2 --
 .../org/apache/camel/model/ExecutorServiceAwareDefinition.java    | 2 --
 .../src/main/java/org/apache/camel/model/ExpressionNode.java      | 2 --
 .../src/main/java/org/apache/camel/model/FilterDefinition.java    | 2 --
 .../src/main/java/org/apache/camel/model/FinallyDefinition.java   | 2 --
 .../src/main/java/org/apache/camel/model/FromDefinition.java      | 2 --
 .../src/main/java/org/apache/camel/model/IdentifiedType.java      | 2 --
 .../src/main/java/org/apache/camel/model/InOnlyDefinition.java    | 2 --
 .../src/main/java/org/apache/camel/model/InOutDefinition.java     | 2 --
 .../src/main/java/org/apache/camel/model/InterceptDefinition.java | 2 --
 .../main/java/org/apache/camel/model/InterceptFromDefinition.java | 2 --
 .../org/apache/camel/model/InterceptSendToEndpointDefinition.java | 2 --
 .../src/main/java/org/apache/camel/model/LogDefinition.java       | 2 --
 .../src/main/java/org/apache/camel/model/LoopDefinition.java      | 2 --
 .../src/main/java/org/apache/camel/model/MarshalDefinition.java   | 2 --
 .../src/main/java/org/apache/camel/model/MulticastDefinition.java | 2 --
 .../main/java/org/apache/camel/model/NoOutputExpressionNode.java  | 2 --
 .../main/java/org/apache/camel/model/OnCompletionDefinition.java  | 2 --
 .../main/java/org/apache/camel/model/OnExceptionDefinition.java   | 2 --
 .../apache/camel/model/OptimisticLockRetryPolicyDefinition.java   | 2 --
 .../java/org/apache/camel/model/OptionalIdentifiedDefinition.java | 2 --
 .../src/main/java/org/apache/camel/model/OtherwiseDefinition.java | 2 --
 .../src/main/java/org/apache/camel/model/OutputDefinition.java    | 2 --
 .../src/main/java/org/apache/camel/model/PipelineDefinition.java  | 2 --
 .../src/main/java/org/apache/camel/model/PolicyDefinition.java    | 2 --
 .../src/main/java/org/apache/camel/model/ProcessDefinition.java   | 2 --
 .../src/main/java/org/apache/camel/model/ProcessorDefinition.java | 2 --
 .../main/java/org/apache/camel/model/RecipientListDefinition.java | 2 --
 .../java/org/apache/camel/model/RedeliveryPolicyDefinition.java   | 2 --
 .../main/java/org/apache/camel/model/ResequenceDefinition.java    | 2 --
 .../java/org/apache/camel/model/RestContextRefDefinition.java     | 2 --
 .../src/main/java/org/apache/camel/model/RethrowDefinition.java   | 2 --
 .../main/java/org/apache/camel/model/RouteBuilderDefinition.java  | 2 --
 .../src/main/java/org/apache/camel/model/RouteContainer.java      | 2 --
 .../java/org/apache/camel/model/RouteContextRefDefinition.java    | 2 --
 .../src/main/java/org/apache/camel/model/RouteDefinition.java     | 2 --
 .../src/main/java/org/apache/camel/model/RoutesDefinition.java    | 2 --
 .../src/main/java/org/apache/camel/model/SagaDefinition.java      | 2 --
 .../src/main/java/org/apache/camel/model/SamplingDefinition.java  | 2 --
 .../src/main/java/org/apache/camel/model/SendDefinition.java      | 2 --
 .../java/org/apache/camel/model/SetExchangePatternDefinition.java | 2 --
 .../src/main/java/org/apache/camel/model/SplitDefinition.java     | 2 --
 .../src/main/java/org/apache/camel/model/StopDefinition.java      | 2 --
 .../java/org/apache/camel/model/ThreadPoolProfileDefinition.java  | 2 --
 .../src/main/java/org/apache/camel/model/ThreadsDefinition.java   | 2 --
 .../src/main/java/org/apache/camel/model/ThrottleDefinition.java  | 2 --
 camel-core/src/main/java/org/apache/camel/model/ToDefinition.java | 2 --
 .../main/java/org/apache/camel/model/TransactedDefinition.java    | 2 --
 .../src/main/java/org/apache/camel/model/TryDefinition.java       | 2 --
 .../src/main/java/org/apache/camel/model/UnmarshalDefinition.java | 2 --
 .../src/main/java/org/apache/camel/model/ValidateDefinition.java  | 2 --
 .../src/main/java/org/apache/camel/model/WhenDefinition.java      | 2 --
 .../java/org/apache/camel/model/dataformat/AvroDataFormat.java    | 2 --
 .../java/org/apache/camel/model/dataformat/BarcodeDataFormat.java | 2 --
 .../java/org/apache/camel/model/dataformat/Base64DataFormat.java  | 2 --
 .../java/org/apache/camel/model/dataformat/BeanioDataFormat.java  | 2 --
 .../java/org/apache/camel/model/dataformat/BindyDataFormat.java   | 2 --
 .../main/java/org/apache/camel/model/dataformat/BindyType.java    | 2 --
 .../java/org/apache/camel/model/dataformat/CryptoDataFormat.java  | 2 --
 .../java/org/apache/camel/model/dataformat/CustomDataFormat.java  | 2 --
 .../java/org/apache/camel/model/dataformat/GzipDataFormat.java    | 2 --
 .../java/org/apache/camel/model/dataformat/HL7DataFormat.java     | 2 --
 .../org/apache/camel/model/dataformat/JacksonXMLDataFormat.java   | 2 --
 .../java/org/apache/camel/model/dataformat/JaxbDataFormat.java    | 2 --
 .../java/org/apache/camel/model/dataformat/JsonDataFormat.java    | 2 --
 .../main/java/org/apache/camel/model/dataformat/JsonLibrary.java  | 2 --
 .../org/apache/camel/model/dataformat/ProtobufDataFormat.java     | 2 --
 .../apache/camel/model/dataformat/SerializationDataFormat.java    | 2 --
 .../java/org/apache/camel/model/dataformat/StringDataFormat.java  | 2 --
 .../java/org/apache/camel/model/dataformat/SyslogDataFormat.java  | 2 --
 .../java/org/apache/camel/model/dataformat/ThriftDataFormat.java  | 2 --
 .../java/org/apache/camel/model/dataformat/XStreamDataFormat.java | 2 --
 .../java/org/apache/camel/model/dataformat/YAMLDataFormat.java    | 2 --
 .../main/java/org/apache/camel/model/dataformat/YAMLLibrary.java  | 2 --
 .../apache/camel/model/language/ExchangePropertyExpression.java   | 2 --
 .../java/org/apache/camel/model/language/GroovyExpression.java    | 2 --
 .../java/org/apache/camel/model/language/HeaderExpression.java    | 2 --
 .../org/apache/camel/model/language/JavaScriptExpression.java     | 2 --
 .../java/org/apache/camel/model/language/JsonPathExpression.java  | 2 --
 .../java/org/apache/camel/model/language/LanguageExpression.java  | 2 --
 .../org/apache/camel/model/language/MethodCallExpression.java     | 2 --
 .../main/java/org/apache/camel/model/language/MvelExpression.java | 2 --
 .../org/apache/camel/model/language/NamespaceAwareExpression.java | 2 --
 .../main/java/org/apache/camel/model/language/OgnlExpression.java | 2 --
 .../java/org/apache/camel/model/language/SimpleExpression.java    | 2 --
 .../main/java/org/apache/camel/model/language/SpELExpression.java | 2 --
 .../java/org/apache/camel/model/language/TerserExpression.java    | 2 --
 .../java/org/apache/camel/model/language/XQueryExpression.java    | 2 --
 .../main/java/org/apache/camel/processor/CamelLogProcessor.java   | 2 --
 .../src/main/java/org/apache/camel/processor/CatchProcessor.java  | 2 --
 .../src/main/java/org/apache/camel/processor/ChoiceProcessor.java | 2 --
 .../java/org/apache/camel/processor/ConvertBodyProcessor.java     | 2 --
 .../main/java/org/apache/camel/processor/DeadLetterChannel.java   | 2 --
 .../main/java/org/apache/camel/processor/DefaultErrorHandler.java | 2 --
 .../java/org/apache/camel/processor/DelayProcessorSupport.java    | 2 --
 camel-core/src/main/java/org/apache/camel/processor/Delayer.java  | 2 --
 .../java/org/apache/camel/processor/DelegateAsyncProcessor.java   | 2 --
 .../main/java/org/apache/camel/processor/DelegateProcessor.java   | 1 -
 .../java/org/apache/camel/processor/DelegateSyncProcessor.java    | 2 --
 .../src/main/java/org/apache/camel/processor/DynamicRouter.java   | 2 --
 .../src/main/java/org/apache/camel/processor/ErrorHandler.java    | 2 --
 .../main/java/org/apache/camel/processor/ErrorHandlerSupport.java | 2 --
 .../org/apache/camel/processor/FatalFallbackErrorHandler.java     | 2 --
 .../src/main/java/org/apache/camel/processor/FilterProcessor.java | 2 --
 .../main/java/org/apache/camel/processor/FinallyProcessor.java    | 2 --
 .../org/apache/camel/processor/InterceptEndpointProcessor.java    | 2 --
 .../apache/camel/processor/InterceptorToAsyncProcessorBridge.java | 2 --
 .../src/main/java/org/apache/camel/processor/LogProcessor.java    | 2 --
 .../main/java/org/apache/camel/processor/MarshalProcessor.java    | 2 --
 .../main/java/org/apache/camel/processor/MulticastProcessor.java  | 2 --
 .../java/org/apache/camel/processor/OnCompletionProcessor.java    | 2 --
 camel-core/src/main/java/org/apache/camel/processor/Pipeline.java | 2 --
 .../src/main/java/org/apache/camel/processor/PipelineHelper.java  | 2 --
 .../java/org/apache/camel/processor/ProcessorExchangePair.java    | 2 --
 .../src/main/java/org/apache/camel/processor/RecipientList.java   | 2 --
 .../java/org/apache/camel/processor/RecipientListProcessor.java   | 2 --
 .../java/org/apache/camel/processor/RedeliveryErrorHandler.java   | 2 --
 .../main/java/org/apache/camel/processor/RedeliveryPolicy.java    | 2 --
 .../src/main/java/org/apache/camel/processor/Resequencer.java     | 2 --
 .../main/java/org/apache/camel/processor/RollbackProcessor.java   | 2 --
 .../main/java/org/apache/camel/processor/SamplingThrottler.java   | 2 --
 camel-core/src/main/java/org/apache/camel/processor/Splitter.java | 2 --
 .../src/main/java/org/apache/camel/processor/StopProcessor.java   | 2 --
 .../main/java/org/apache/camel/processor/StreamResequencer.java   | 3 +--
 .../src/main/java/org/apache/camel/processor/Throttler.java       | 2 --
 .../main/java/org/apache/camel/processor/ThroughputLogger.java    | 2 --
 .../src/main/java/org/apache/camel/processor/TryProcessor.java    | 2 --
 .../main/java/org/apache/camel/processor/UnitOfWorkProducer.java  | 2 --
 .../main/java/org/apache/camel/processor/UnmarshalProcessor.java  | 2 --
 .../main/java/org/apache/camel/processor/WireTapProcessor.java    | 2 --
 .../src/main/java/org/apache/camel/processor/WrapProcessor.java   | 2 --
 .../org/apache/camel/processor/aggregate/AggregationStrategy.java | 2 --
 .../camel/processor/aggregate/ClosedCorrelationKeyException.java  | 2 --
 .../processor/aggregate/CompletionAwareAggregationStrategy.java   | 2 --
 .../processor/aggregate/GroupedExchangeAggregationStrategy.java   | 2 --
 .../processor/aggregate/GroupedMessageAggregationStrategy.java    | 2 --
 .../camel/processor/aggregate/MemoryAggregationRepository.java    | 2 --
 .../camel/processor/aggregate/OptimisticLockRetryPolicy.java      | 2 --
 .../aggregate/OptimisticLockingAwareAggregationStrategy.java      | 2 --
 .../processor/aggregate/TimeoutAwareAggregationStrategy.java      | 2 --
 .../camel/processor/aggregate/UseLatestAggregationStrategy.java   | 2 --
 .../camel/processor/aggregate/UseOriginalAggregationStrategy.java | 1 -
 .../camel/processor/idempotent/FileIdempotentRepository.java      | 2 --
 .../camel/processor/idempotent/MemoryIdempotentRepository.java    | 2 --
 .../apache/camel/processor/idempotent/NoMessageIdException.java   | 2 --
 .../main/java/org/apache/camel/processor/interceptor/Debug.java   | 2 --
 .../org/apache/camel/processor/interceptor/DefaultChannel.java    | 2 --
 .../org/apache/camel/processor/loadbalancer/LoadBalancer.java     | 2 --
 .../apache/camel/processor/loadbalancer/LoadBalancerConsumer.java | 2 --
 .../apache/camel/processor/loadbalancer/LoadBalancerSupport.java  | 2 --
 .../apache/camel/processor/loadbalancer/QueueLoadBalancer.java    | 2 --
 .../apache/camel/processor/loadbalancer/RandomLoadBalancer.java   | 2 --
 .../camel/processor/loadbalancer/RoundRobinLoadBalancer.java      | 2 --
 .../camel/processor/loadbalancer/SimpleLoadBalancerSupport.java   | 2 --
 .../apache/camel/processor/loadbalancer/StickyLoadBalancer.java   | 2 --
 .../apache/camel/processor/loadbalancer/TopicLoadBalancer.java    | 2 --
 .../camel/processor/resequencer/DefaultExchangeComparator.java    | 2 --
 .../org/apache/camel/processor/resequencer/ElementComparator.java | 2 --
 .../camel/processor/resequencer/ExpressionResultComparator.java   | 2 --
 .../camel/processor/resequencer/MessageRejectedException.java     | 2 --
 .../org/apache/camel/processor/resequencer/ResequencerEngine.java | 2 --
 .../java/org/apache/camel/processor/resequencer/Sequence.java     | 2 --
 .../camel/processor/resequencer/SequenceElementComparator.java    | 2 --
 .../org/apache/camel/processor/resequencer/SequenceSender.java    | 3 +--
 .../main/java/org/apache/camel/processor/resequencer/Timeout.java | 2 --
 .../org/apache/camel/processor/resequencer/TimeoutHandler.java    | 2 --
 .../camel/processor/validation/DefaultValidationErrorHandler.java | 2 --
 .../camel/processor/validation/NoXmlBodyValidationException.java  | 2 --
 .../processor/validation/NoXmlHeaderValidationException.java      | 2 --
 .../camel/processor/validation/PredicateValidatingProcessor.java  | 2 --
 .../camel/processor/validation/PredicateValidationException.java  | 2 --
 .../camel/processor/validation/SchemaValidationException.java     | 2 --
 .../apache/camel/processor/validation/ValidatorErrorHandler.java  | 2 --
 .../src/main/java/org/apache/camel/spi/AggregationRepository.java | 1 -
 .../src/main/java/org/apache/camel/spi/AuthorizationPolicy.java   | 2 --
 camel-core/src/main/java/org/apache/camel/spi/Breakpoint.java     | 2 --
 .../src/main/java/org/apache/camel/spi/BrowsableEndpoint.java     | 2 --
 .../src/main/java/org/apache/camel/spi/ComponentResolver.java     | 2 --
 camel-core/src/main/java/org/apache/camel/spi/Condition.java      | 2 --
 camel-core/src/main/java/org/apache/camel/spi/DataFormat.java     | 2 --
 .../src/main/java/org/apache/camel/spi/DataFormatResolver.java    | 2 --
 camel-core/src/main/java/org/apache/camel/spi/Debugger.java       | 2 --
 .../src/main/java/org/apache/camel/spi/EndpointStrategy.java      | 2 --
 camel-core/src/main/java/org/apache/camel/spi/EventFactory.java   | 2 --
 camel-core/src/main/java/org/apache/camel/spi/EventNotifier.java  | 1 -
 .../src/main/java/org/apache/camel/spi/ExceptionHandler.java      | 2 --
 .../src/main/java/org/apache/camel/spi/ExchangeFormatter.java     | 2 --
 .../java/org/apache/camel/spi/ExchangeIdempotentRepository.java   | 2 --
 camel-core/src/main/java/org/apache/camel/spi/FactoryFinder.java  | 2 --
 .../src/main/java/org/apache/camel/spi/FactoryFinderResolver.java | 2 --
 .../src/main/java/org/apache/camel/spi/HeaderFilterStrategy.java  | 2 --
 .../main/java/org/apache/camel/spi/HeaderFilterStrategyAware.java | 1 -
 .../src/main/java/org/apache/camel/spi/IdempotentRepository.java  | 2 --
 .../src/main/java/org/apache/camel/spi/InflightRepository.java    | 2 --
 camel-core/src/main/java/org/apache/camel/spi/Injector.java       | 2 --
 .../src/main/java/org/apache/camel/spi/InterceptStrategy.java     | 2 --
 camel-core/src/main/java/org/apache/camel/spi/Language.java       | 2 --
 .../src/main/java/org/apache/camel/spi/LanguageResolver.java      | 2 --
 camel-core/src/main/java/org/apache/camel/spi/LogListener.java    | 1 -
 .../main/java/org/apache/camel/spi/ManagementNamingStrategy.java  | 2 --
 .../src/main/java/org/apache/camel/spi/ManagementStrategy.java    | 1 -
 camel-core/src/main/java/org/apache/camel/spi/NamespaceAware.java | 2 --
 camel-core/src/main/java/org/apache/camel/spi/NodeIdFactory.java  | 2 --
 .../apache/camel/spi/OptimisticLockingAggregationRepository.java  | 2 --
 camel-core/src/main/java/org/apache/camel/spi/Policy.java         | 2 --
 .../java/org/apache/camel/spi/PollingConsumerPollStrategy.java    | 2 --
 .../src/main/java/org/apache/camel/spi/ProcessorFactory.java      | 2 --
 .../org/apache/camel/spi/RecoverableAggregationRepository.java    | 2 --
 camel-core/src/main/java/org/apache/camel/spi/Registry.java       | 2 --
 camel-core/src/main/java/org/apache/camel/spi/RouteContext.java   | 2 --
 camel-core/src/main/java/org/apache/camel/spi/RoutePolicy.java    | 2 --
 .../src/main/java/org/apache/camel/spi/RouteStartupOrder.java     | 2 --
 camel-core/src/main/java/org/apache/camel/spi/ShutdownAware.java  | 2 --
 .../src/main/java/org/apache/camel/spi/ShutdownStrategy.java      | 2 --
 .../src/main/java/org/apache/camel/spi/Synchronization.java       | 2 --
 .../main/java/org/apache/camel/spi/SynchronizationVetoable.java   | 2 --
 .../src/main/java/org/apache/camel/spi/ThreadPoolProfile.java     | 2 --
 .../src/main/java/org/apache/camel/spi/TransactedPolicy.java      | 2 --
 .../src/main/java/org/apache/camel/spi/TypeConverterAware.java    | 1 -
 .../src/main/java/org/apache/camel/spi/TypeConverterLoader.java   | 2 --
 .../src/main/java/org/apache/camel/spi/TypeConverterRegistry.java | 2 --
 .../src/main/java/org/apache/camel/support/DefaultTimeoutMap.java | 2 --
 .../main/java/org/apache/camel/support/EventNotifierSupport.java  | 2 --
 .../src/main/java/org/apache/camel/support/ExpressionAdapter.java | 2 --
 .../src/main/java/org/apache/camel/support/ExpressionSupport.java | 2 --
 .../java/org/apache/camel/support/LoggingExceptionHandler.java    | 2 --
 .../main/java/org/apache/camel/support/RoutePolicySupport.java    | 2 --
 .../src/main/java/org/apache/camel/support/ServiceSupport.java    | 2 --
 .../java/org/apache/camel/support/SynchronizationAdapter.java     | 2 --
 .../src/main/java/org/apache/camel/support/TimeoutMapEntry.java   | 2 --
 .../java/org/apache/camel/util/AsyncProcessorConverterHelper.java | 2 --
 .../src/main/java/org/apache/camel/util/CamelContextHelper.java   | 2 --
 camel-core/src/main/java/org/apache/camel/util/CamelLogger.java   | 2 --
 .../src/main/java/org/apache/camel/util/CaseInsensitiveMap.java   | 2 --
 .../src/main/java/org/apache/camel/util/CollectionHelper.java     | 2 --
 .../main/java/org/apache/camel/util/CollectionStringBuffer.java   | 2 --
 camel-core/src/main/java/org/apache/camel/util/EventHelper.java   | 2 --
 .../src/main/java/org/apache/camel/util/ExchangeHelper.java       | 4 ----
 .../src/main/java/org/apache/camel/util/ExpressionComparator.java | 1 -
 .../main/java/org/apache/camel/util/ExpressionListComparator.java | 2 --
 camel-core/src/main/java/org/apache/camel/util/IOHelper.java      | 2 --
 .../src/main/java/org/apache/camel/util/KeyValueHolder.java       | 2 --
 camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java  | 2 --
 camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java    | 2 --
 .../src/main/java/org/apache/camel/util/OrderedComparator.java    | 2 --
 camel-core/src/main/java/org/apache/camel/util/PackageHelper.java | 2 --
 .../main/java/org/apache/camel/util/PredicateAssertHelper.java    | 2 --
 .../src/main/java/org/apache/camel/util/ReflectionInjector.java   | 2 --
 .../src/main/java/org/apache/camel/util/ResolverHelper.java       | 2 --
 camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java | 2 --
 camel-core/src/main/java/org/apache/camel/util/StopWatch.java     | 2 --
 camel-core/src/main/java/org/apache/camel/util/Time.java          | 2 --
 camel-core/src/main/java/org/apache/camel/util/TimeUtils.java     | 2 --
 camel-core/src/main/java/org/apache/camel/util/URISupport.java    | 2 --
 .../src/main/java/org/apache/camel/util/UnitOfWorkHelper.java     | 2 --
 .../camel/util/concurrent/SubmitOrderedCompletionService.java     | 2 --
 .../apache/camel/util/concurrent/SynchronousExecutorService.java  | 2 --
 .../org/apache/camel/util/jndi/CamelInitialContextFactory.java    | 2 --
 .../camel/util/jndi/CamelSingletonInitialContextFactory.java      | 2 --
 .../src/main/java/org/apache/camel/util/jndi/JndiContext.java     | 2 --
 .../apache/camel/util/toolbox/FlexibleAggregationStrategy.java    | 1 -
 .../src/test/java/org/apache/camel/BodyAndHeaderConvertTest.java  | 3 ---
 .../src/test/java/org/apache/camel/CamelExceptionsTest.java       | 3 ---
 camel-core/src/test/java/org/apache/camel/ContextTestSupport.java | 2 --
 .../src/test/java/org/apache/camel/ExchangePatternTest.java       | 3 ---
 .../src/test/java/org/apache/camel/ExchangeTestSupport.java       | 2 --
 .../src/test/java/org/apache/camel/InjectorDefaultsTest.java      | 3 ---
 .../src/test/java/org/apache/camel/LanguageTestSupport.java       | 1 -
 camel-core/src/test/java/org/apache/camel/MyBarSingleton.java     | 3 ---
 camel-core/src/test/java/org/apache/camel/MyFoo.java              | 3 ---
 .../src/test/java/org/apache/camel/SuspendableServiceTest.java    | 3 ---
 .../java/org/apache/camel/builder/AddRoutesAtRuntimeTest.java     | 2 --
 .../test/java/org/apache/camel/builder/BuilderWithScopesTest.java | 3 ---
 .../src/test/java/org/apache/camel/builder/ErrorHandlerTest.java  | 3 ---
 .../test/java/org/apache/camel/builder/ExpressionBuilderTest.java | 3 ---
 .../test/java/org/apache/camel/builder/ExpressionClauseTest.java  | 3 ---
 .../java/org/apache/camel/builder/ExpressionFunctionTest.java     | 3 ---
 .../java/org/apache/camel/builder/NotifyBuilderFromRouteTest.java | 3 ---
 .../src/test/java/org/apache/camel/builder/NotifyBuilderTest.java | 3 ---
 .../apache/camel/builder/NotifyBuilderWhenDoneByIndexTest.java    | 3 ---
 .../org/apache/camel/builder/PredicateBinaryCoerceRouteTest.java  | 3 ---
 .../org/apache/camel/builder/PredicateBinaryCoerceTypeTest.java   | 3 ---
 .../org/apache/camel/builder/PredicateBuilderConcurrentTest.java  | 3 ---
 .../camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java     | 3 ---
 .../java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java  | 3 ---
 .../src/test/java/org/apache/camel/builder/RouteBuilderTest.java  | 3 ---
 .../src/test/java/org/apache/camel/builder/SimpleBuilderTest.java | 3 ---
 .../test/java/org/apache/camel/builder/ThreadPoolBuilderTest.java | 3 ---
 .../src/test/java/org/apache/camel/builder/ValueBuilderTest.java  | 3 ---
 .../org/apache/camel/builder/xml/DefaultNamespaceContextTest.java | 3 ---
 .../src/test/java/org/apache/camel/builder/xml/XPathMockTest.java | 3 ---
 .../org/apache/camel/builder/xml/XPathNestedNamespaceTest.java    | 3 ---
 .../src/test/java/org/apache/camel/builder/xml/XPathTest.java     | 3 ---
 .../org/apache/camel/builder/xml/XPathTransformRouteTest.java     | 3 ---
 .../java/org/apache/camel/builder/xml/XPathTransformTest.java     | 3 ---
 .../apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java  | 3 ---
 .../test/java/org/apache/camel/builder/xml/XsltBuilderTest.java   | 3 ---
 .../java/org/apache/camel/builder/xml/XsltOutputFileTest.java     | 3 ---
 .../src/test/java/org/apache/camel/builder/xml/XsltTest.java      | 3 ---
 .../bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java   | 3 ---
 .../java/org/apache/camel/component/bean/BeanConcurrentTest.java  | 3 ---
 .../java/org/apache/camel/component/bean/BeanEndpointTest.java    | 3 ---
 .../org/apache/camel/component/bean/BeanExcludedMethodTest.java   | 3 ---
 .../camel/component/bean/BeanExplicitMethodAmbiguousTest.java     | 3 ---
 .../org/apache/camel/component/bean/BeanExplicitMethodTest.java   | 3 ---
 .../apache/camel/component/bean/BeanExpressionConcurrentTest.java | 3 ---
 .../camel/component/bean/BeanHandlerMethodPredicateTest.java      | 3 ---
 .../org/apache/camel/component/bean/BeanHandlerMethodTest.java    | 3 ---
 .../camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java  | 3 ---
 .../org/apache/camel/component/bean/BeanInfoOverloadedTest.java   | 3 ---
 .../component/bean/BeanInfoOverloadedWithSubTypeParamTest.java    | 3 ---
 .../org/apache/camel/component/bean/BeanInfoSelectMethodTest.java | 3 ---
 .../test/java/org/apache/camel/component/bean/BeanInfoTest.java   | 3 ---
 .../apache/camel/component/bean/BeanInvocationSerializeTest.java  | 3 ---
 .../org/apache/camel/component/bean/BeanInvokeStaticTest.java     | 3 ---
 .../test/java/org/apache/camel/component/bean/BeanInvokeTest.java | 3 ---
 .../apache/camel/component/bean/BeanInvokeWithNullBodyTest.java   | 3 ---
 .../java/org/apache/camel/component/bean/BeanLifecycleTest.java   | 3 ---
 .../component/bean/BeanLookupUsingJndiRegistryIssueTest.java      | 3 ---
 .../test/java/org/apache/camel/component/bean/BeanMapPutTest.java | 3 ---
 .../java/org/apache/camel/component/bean/BeanMethodBeanTest.java  | 3 ---
 .../java/org/apache/camel/component/bean/BeanNoCacheTest.java     | 3 ---
 .../camel/component/bean/BeanNoTypeConvertionPossibleTest.java    | 3 ---
 .../bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java          | 3 ---
 .../component/bean/BeanParameterBindingStreamCachingTest.java     | 3 ---
 .../org/apache/camel/component/bean/BeanParameterInfoTest.java    | 3 ---
 .../org/apache/camel/component/bean/BeanPropagateHeaderTest.java  | 3 ---
 .../org/apache/camel/component/bean/BeanProxyNoBindingTest.java   | 3 ---
 .../test/java/org/apache/camel/component/bean/BeanProxyTest.java  | 3 ---
 .../apache/camel/component/bean/BeanRefMethodNotFoundTest.java    | 3 ---
 .../java/org/apache/camel/component/bean/BeanRefNoCacheTest.java  | 3 ---
 .../java/org/apache/camel/component/bean/BeanRefNotFoundTest.java | 3 ---
 .../org/apache/camel/component/bean/BeanRegistryBeanTest.java     | 3 ---
 .../component/bean/BeanWithExpressionInjectionPredicateTest.java  | 3 ---
 .../camel/component/bean/BeanWithExpressionInjectionTest.java     | 3 ---
 .../org/apache/camel/component/bean/BeanWithHeaderAnnotation.java | 3 ---
 .../camel/component/bean/BeanWithHeadersAndBodyInject2Test.java   | 3 ---
 .../camel/component/bean/BeanWithHeadersAndBodyInject3Test.java   | 3 ---
 .../camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java | 3 ---
 .../org/apache/camel/component/bean/BeanWithMethodHeaderTest.java | 3 ---
 .../bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java    | 3 ---
 .../component/bean/BeanWithPropertiesAndHeadersInjectionTest.java | 3 ---
 .../component/bean/BodyAnnotationToDisambiguateMethodsTest.java   | 3 ---
 .../component/bean/ClassComponentInvalidConfigurationTest.java    | 3 ---
 .../java/org/apache/camel/component/bean/ClassComponentTest.java  | 3 ---
 .../ClassComponentWithPropertiesLookupSetFromEndpointTest.java    | 3 ---
 .../bean/ClassComponentWithPropertiesSetFromEndpointTest.java     | 3 ---
 .../camel/component/bean/CustomParameterMappingStrategyTest.java  | 3 ---
 .../camel/component/bean/DefaultParameterMappingStrategyTest.java | 3 ---
 .../bean/ExpressionAnnotationToDisambiguateMethodsTest.java       | 3 ---
 .../apache/camel/component/bean/FileBeanParameterBindingTest.java | 3 ---
 .../camel/component/bean/MethodCallBeanRefMethodNotFoundTest.java | 3 ---
 .../camel/component/bean/MethodCallBeanRefNotFoundTest.java       | 3 ---
 .../camel/component/bean/MethodCallRefOrBeanPrefixTest.java       | 3 ---
 .../apache/camel/component/bean/MethodCallStaticMethodTest.java   | 3 ---
 .../org/apache/camel/component/bean/MyApplicationException.java   | 3 ---
 .../test/java/org/apache/camel/component/bean/MyDummyBean.java    | 3 ---
 .../src/test/java/org/apache/camel/component/bean/MyFooBean.java  | 3 ---
 .../src/test/java/org/apache/camel/component/bean/MyService.java  | 3 ---
 .../java/org/apache/camel/component/bean/MyServiceProxyTest.java  | 3 ---
 .../java/org/apache/camel/component/bean/NewInstanceTest.java     | 3 ---
 .../test/java/org/apache/camel/component/bean/OrderService.java   | 3 ---
 .../java/org/apache/camel/component/bean/OrderServiceBean.java    | 3 ---
 .../java/org/apache/camel/component/bean/PredicateAsBeanTest.java | 3 ---
 .../camel/component/bean/ProxyReturnFutureExceptionTest.java      | 3 ---
 .../apache/camel/component/bean/ProxyReturnFutureListTest.java    | 3 ---
 .../org/apache/camel/component/bean/ProxyReturnFutureTest.java    | 3 ---
 .../java/org/apache/camel/component/bean/issues/BaseClass.java    | 3 ---
 .../camel/component/bean/issues/BeanRouteToDerivedClassTest.java  | 3 ---
 .../java/org/apache/camel/component/bean/issues/DerivedClass.java | 3 ---
 .../component/bean/issues/FilterBeanLanguageNonRegistryTest.java  | 3 ---
 .../camel/component/bean/issues/FilterBeanNonRegistryTest.java    | 3 ---
 .../camel/component/bean/issues/FilterBeanRegistryTest.java       | 3 ---
 .../apache/camel/component/bean/issues/FilterPojoIssueTest.java   | 3 ---
 .../java/org/apache/camel/component/bean/issues/MyMessage.java    | 3 ---
 .../org/apache/camel/component/bean/issues/MyMessageListener.java | 3 ---
 .../component/bean/issues/MyMessageToProcessorConverter.java      | 3 ---
 .../apache/camel/component/bean/issues/TransformerIssueTest.java  | 3 ---
 .../org/apache/camel/component/browse/BrowseEndpointTest.java     | 3 ---
 .../java/org/apache/camel/component/browse/BrowseRouteTest.java   | 3 ---
 .../test/java/org/apache/camel/component/browse/BrowseTest.java   | 3 ---
 .../java/org/apache/camel/component/dataset/BigDataSetTest.java   | 3 ---
 .../org/apache/camel/component/dataset/CustomDataSetTest.java     | 3 ---
 .../org/apache/camel/component/dataset/DataSetConsumerTest.java   | 3 ---
 .../org/apache/camel/component/dataset/DataSetEndpointTest.java   | 3 ---
 .../org/apache/camel/component/dataset/DataSetPreloadTest.java    | 3 ---
 .../org/apache/camel/component/dataset/DataSetProducerTest.java   | 3 ---
 .../test/java/org/apache/camel/component/dataset/DataSetTest.java | 3 ---
 .../apache/camel/component/dataset/FileDataSetConsumerTest.java   | 3 ---
 .../camel/component/dataset/FileDataSetConsumerWithSplitTest.java | 3 ---
 .../apache/camel/component/dataset/FileDataSetProducerTest.java   | 3 ---
 .../camel/component/dataset/FileDataSetProducerWithSplitTest.java | 3 ---
 .../apache/camel/component/dataset/ListDataSetConsumerTest.java   | 3 ---
 .../apache/camel/component/dataset/ListDataSetProducerTest.java   | 3 ---
 .../camel/component/direct/DirectEndpointRouteInlinedTest.java    | 3 ---
 .../org/apache/camel/component/direct/DirectEndpointTest.java     | 3 ---
 .../org/apache/camel/component/direct/DirectNoConsumerTest.java   | 3 ---
 .../java/org/apache/camel/component/direct/DirectQueueTest.java   | 3 ---
 .../java/org/apache/camel/component/direct/DirectRouteTest.java   | 3 ---
 .../component/direct/SendToNonExistingDirectEndpointTest.java     | 3 ---
 .../direct/SendingToAlotOfDifferentDirectEndpointTest.java        | 3 ---
 .../camel/component/direct/TwoCamelContextDirectEndpointTest.java | 3 ---
 .../apache/camel/component/directvm/DirectVmNoConsumerTest.java   | 3 ---
 .../org/apache/camel/component/file/DirectoryCreateIssueTest.java | 3 ---
 .../camel/component/file/FileAbsoluteAndRelativeConsumerTest.java | 3 ---
 .../apache/camel/component/file/FileAbsolutePathIssueTest.java    | 3 ---
 .../camel/component/file/FileBatchConsumerMemoryLeakTest.java     | 2 --
 .../apache/camel/component/file/FileBeginFailureOneTimeTest.java  | 3 ---
 .../java/org/apache/camel/component/file/FileConfigureTest.java   | 3 ---
 .../camel/component/file/FileConsumeNoopIdempotentAutoTest.java   | 2 --
 .../component/file/FileConsumeNoopIdempotentDisabledTest.java     | 3 ---
 .../component/file/FileConsumeNoopIdempotentEnabledTest.java      | 3 ---
 .../file/FileConsumePollEnrichFileUsingProcessorTest.java         | 3 ---
 .../file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java         | 3 ---
 .../file/FileConsumeSimpleAbsoluteMoveToRelativeTest.java         | 3 ---
 .../file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java         | 3 ---
 .../file/FileConsumeSimpleRelativeMoveToRelativeTest.java         | 3 ---
 .../camel/component/file/FileConsumeWithDollarInPathTest.java     | 3 ---
 .../camel/component/file/FileConsumerAutoCreateDirectoryTest.java | 3 ---
 .../camel/component/file/FileConsumerDeleteAndFailureTest.java    | 3 ---
 .../camel/component/file/FileConsumerDeleteAndMoveFailedTest.java | 3 ---
 .../camel/component/file/FileConsumerMoveAndMoveFailureTest.java  | 3 ---
 .../component/file/FileConsumerMoveFailureOnCompletionTest.java   | 3 ---
 .../apache/camel/component/file/FileConsumerMoveFailureTest.java  | 3 ---
 .../org/apache/camel/component/file/FileConsumerNoopTest.java     | 3 ---
 .../FileConsumerPreMoveCopyAndDeleteOnRenameFailFalseTest.java    | 3 ---
 .../camel/component/file/FileConsumerPreMoveDeleteTest.java       | 3 ---
 .../apache/camel/component/file/FileConsumerPreMoveIssueTest.java | 3 ---
 .../apache/camel/component/file/FileConsumerPreMoveNoopTest.java  | 3 ---
 .../org/apache/camel/component/file/FileConsumerPreMoveTest.java  | 3 ---
 .../file/FileConsumerPreMoveWithProbeContentTypeTest.java         | 3 ---
 .../camel/component/file/FileConsumerProducerRouteTest.java       | 3 ---
 .../camel/component/file/FileConsumerRelativeFileNameTest.java    | 3 ---
 .../camel/component/file/FileConsumerSuspendAndResumeTest.java    | 3 ---
 .../org/apache/camel/component/file/FileConsumerSuspendTest.java  | 3 ---
 .../org/apache/camel/component/file/FileConsumerTemplateTest.java | 3 ---
 .../apache/camel/component/file/FileContentBasedRouterTest.java   | 3 ---
 .../apache/camel/component/file/FileConvertBodyToUTF8Test.java    | 3 ---
 .../camel/component/file/FileEagerDeleteTargetFileTest.java       | 3 ---
 .../camel/component/file/FileIdempotentReadSameFileAgainTest.java | 3 ---
 .../apache/camel/component/file/FileInvalidStartingPathTest.java  | 3 ---
 .../org/apache/camel/component/file/FileKeepLastModifiedTest.java | 3 ---
 .../java/org/apache/camel/component/file/FileLanguageCBRTest.java | 3 ---
 .../component/file/FileMarkerFileDeleteOldLockFilesTest.java      | 3 ---
 .../file/FileMarkerFileRecursiveDeleteOldLockFilesTest.java       | 3 ---
 .../file/FileMarkerFileRecursiveDoNotDeleteOldLockFilesTest.java  | 3 ---
 ...ileMarkerFileRecursiveFilterDeleteOldLockFilesIncludeTest.java | 3 ---
 .../file/FileMarkerFileRecursiveFilterDeleteOldLockFilesTest.java | 3 ---
 .../org/apache/camel/component/file/FilePollEnrichNoWaitTest.java | 3 ---
 .../java/org/apache/camel/component/file/FilePollEnrichTest.java  | 3 ---
 .../file/FileProducerFileExistAppendNoFileBeforeTest.java         | 3 ---
 .../camel/component/file/FileProducerFileExistAppendTest.java     | 3 ---
 .../camel/component/file/FileProducerFileExistFailTest.java       | 3 ---
 .../camel/component/file/FileProducerFileExistIgnoreTest.java     | 3 ---
 .../file/FileProducerFileExistOverrideNoFileBeforeTest.java       | 3 ---
 .../camel/component/file/FileProducerFileExistOverrideTest.java   | 3 ---
 .../camel/component/file/FileProducerFileExistTryRenameTest.java  | 3 ---
 .../camel/component/file/FileProducerFilenameConstantTest.java    | 3 ---
 .../camel/component/file/FileProducerTempFileExistsIssueTest.java | 3 ---
 .../org/apache/camel/component/file/FileRecursiveNoopTest.java    | 3 ---
 .../camel/component/file/FileRenameFileOnCommitIssueTest.java     | 3 ---
 .../component/file/FileRenameReadLockMustUseMarkerFileTest.java   | 3 ---
 .../apache/camel/component/file/FileToFileNioLowBufferTest.java   | 3 ---
 .../apache/camel/component/file/FileToFileWithFlattenTest.java    | 3 ---
 .../component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java | 3 ---
 .../component/file/FromFileDoNotMoveFileIfProcessFailsTest.java   | 3 ---
 .../camel/component/file/FromFileMoveFileIfProcessFailsTest.java  | 3 ---
 .../apache/camel/component/file/FromFileMulticastToFilesTest.java | 3 ---
 .../org/apache/camel/component/file/GenericFileConverterTest.java | 3 ---
 .../java/org/apache/camel/component/file/XPathToFileTest.java     | 3 ---
 .../file/strategy/FileChangedReadLockMinAgeShortCircuitTest.java  | 3 ---
 .../component/file/strategy/FileChangedReadLockMinAgeTest.java    | 3 ---
 .../camel/component/file/strategy/FileChangedReadLockTest.java    | 3 ---
 .../component/file/strategy/FileChangedReadLockTimeoutTest.java   | 3 ---
 .../file/strategy/FileChangedZeroLengthReadLockTest.java          | 3 ---
 .../file/strategy/FileIdempotentChangedReadLockTest.java          | 3 ---
 .../file/strategy/FileIdempotentReadLockDelayedAsyncTest.java     | 3 ---
 .../file/strategy/FileIdempotentReadLockDelayedTest.java          | 3 ---
 .../camel/component/file/strategy/FileIdempotentReadLockTest.java | 3 ---
 .../component/file/strategy/FileIdempotentRenameReadLockTest.java | 3 ---
 .../file/strategy/GenericFileDeleteProcessStrategyTest.java       | 2 --
 .../camel/component/file/stress/FileAsyncStressFileDropper.java   | 3 ---
 .../camel/component/file/stress/FileAsyncStressManually.java      | 3 ---
 .../file/stress/FileAsyncStressReadLockLockFileTest.java          | 3 ---
 .../component/file/stress/FileAsyncStressReadLockNoneTest.java    | 3 ---
 .../component/file/stress/FileAsyncStressReadLockRenameTest.java  | 3 ---
 .../apache/camel/component/file/stress/FileAsyncStressTest.java   | 3 ---
 .../component/file/stress/FileConsumerPollManyFilesTest.java      | 3 ---
 .../apache/camel/component/language/LanguageCacheScriptTest.java  | 3 ---
 .../camel/component/language/LanguageEndpointScriptRouteTest.java | 3 ---
 .../apache/camel/component/language/LanguageHeaderRouteTest.java  | 3 ---
 .../language/LanguageLoadScriptFromClasspathHeaderTest.java       | 3 ---
 .../component/language/LanguageLoadScriptFromClasspathTest.java   | 3 ---
 .../component/language/LanguageLoadScriptFromFileCachedTest.java  | 3 ---
 .../component/language/LanguageLoadScriptFromFileUpdateTest.java  | 3 ---
 .../camel/component/language/LanguageNoCacheScriptTest.java       | 3 ---
 .../language/LanguageResourceLoadConstantFromClasspathTest.java   | 3 ---
 .../language/LanguageResourceLoadScriptFromClasspathTest.java     | 3 ---
 .../camel/component/language/LanguageRouteConvertBodyTest.java    | 3 ---
 .../camel/component/language/LanguageRouteNoTransformTest.java    | 3 ---
 .../org/apache/camel/component/language/LanguageRouteTest.java    | 3 ---
 .../language/LanguageScriptInHeaderRouteTakePrecedenceTest.java   | 3 ---
 .../camel/component/language/LanguageScriptInHeaderRouteTest.java | 3 ---
 .../apache/camel/component/language/LanguageScriptRouteTest.java  | 3 ---
 .../apache/camel/component/language/LanguageXPathRouteTest.java   | 3 ---
 .../test/java/org/apache/camel/component/log/LogEndpointTest.java | 3 ---
 .../java/org/apache/camel/component/log/LogInputStreamTest.java   | 3 ---
 .../test/java/org/apache/camel/component/log/LogRouteTest.java    | 3 ---
 .../java/org/apache/camel/component/log/ThroughputLoggerTest.java | 3 ---
 .../test/java/org/apache/camel/component/mock/MockAsBeanTest.java | 3 ---
 .../org/apache/camel/component/mock/MockAssertionClauseTest.java  | 3 ---
 .../java/org/apache/camel/component/mock/MockEndpointTest.java    | 3 ---
 .../apache/camel/component/mock/MockEndpointTimeClauseTest.java   | 3 ---
 .../apache/camel/component/mock/MockExpectedBodiesAsListTest.java | 3 ---
 .../java/org/apache/camel/component/mock/MockPredicateTest.java   | 3 ---
 .../java/org/apache/camel/component/mock/MockThroughtputTest.java | 3 ---
 .../test/java/org/apache/camel/component/pojo/PojoRouteTest.java  | 3 ---
 .../properties/ComponentResolvePropertyPlaceholdersTest.java      | 3 ---
 .../PropertiesComponentAdviceWithInterceptSendToEndpointTest.java | 3 ---
 .../component/properties/PropertiesComponentDefaultTest.java      | 3 ---
 .../properties/PropertiesComponentEIPChoiceConvertBodyToTest.java | 3 ---
 .../properties/PropertiesComponentEIPChoiceSimpleTest.java        | 3 ---
 .../properties/PropertiesComponentEIPConvertBodyToTest.java       | 3 ---
 .../properties/PropertiesComponentEIPRoutingSlipTest.java         | 3 ---
 .../component/properties/PropertiesComponentEncodingTest.java     | 3 ---
 .../component/properties/PropertiesComponentEndpointTest.java     | 3 ---
 .../component/properties/PropertiesComponentGetOrElseTest.java    | 3 ---
 .../properties/PropertiesComponentInitialPropertiesTest.java      | 3 ---
 .../properties/PropertiesComponentInterceptFromTest.java          | 3 ---
 .../PropertiesComponentInterceptSendToEndpointTest.java           | 3 ---
 .../properties/PropertiesComponentLoadPropertiesFromFileTest.java | 3 ---
 .../PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java  | 3 ---
 .../PropertiesComponentLocationWithJvmPropertyTest.java           | 3 ---
 .../PropertiesComponentLocationWithTwoJvmPropertyTest.java        | 3 ---
 .../PropertiesComponentOnExceptionDelayPatternTest.java           | 3 ---
 .../component/properties/PropertiesComponentOnExceptionTest.java  | 3 ---
 .../properties/PropertiesComponentOverridePropertiesTest.java     | 3 ---
 .../camel/component/properties/PropertiesComponentRefTest.java    | 3 ---
 .../component/properties/PropertiesComponentRegistryTest.java     | 3 ---
 .../component/properties/PropertiesComponentRestartTest.java      | 3 ---
 .../properties/PropertiesComponentSetHeaderSimpleTest.java        | 3 ---
 .../properties/PropertiesComponentSimpleLanguageTest.java         | 3 ---
 .../PropertiesComponentSomethingElseBoundToJndiTest.java          | 3 ---
 .../camel/component/properties/PropertiesComponentTest.java       | 3 ---
 .../properties/PropertiesEnvironmentVariableOverrideTest.java     | 3 ---
 .../apache/camel/component/properties/PropertiesResolverTest.java | 3 ---
 .../java/org/apache/camel/component/ref/RefFileEndpointTest.java  | 3 ---
 .../test/java/org/apache/camel/component/ref/RefInvalidTest.java  | 3 ---
 .../camel/component/scheduler/SchedulerNoPolledMessagesTest.java  | 3 ---
 .../org/apache/camel/component/scheduler/SchedulerRouteTest.java  | 3 ---
 .../scheduler/TwoSchedulerConcurrentTasksOneRouteTest.java        | 3 ---
 .../component/scheduler/TwoSchedulerConcurrentTasksTest.java      | 3 ---
 .../org/apache/camel/component/scheduler/TwoSchedulerTest.java    | 3 ---
 .../camel/component/seda/DirectRequestReplyAndSedaInOnlyTest.java | 3 ---
 .../component/seda/FileSedaShutdownCompleteAllTasksTest.java      | 3 ---
 .../org/apache/camel/component/seda/SedaAsyncProducerTest.java    | 2 --
 .../org/apache/camel/component/seda/SedaComplexInOutTest.java     | 3 ---
 .../camel/component/seda/SedaConcurrentConsumersNPEIssueTest.java | 3 ---
 .../apache/camel/component/seda/SedaConcurrentConsumersTest.java  | 3 ---
 .../java/org/apache/camel/component/seda/SedaConcurrentTest.java  | 3 ---
 .../java/org/apache/camel/component/seda/SedaConfigureTest.java   | 3 ---
 .../camel/component/seda/SedaDefaultUnboundedQueueSizeTest.java   | 3 ---
 .../apache/camel/component/seda/SedaDiscardIfNoConsumerTest.java  | 3 ---
 .../java/org/apache/camel/component/seda/SedaEndpointTest.java    | 3 ---
 .../org/apache/camel/component/seda/SedaInOnlyChainedTest.java    | 3 ---
 .../test/java/org/apache/camel/component/seda/SedaInOnlyTest.java | 3 ---
 .../org/apache/camel/component/seda/SedaInOutBigChainedTest.java  | 3 ---
 .../org/apache/camel/component/seda/SedaInOutChainedTest.java     | 3 ---
 .../apache/camel/component/seda/SedaInOutChainedTimeoutTest.java  | 3 ---
 .../component/seda/SedaInOutChainedWithOnCompletionTest.java      | 3 ---
 .../test/java/org/apache/camel/component/seda/SedaInOutTest.java  | 3 ---
 .../component/seda/SedaInOutWithErrorDeadLetterChannelTest.java   | 3 ---
 .../org/apache/camel/component/seda/SedaInOutWithErrorTest.java   | 3 ---
 .../apache/camel/component/seda/SedaMultipleConsumersTest.java    | 3 ---
 .../java/org/apache/camel/component/seda/SedaNoConsumerTest.java  | 3 ---
 .../apache/camel/component/seda/SedaPurgeWhenStoppingTest.java    | 3 ---
 .../test/java/org/apache/camel/component/seda/SedaQueueTest.java  | 3 ---
 .../camel/component/seda/SedaRemoveRouteThenAddAgainTest.java     | 3 ---
 .../test/java/org/apache/camel/component/seda/SedaRouteTest.java  | 3 ---
 .../org/apache/camel/component/seda/SedaTimeoutDisabledTest.java  | 3 ---
 .../java/org/apache/camel/component/seda/SedaTimeoutTest.java     | 3 ---
 .../java/org/apache/camel/component/seda/SedaUnitOfWorkTest.java  | 2 --
 .../camel/component/seda/SedaWaitForTaskAsPropertyTest.java       | 3 ---
 .../component/seda/SedaWaitForTaskCompleteOnCompletionTest.java   | 3 ---
 .../apache/camel/component/seda/SedaWaitForTaskCompleteTest.java  | 3 ---
 .../camel/component/seda/SedaWaitForTaskIfReplyExpectedTest.java  | 3 ---
 .../component/seda/SedaWaitForTaskNewerOnCompletionTest.java      | 3 ---
 .../org/apache/camel/component/seda/SedaWaitForTaskNewerTest.java | 3 ---
 .../org/apache/camel/component/seda/TracingWithDelayTest.java     | 3 ---
 .../java/org/apache/camel/component/timer/TimerAsyncTest.java     | 3 ---
 .../java/org/apache/camel/component/timer/TimerDelayTest.java     | 3 ---
 .../java/org/apache/camel/component/timer/TimerEndpointTest.java  | 3 ---
 .../apache/camel/component/timer/TimerGracefulShutdownTest.java   | 3 ---
 .../test/java/org/apache/camel/component/timer/TimerNameTest.java | 3 ---
 .../org/apache/camel/component/timer/TimerNegativeDelayTest.java  | 3 ---
 .../component/timer/TimerNegativeNoRepeatCountDelayTest.java      | 3 ---
 .../java/org/apache/camel/component/timer/TimerRestartTest.java   | 3 ---
 .../java/org/apache/camel/component/timer/TimerRouteTest.java     | 3 ---
 .../apache/camel/component/timer/TimerRouteWithTracerTest.java    | 3 ---
 .../camel/component/timer/TimerSuspendCamelContextTest.java       | 3 ---
 .../org/apache/camel/component/timer/TimerWithTimeOptionTest.java | 3 ---
 .../java/org/apache/camel/component/vm/AbstractVmTestSupport.java | 3 ---
 .../org/apache/camel/component/vm/VmConcurrentConsumersTest.java  | 3 ---
 .../component/vm/VmDifferentOptionsOnConsumerAndProducerTest.java | 3 ---
 .../org/apache/camel/component/vm/VmDiscardIfNoConsumerTest.java  | 3 ---
 .../java/org/apache/camel/component/vm/VmInOnlyChainedTest.java   | 3 ---
 .../src/test/java/org/apache/camel/component/vm/VmInOnlyTest.java | 3 ---
 .../java/org/apache/camel/component/vm/VmInOutChainedTest.java    | 3 ---
 .../org/apache/camel/component/vm/VmInOutChainedTimeoutTest.java  | 3 ---
 .../src/test/java/org/apache/camel/component/vm/VmInOutTest.java  | 3 ---
 .../java/org/apache/camel/component/vm/VmInOutWithErrorTest.java  | 3 ---
 .../camel/component/vm/VmMultipleContextsStartStopTest.java       | 3 ---
 .../src/test/java/org/apache/camel/component/vm/VmQueueTest.java  | 3 ---
 .../java/org/apache/camel/component/vm/VmTimeoutIssueTest.java    | 3 ---
 .../java/org/apache/camel/component/vm/VmUseSameQueueTest.java    | 3 ---
 .../org/apache/camel/component/vm/VmWaitForTaskCompleteTest.java  | 3 ---
 .../camel/component/vm/VmWaitForTaskIfReplyExpectedTest.java      | 3 ---
 .../org/apache/camel/component/vm/VmWaitForTaskNewerTest.java     | 3 ---
 .../camel/component/xslt/XsltTransformingExceptionTest.java       | 3 ---
 .../test/java/org/apache/camel/converter/CamelConverterTest.java  | 3 ---
 .../src/test/java/org/apache/camel/converter/ConverterTest.java   | 3 ---
 .../test/java/org/apache/camel/converter/EnumConverterTest.java   | 3 ---
 .../test/java/org/apache/camel/converter/FallbackPromoteTest.java | 3 ---
 .../test/java/org/apache/camel/converter/FutureConverterTest.java | 3 ---
 .../org/apache/camel/converter/InstanceFallbackConverterTest.java | 3 ---
 camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java | 3 ---
 .../src/test/java/org/apache/camel/converter/MyCoolBean.java      | 3 ---
 .../test/java/org/apache/camel/converter/NIOConverterTest.java    | 3 ---
 .../java/org/apache/camel/converter/ObjectConverterNaNTest.java   | 3 ---
 .../test/java/org/apache/camel/converter/ObjectConverterTest.java | 3 ---
 .../apache/camel/converter/PrimitiveTypeConverterIssueTest.java   | 3 ---
 .../camel/converter/PropertyEditorTypeConverterIssueTest.java     | 3 ---
 .../src/test/java/org/apache/camel/converter/PurchaseOrder.java   | 3 ---
 .../org/apache/camel/converter/StaticFallbackConverterTest.java   | 3 ---
 .../test/java/org/apache/camel/converter/StringSourceTest.java    | 3 ---
 .../java/org/apache/camel/converter/TypeConverterAwareTest.java   | 3 ---
 .../java/org/apache/camel/converter/jaxp/BytesSourceTest.java     | 3 ---
 .../java/org/apache/camel/converter/jaxp/DomConverterTest.java    | 3 ---
 .../apache/camel/converter/jaxp/StreamSourceConverterTest.java    | 3 ---
 .../java/org/apache/camel/converter/jaxp/XmlConverterTest.java    | 3 ---
 .../converter/myconverter/InstanceDummyFallbackConverter.java     | 3 ---
 .../camel/converter/myconverter/MyFallbackPromoteConverter.java   | 3 ---
 .../camel/converter/myconverter/PurchaseOrderConverter.java       | 3 ---
 .../camel/converter/myconverter/StaticDummyFallbackConverter.java | 3 ---
 .../camel/converter/stream/ByteArrayInputStreamCacheTest.java     | 3 ---
 .../apache/camel/converter/stream/FileInputStreamCacheTest.java   | 3 ---
 .../org/apache/camel/converter/stream/InputStreamCacheTest.java   | 3 ---
 .../java/org/apache/camel/converter/stream/ReaderCacheTest.java   | 3 ---
 .../java/org/apache/camel/converter/stream/SourceCacheTest.java   | 3 ---
 .../org/apache/camel/converter/stream/StreamSourceCacheTest.java  | 3 ---
 .../camel/impl/CamelContextAddRestDefinitionsFromXmlTest.java     | 3 ---
 .../camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java    | 3 ---
 .../camel/impl/CamelCustomDefaultThreadPoolProfileTest.java       | 3 ---
 .../camel/impl/CamelPostProcessorHelperConsumePredicateTest.java  | 3 ---
 .../camel/impl/CamelPostProcessorHelperConsumePropertyTest.java   | 3 ---
 .../impl/CamelPostProcessorHelperSedaConsumePredicateTest.java    | 3 ---
 .../java/org/apache/camel/impl/CamelPostProcessorHelperTest.java  | 3 ---
 .../java/org/apache/camel/impl/ConsumerCacheZeroCapacityTest.java | 3 ---
 .../src/test/java/org/apache/camel/impl/CustomIdFactoryTest.java  | 2 --
 .../org/apache/camel/impl/DefaultCamelBeanPostProcessorTest.java  | 3 ---
 .../org/apache/camel/impl/DefaultCamelContextAutoStartupTest.java | 3 ---
 .../camel/impl/DefaultCamelContextEndpointCacheLimitTest.java     | 3 ---
 .../apache/camel/impl/DefaultCamelContextEndpointCacheTest.java   | 3 ---
 .../org/apache/camel/impl/DefaultCamelContextStopFailureTest.java | 3 ---
 .../DefaultCamelContextSuspendResumeRouteStartupOrderTest.java    | 3 ---
 .../camel/impl/DefaultCamelContextSuspendResumeRouteTest.java     | 3 ---
 .../test/java/org/apache/camel/impl/DefaultCamelContextTest.java  | 3 ---
 .../test/java/org/apache/camel/impl/DefaultClassResolverTest.java | 3 ---
 .../test/java/org/apache/camel/impl/DefaultConsumerCacheTest.java | 3 ---
 .../java/org/apache/camel/impl/DefaultConsumerTemplateTest.java   | 3 ---
 .../impl/DefaultConsumerTemplateWithCustomCacheMaxSizeTest.java   | 3 ---
 .../src/test/java/org/apache/camel/impl/DefaultEndpointTest.java  | 3 ---
 .../java/org/apache/camel/impl/DefaultExchangeHolderTest.java     | 3 ---
 .../src/test/java/org/apache/camel/impl/DefaultExchangeTest.java  | 3 ---
 .../org/apache/camel/impl/DefaultExecutorServiceManagerTest.java  | 3 ---
 .../org/apache/camel/impl/DefaultHeaderFilterStrategyTest.java    | 3 ---
 .../java/org/apache/camel/impl/DefaultHeadersMapFactoryTest.java  | 3 ---
 .../java/org/apache/camel/impl/DefaultInflightRepositoryTest.java | 3 ---
 .../test/java/org/apache/camel/impl/DefaultMessageHeaderTest.java | 3 ---
 .../test/java/org/apache/camel/impl/DefaultProducerCacheTest.java | 3 ---
 .../org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java   | 3 ---
 .../camel/impl/DefaultProducerTemplateNonBlockingAsyncTest.java   | 3 ---
 .../impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java   | 3 ---
 .../test/java/org/apache/camel/impl/DummyLifecycleStrategy.java   | 3 ---
 .../test/java/org/apache/camel/impl/ExpressionAdapterTest.java    | 3 ---
 .../test/java/org/apache/camel/impl/ExpressionSupportTest.java    | 3 ---
 .../apache/camel/impl/ExtendedStartupListenerComponentTest.java   | 3 ---
 .../src/test/java/org/apache/camel/impl/FromEndpointTest.java     | 3 ---
 .../test/java/org/apache/camel/impl/FromHasNoOutputRouteTest.java | 3 ---
 .../test/java/org/apache/camel/impl/FromMultipleEndpointTest.java | 3 ---
 .../camel/impl/GracefulShutdownNoAutoStartOrderClashTest.java     | 3 ---
 .../java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java  | 3 ---
 .../apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java  | 3 ---
 .../org/apache/camel/impl/HeaderFilterStrategyComponentTest.java  | 3 ---
 .../apache/camel/impl/InflightRepositoryBrowseFromRouteTest.java  | 3 ---
 .../java/org/apache/camel/impl/InflightRepositoryBrowseTest.java  | 3 ---
 .../java/org/apache/camel/impl/InflightRepositoryRouteTest.java   | 3 ---
 .../camel/impl/InterceptSendToMockEndpointStrategyCustomTest.java | 3 ---
 .../camel/impl/InterceptSendToMockEndpointStrategyTest.java       | 3 ---
 .../org/apache/camel/impl/LifecycleStrategyFailOnStartupTest.java | 3 ---
 .../java/org/apache/camel/impl/LifecycleStrategyServiceTest.java  | 3 ---
 .../java/org/apache/camel/impl/LogDebugBodyMaxCharsOffTest.java   | 3 ---
 .../test/java/org/apache/camel/impl/LogDebugBodyMaxCharsTest.java | 3 ---
 .../test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java  | 3 ---
 .../src/test/java/org/apache/camel/impl/MainSupportTest.java      | 3 ---
 .../src/test/java/org/apache/camel/impl/MessageSupportTest.java   | 3 ---
 .../java/org/apache/camel/impl/MultipleConsumersSupportTest.java  | 3 ---
 .../java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java | 3 ---
 .../apache/camel/impl/PendingExchangesShutdownGracefulTest.java   | 3 ---
 .../camel/impl/PendingExchangesTwoRouteShutdownGracefulTest.java  | 3 ---
 .../org/apache/camel/impl/ProxyInstantiationExceptionTest.java    | 3 ---
 camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java  | 3 ---
 .../java/org/apache/camel/impl/RouteDirectSuspendResumeTest.java  | 3 ---
 .../org/apache/camel/impl/RouteMustHaveOutputOnExceptionTest.java | 3 ---
 .../src/test/java/org/apache/camel/impl/RouteNoOutputTest.java    | 3 ---
 .../src/test/java/org/apache/camel/impl/RouteRemove2Test.java     | 3 ---
 .../src/test/java/org/apache/camel/impl/RouteRemoveTest.java      | 3 ---
 .../test/java/org/apache/camel/impl/RouteSedaStopStartTest.java   | 3 ---
 .../java/org/apache/camel/impl/RouteSedaSuspendResumeTest.java    | 3 ---
 .../java/org/apache/camel/impl/RouteSuspendResumeWarmUpTest.java  | 3 ---
 .../java/org/apache/camel/impl/SerializationDataFormatTest.java   | 3 ---
 .../camel/impl/ShutdownGracefulNoAutoStartedRoutesTest.java       | 3 ---
 .../org/apache/camel/impl/ShutdownGracefulTimeoutTriggerTest.java | 3 ---
 .../camel/impl/SimpleShutdownGracefulNoAtuoStartedTest.java       | 3 ---
 .../java/org/apache/camel/impl/SimpleShutdownGracefulTest.java    | 3 ---
 .../test/java/org/apache/camel/impl/StartAndStopRoutesTest.java   | 2 --
 .../java/org/apache/camel/impl/StartStopAndShutdownRouteTest.java | 2 --
 .../camel/impl/StartupListenerComponentFromRegistryTest.java      | 3 ---
 .../java/org/apache/camel/impl/StartupListenerComponentTest.java  | 3 ---
 .../src/test/java/org/apache/camel/impl/StartupListenerTest.java  | 3 ---
 .../java/org/apache/camel/impl/TwoRouteSuspendResumeTest.java     | 3 ---
 .../java/org/apache/camel/impl/TypeConverterAllowNullTest.java    | 3 ---
 .../apache/camel/impl/TypeConverterRegistryMissesThenAddTest.java | 3 ---
 .../camel/impl/TypeConverterRegistryStatisticsEnabledTest.java    | 3 ---
 .../java/org/apache/camel/impl/TypeConverterRegistryTest.java     | 3 ---
 .../java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java   | 3 ---
 .../apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java   | 3 ---
 .../src/test/java/org/apache/camel/issues/AdviceWithCBRTest.java  | 3 ---
 .../java/org/apache/camel/issues/AdviceWithInterceptTest.java     | 3 ---
 .../test/java/org/apache/camel/issues/AdviceWithIssueTest.java    | 3 ---
 .../java/org/apache/camel/issues/AdviceWithOnCompletionTest.java  | 3 ---
 .../org/apache/camel/issues/AdviceWithOnExceptionRemoveTest.java  | 3 ---
 .../java/org/apache/camel/issues/AdviceWithOnExceptionTest.java   | 3 ---
 .../test/java/org/apache/camel/issues/AdviceWithPolicyTest.java   | 3 ---
 .../java/org/apache/camel/issues/AdviceWithRoutePolicyTest.java   | 3 ---
 .../java/org/apache/camel/issues/AdviceWithTransactedTest.java    | 3 ---
 .../org/apache/camel/issues/AdviceWithWeaveByTypeCBRTest.java     | 3 ---
 .../camel/issues/AggregatorWithBatchConsumingIssueTest.java       | 3 ---
 .../src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java | 3 ---
 .../java/org/apache/camel/issues/CBRConcurrencyIssueTest.java     | 3 ---
 .../test/java/org/apache/camel/issues/CBRContainsIssueTest.java   | 3 ---
 .../org/apache/camel/issues/CBRCustomPredicateAsFilterTest.java   | 3 ---
 .../java/org/apache/camel/issues/ChangeHeaderCaseIssueTest.java   | 3 ---
 .../camel/issues/CharlesSplitAndTryCatchRollbackIssueTest.java    | 3 ---
 .../camel/issues/CharlesSplitUseBeanAsErrorHandlerIssueTest.java  | 3 ---
 .../org/apache/camel/issues/ChoicePredicateSimpleHeaderTest.java  | 3 ---
 .../java/org/apache/camel/issues/CustomFailveOverProcessor.java   | 2 --
 .../src/test/java/org/apache/camel/issues/DavidSiefertTest.java   | 3 ---
 .../org/apache/camel/issues/DoCatchCaughExceptionIssueTest.java   | 2 --
 .../java/org/apache/camel/issues/ErrorHandlerAdviceIssueTest.java | 2 --
 .../test/java/org/apache/camel/issues/ExceptionCamel4022Test.java | 3 ---
 .../java/org/apache/camel/issues/ExceptionPolicyIssueTest.java    | 3 ---
 .../src/test/java/org/apache/camel/issues/ExceptionTest.java      | 3 ---
 .../issues/ExceptionThrownFromOnExceptionNoEndlessLoopTest.java   | 3 ---
 .../apache/camel/issues/ExceptionThrownFromOnExceptionTest.java   | 1 -
 .../org/apache/camel/issues/FilePollingConsumerIssueTest.java     | 3 ---
 .../org/apache/camel/issues/FileSplitStreamingWithChoiceTest.java | 3 ---
 .../apache/camel/issues/FilterCustomPredicateAsFilterTest.java    | 3 ---
 .../src/test/java/org/apache/camel/issues/GertJBIIssueTest.java   | 3 ---
 .../apache/camel/issues/InterceptCustomPredicateAsFilterTest.java | 3 ---
 .../src/test/java/org/apache/camel/issues/Issue170Test.java       | 3 ---
 camel-core/src/test/java/org/apache/camel/issues/Issue3Test.java  | 3 ---
 .../org/apache/camel/issues/MockExepctedHeadersIssueTest.java     | 3 ---
 .../issues/MulticastAggregationStrategyThrowExceptionTest.java    | 3 ---
 .../MulticastParallelStopOnExceptionWithOnExceptionIssueTest.java | 3 ---
 .../camel/issues/MulticastParallelWithOnExceptionIssueTest.java   | 3 ---
 .../apache/camel/issues/MulticastPipelineAggregateIssueTest.java  | 3 ---
 .../apache/camel/issues/MulticastSingleAggregateIssueTest.java    | 3 ---
 .../issues/MulticastStopOnExceptionWithOnExceptionIssueTest.java  | 3 ---
 .../apache/camel/issues/MulticastWithOnExceptionIssueTest.java    | 3 ---
 .../src/test/java/org/apache/camel/issues/NeilSplitterTest.java   | 3 ---
 .../NotifyBuilderExactlyDoneSplitterWhereSentToIssueTest.java     | 3 ---
 .../camel/issues/OnExceptionBeforeErrorHandlerIssueTest.java      | 3 ---
 .../java/org/apache/camel/issues/OnExceptionProcessIssueTest.java | 3 ---
 .../java/org/apache/camel/issues/ProxyReturnNullIssueTest.java    | 3 ---
 .../apache/camel/issues/RecipientListErrorHandlingIssueTest.java  | 3 ---
 .../java/org/apache/camel/issues/RegExPredicateIssueTest.java     | 3 ---
 .../issues/RetryContextScopedUntilRecipientListIssueTest.java     | 3 ---
 .../RetryContextScopedUntilRecipientListParallelIssueTest.java    | 3 ---
 .../camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java | 3 ---
 .../RetryRouteScopedUntilRecipientListParallelIssueTest.java      | 3 ---
 .../test/java/org/apache/camel/issues/RomeksExceptionTest.java    | 3 ---
 .../camel/issues/RouteScopedErrorHandlerAndOnExceptionTest.java   | 2 --
 ...outeScopedOnExceptionWithInterceptSendToEndpointIssueTest.java | 2 --
 ...xceptionWithInterceptSendToEndpointIssueWithPredicateTest.java | 2 --
 .../test/java/org/apache/camel/issues/RouteWithCustomIdTest.java  | 3 ---
 .../java/org/apache/camel/issues/SetBodyTryCatchIssueTest.java    | 3 ---
 .../java/org/apache/camel/issues/SetHeaderInDoCatchIssueTest.java | 3 ---
 .../src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java | 3 ---
 .../org/apache/camel/issues/SplitPropertiesFileIssueTest.java     | 3 ---
 .../org/apache/camel/issues/SplitStopOnExceptionIssueTest.java    | 3 ---
 .../camel/issues/SplitWithCustomAggregationStrategyTest.java      | 3 ---
 .../org/apache/camel/issues/SplitterCorrelationIdIssueTest.java   | 3 ---
 .../camel/issues/SplitterThrowExceptionInExpressionTest.java      | 3 ---
 .../camel/issues/SplitterThrowExceptionInExpressionTwoTest.java   | 3 ---
 .../issues/SplitterUsingBeanReturningCloseableIteratorTest.java   | 3 ---
 .../camel/issues/SplitterUsingBeanReturningMessageTest.java       | 3 ---
 .../camel/issues/ThreadsRejectedExecutionWithDeadLetterTest.java  | 3 ---
 .../org/apache/camel/issues/TimerAndErrorHandlerIssueTest.java    | 3 ---
 .../apache/camel/issues/TryCatchFinallyOnExceptionIssueTest.java  | 3 ---
 .../java/org/apache/camel/issues/TryCatchSetHeaderIssueTest.java  | 3 ---
 .../java/org/apache/camel/issues/TryCatchWithSplitIssueTest.java  | 3 ---
 .../apache/camel/issues/TryCatchWithSplitNotHandledIssueTest.java | 3 ---
 ...xceptionWithInterceptSendToEndpointIssueWithPredicateTest.java | 2 --
 .../test/java/org/apache/camel/issues/XPathSplitStreamTest.java   | 3 ---
 .../org/apache/camel/language/BeanLanguageInvalidOGNLTest.java    | 3 ---
 .../test/java/org/apache/camel/language/BeanLanguageOGNLTest.java | 3 ---
 ...BeanLanguageOGNLWithDotInParameterPropertyPlaceholderTest.java | 3 ---
 .../camel/language/BeanLanguageOGNLWithDotInParameterTest.java    | 3 ---
 camel-core/src/test/java/org/apache/camel/language/BeanTest.java  | 3 ---
 .../apache/camel/language/XPathAnotherRouteConcurrentTest.java    | 3 ---
 .../test/java/org/apache/camel/language/XPathFunctionTest.java    | 3 ---
 .../test/java/org/apache/camel/language/XPathOutFunctionTest.java | 3 ---
 .../org/apache/camel/language/XPathRouteConcurrentBigTest.java    | 3 ---
 .../java/org/apache/camel/language/XPathRouteConcurrentTest.java  | 3 ---
 camel-core/src/test/java/org/apache/camel/language/XPathTest.java | 3 ---
 .../java/org/apache/camel/language/simple/SimpleOperatorTest.java | 3 ---
 .../test/java/org/apache/camel/language/simple/SimpleTest.java    | 3 ---
 camel-core/src/test/java/org/apache/camel/main/MainExample.java   | 3 ---
 camel-core/src/test/java/org/apache/camel/main/MainTest.java      | 3 ---
 camel-core/src/test/java/org/apache/camel/main/MainVetoTest.java  | 3 ---
 .../java/org/apache/camel/management/AddEventNotifierTest.java    | 3 ---
 .../apache/camel/management/CamelChoiceWithManagementTest.java    | 3 ---
 .../apache/camel/management/DualManagedThreadPoolProfileTest.java | 3 ---
 .../apache/camel/management/DualManagedThreadPoolWithIdTest.java  | 3 ---
 .../java/org/apache/camel/management/EventNotifierEventsTest.java | 3 ---
 .../camel/management/EventNotifierExchangeCompletedTest.java      | 3 ---
 .../camel/management/EventNotifierExchangeSentParallelTest.java   | 3 ---
 .../apache/camel/management/EventNotifierExchangeSentTest.java    | 3 ---
 .../camel/management/EventNotifierFailureHandledEventsTest.java   | 3 ---
 .../camel/management/EventNotifierRedeliveryEventsTest.java       | 3 ---
 .../management/EventNotifierServiceStoppingFailedEventTest.java   | 3 ---
 .../org/apache/camel/management/ExceptionWithManagementTest.java  | 2 --
 .../management/JmxInstrumentationDisableOnCamelContextTest.java   | 2 --
 .../apache/camel/management/JmxInstrumentationDisableTest.java    | 2 --
 .../JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java  | 3 ---
 .../camel/management/JmxInstrumentationUsingDefaultsTest.java     | 2 --
 .../camel/management/JmxInstrumentationUsingPlatformMBSTest.java  | 2 --
 .../camel/management/JmxInstrumentationUsingPropertiesTest.java   | 2 --
 .../camel/management/JmxInstrumentationWithConnectorTest.java     | 2 --
 .../apache/camel/management/JmxNotificationEventNotifierTest.java | 3 ---
 .../java/org/apache/camel/management/JmxRecipientListTest.java    | 3 ---
 .../org/apache/camel/management/LoggingEventNotifierTest.java     | 3 ---
 .../camel/management/ManagedBrowsableEndpointAsXmlFileTest.java   | 3 ---
 .../camel/management/ManagedBrowsableEndpointAsXmlTest.java       | 3 ---
 .../camel/management/ManagedBrowsableEndpointEmptyTest.java       | 3 ---
 .../org/apache/camel/management/ManagedBrowsableEndpointTest.java | 3 ---
 .../camel/management/ManagedCamelContextAutoStartupTest.java      | 3 ---
 .../camel/management/ManagedCamelContextDumpRoutesAsXmlTest.java  | 3 ---
 .../management/ManagedCamelContextDumpRoutesCoverageAsXml.java    | 3 ---
 .../camel/management/ManagedCamelContextDumpStatsAsXmlTest.java   | 3 ---
 .../camel/management/ManagedCamelContextEmptyRouteTest.java       | 3 ---
 .../camel/management/ManagedCamelContextPropertiesTest.java       | 3 ---
 .../apache/camel/management/ManagedCamelContextRestartTest.java   | 3 ---
 .../camel/management/ManagedCamelContextSuspendResumeTest.java    | 3 ---
 .../camel/management/ManagedCamelContextSuspendStartTest.java     | 3 ---
 .../java/org/apache/camel/management/ManagedCamelContextTest.java | 3 ---
 .../management/ManagedCamelContextUpdateRoutesFromXmlTest.java    | 3 ---
 ...elContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java | 3 ---
 .../management/ManagedCanekContextExchangeStatisticsTest.java     | 3 ---
 .../test/java/org/apache/camel/management/ManagedChoiceTest.java  | 3 ---
 .../org/apache/camel/management/ManagedConsumerCacheHitsTest.java | 3 ---
 .../org/apache/camel/management/ManagedConsumerCacheTest.java     | 3 ---
 .../java/org/apache/camel/management/ManagedConvertBodyTest.java  | 3 ---
 .../java/org/apache/camel/management/ManagedCustomBeanTest.java   | 3 ---
 .../apache/camel/management/ManagedCustomComponentNameTest.java   | 3 ---
 .../apache/camel/management/ManagedCustomLoadBalancerTest.java    | 3 ---
 .../java/org/apache/camel/management/ManagedCustomPolicyTest.java | 3 ---
 .../org/apache/camel/management/ManagedCustomProcessorTest.java   | 3 ---
 .../java/org/apache/camel/management/ManagedDataFormatTest.java   | 3 ---
 .../test/java/org/apache/camel/management/ManagedDelayerTest.java | 3 ---
 .../org/apache/camel/management/ManagedDualCamelContextTest.java  | 3 ---
 .../java/org/apache/camel/management/ManagedDuplicateIdTest.java  | 3 ---
 .../org/apache/camel/management/ManagedDynamicRouterTest.java     | 3 ---
 .../org/apache/camel/management/ManagedEndpointExplainTest.java   | 3 ---
 .../org/apache/camel/management/ManagedEndpointRegistryTest.java  | 3 ---
 .../java/org/apache/camel/management/ManagedEndpointTest.java     | 3 ---
 .../management/ManagedEndpointUtilizationStatisticsTest.java      | 3 ---
 .../java/org/apache/camel/management/ManagedEnricherTest.java     | 3 ---
 .../apache/camel/management/ManagedErrorHandlerOptionsTest.java   | 3 ---
 .../camel/management/ManagedErrorHandlerRedeliveryTest.java       | 3 ---
 .../java/org/apache/camel/management/ManagedErrorHandlerTest.java | 3 ---
 .../apache/camel/management/ManagedFailoverLoadBalancerTest.java  | 3 ---
 .../apache/camel/management/ManagedFileIdempotentClearTest.java   | 3 ---
 .../camel/management/ManagedFileIdempotentConsumerTest.java       | 3 ---
 .../camel/management/ManagedFileWatcherReloadStrategyTest.java    | 3 ---
 .../test/java/org/apache/camel/management/ManagedFilterTest.java  | 3 ---
 .../apache/camel/management/ManagedInflightRepositoryTest.java    | 3 ---
 .../apache/camel/management/ManagedInflightStatisticsTest.java    | 3 ---
 .../org/apache/camel/management/ManagedInlinedProcessorTest.java  | 3 ---
 .../org/apache/camel/management/ManagedInterceptFromTest.java     | 3 ---
 .../java/org/apache/camel/management/ManagedInterceptTest.java    | 3 ---
 .../org/apache/camel/management/ManagedListComponentsTest.java    | 3 ---
 .../java/org/apache/camel/management/ManagedLoadBalancerTest.java | 3 ---
 .../java/org/apache/camel/management/ManagedLogEndpointTest.java  | 3 ---
 .../test/java/org/apache/camel/management/ManagedLoopTest.java    | 3 ---
 .../test/java/org/apache/camel/management/ManagedMarshalTest.java | 3 ---
 .../apache/camel/management/ManagedMemoryIdempotentClearTest.java | 3 ---
 .../camel/management/ManagedMemoryIdempotentConsumerTest.java     | 3 ---
 .../java/org/apache/camel/management/ManagedMulticastTest.java    | 3 ---
 .../org/apache/camel/management/ManagedNamePatternFixedTest.java  | 3 ---
 .../camel/management/ManagedNamePatternIncludeHostNameTest.java   | 3 ---
 .../camel/management/ManagedNamePatternJvmSystemPropertyTest.java | 3 ---
 .../java/org/apache/camel/management/ManagedNamePatternTest.java  | 3 ---
 .../org/apache/camel/management/ManagedNonManagedServiceTest.java | 3 ---
 .../java/org/apache/camel/management/ManagedPollEnricherTest.java | 3 ---
 .../test/java/org/apache/camel/management/ManagedProcessTest.java | 3 ---
 .../ManagedProducerRecipientListRegisterAlwaysTest.java           | 3 ---
 .../apache/camel/management/ManagedProducerRecipientListTest.java | 3 ---
 .../ManagedProducerRouteAddRemoveRegisterAlwaysTest.java          | 3 ---
 .../java/org/apache/camel/management/ManagedProducerTest.java     | 3 ---
 .../apache/camel/management/ManagedRandomLoadBalancerTest.java    | 3 ---
 .../org/apache/camel/management/ManagedRecipientListTest.java     | 3 ---
 .../java/org/apache/camel/management/ManagedRefProducerTest.java  | 3 ---
 .../apache/camel/management/ManagedRegisterCamelContextTest.java  | 3 ---
 .../org/apache/camel/management/ManagedRegisterEndpointTest.java  | 3 ---
 .../camel/management/ManagedRegisterExchangeStatisticsTest.java   | 3 ---
 .../org/apache/camel/management/ManagedRegisterRouteTest.java     | 3 ---
 .../org/apache/camel/management/ManagedRegisterTwoRoutesTest.java | 3 ---
 .../management/ManagedRemoveRouteAggregateThreadPoolTest.java     | 3 ---
 .../java/org/apache/camel/management/ManagedResequencerTest.java  | 3 ---
 .../camel/management/ManagedResetIncludeProcessorsTest.java       | 3 ---
 .../apache/camel/management/ManagedResetIncludeRoutesTest.java    | 3 ---
 .../camel/management/ManagedRoundRobinLoadBalancerTest.java       | 3 ---
 .../org/apache/camel/management/ManagedRouteAddFromRouteTest.java | 2 --
 .../org/apache/camel/management/ManagedRouteAddRemoveTest.java    | 2 --
 .../ManagedRouteAddSecondRouteNotRegisterNewRoutesTest.java       | 2 --
 .../apache/camel/management/ManagedRouteAddSecondRouteTest.java   | 2 --
 .../org/apache/camel/management/ManagedRouteAutoStartupTest.java  | 3 ---
 .../management/ManagedRouteDumpRouteAsXmlPlaceholderTest.java     | 3 ---
 .../apache/camel/management/ManagedRouteDumpRouteAsXmlTest.java   | 3 ---
 .../ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java   | 3 ---
 .../management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java    | 3 ---
 .../apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java   | 3 ---
 .../apache/camel/management/ManagedRouteGetPropertiesTest.java    | 3 ---
 .../apache/camel/management/ManagedRouteLoadstatisticsTest.java   | 3 ---
 .../apache/camel/management/ManagedRouteNoAutoStartupTest.java    | 2 --
 .../camel/management/ManagedRoutePerformanceCounterTest.java      | 3 ---
 .../ManagedRouteRemoveContextScopedErrorHandlerTest.java          | 3 ---
 .../ManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java  | 3 ---
 .../management/ManagedRouteRemoveRouteScopedErrorHandlerTest.java | 3 ---
 .../java/org/apache/camel/management/ManagedRouteRemoveTest.java  | 3 ---
 .../ManagedRouteRemoveWireTapExplicitThreadPoolTest.java          | 3 ---
 .../apache/camel/management/ManagedRouteRemoveWireTapTest.java    | 3 ---
 .../apache/camel/management/ManagedRouteShutdownAndStartTest.java | 3 ---
 .../camel/management/ManagedRouteStopAndStartCleanupTest.java     | 2 --
 .../org/apache/camel/management/ManagedRouteStopAndStartTest.java | 3 ---
 .../java/org/apache/camel/management/ManagedRouteStopTest.java    | 3 ---
 .../camel/management/ManagedRouteStopUsingMBeanAPITest.java       | 3 ---
 .../management/ManagedRouteStopWithAbortAfterTimeoutTest.java     | 3 ---
 .../apache/camel/management/ManagedRouteSuspendAndResumeTest.java | 3 ---
 .../camel/management/ManagedRouteUpdateRouteFromXmlTest.java      | 3 ---
 .../apache/camel/management/ManagedRouteWithOnExceptionTest.java  | 3 ---
 .../java/org/apache/camel/management/ManagedRoutingSlipTest.java  | 3 ---
 .../apache/camel/management/ManagedRuntimeCamelCatalogTest.java   | 3 ---
 .../java/org/apache/camel/management/ManagedSanitizeTest.java     | 3 ---
 .../apache/camel/management/ManagedScheduledPollConsumerTest.java | 3 ---
 .../java/org/apache/camel/management/ManagedSedaEndpointTest.java | 3 ---
 .../org/apache/camel/management/ManagedSedaRouteRemoveTest.java   | 3 ---
 .../apache/camel/management/ManagedSendDynamicProcessorTest.java  | 3 ---
 .../org/apache/camel/management/ManagedSendProcessorTest.java     | 3 ---
 .../org/apache/camel/management/ManagedServiceUrlPathTest.java    | 3 ---
 .../management/ManagedSetAndRemoveHeaderAndPropertiesTest.java    | 3 ---
 .../org/apache/camel/management/ManagedShutdownStrategyTest.java  | 3 ---
 .../java/org/apache/camel/management/ManagedSplitterTest.java     | 3 ---
 .../apache/camel/management/ManagedStatisticsDisabledTest.java    | 3 ---
 .../apache/camel/management/ManagedStatisticsLevelOffTest.java    | 3 ---
 .../camel/management/ManagedStatisticsLevelRoutesOnlyTest.java    | 3 ---
 .../java/org/apache/camel/management/ManagedStatisticsTest.java   | 3 ---
 .../camel/management/ManagedStatisticsWithSplitterTest.java       | 3 ---
 .../apache/camel/management/ManagedStickyLoadBalancerTest.java    | 3 ---
 .../apache/camel/management/ManagedStreamCachingStrategyTest.java | 3 ---
 .../org/apache/camel/management/ManagedSuspendedServiceTest.java  | 3 ---
 .../org/apache/camel/management/ManagedThreadPoolProfileTest.java | 3 ---
 .../java/org/apache/camel/management/ManagedThreadPoolTest.java   | 3 ---
 .../org/apache/camel/management/ManagedThreadPoolWithIdTest.java  | 3 ---
 .../test/java/org/apache/camel/management/ManagedThreadsTest.java | 3 ---
 .../java/org/apache/camel/management/ManagedThrottlerTest.java    | 3 ---
 .../management/ManagedThrottlingInflightRoutePolicyTest.java      | 3 ---
 .../test/java/org/apache/camel/management/ManagedTimerTest.java   | 3 ---
 .../org/apache/camel/management/ManagedTopicLoadBalancerTest.java | 3 ---
 .../apache/camel/management/ManagedTypeConverterRegistryTest.java | 3 ---
 .../java/org/apache/camel/management/ManagedUnmarshalTest.java    | 3 ---
 .../camel/management/ManagedUnregisterCamelContextTest.java       | 3 ---
 .../apache/camel/management/ManagedUnregisterComponentTest.java   | 3 ---
 .../apache/camel/management/ManagedUnregisterConsumerTest.java    | 3 ---
 .../apache/camel/management/ManagedUnregisterEndpointTest.java    | 3 ---
 .../apache/camel/management/ManagedUnregisterProcessorTest.java   | 3 ---
 .../apache/camel/management/ManagedUnregisterProducerTest.java    | 3 ---
 .../org/apache/camel/management/ManagedUnregisterRouteTest.java   | 3 ---
 .../apache/camel/management/ManagedWeightedLoadBalancerTest.java  | 3 ---
 .../test/java/org/apache/camel/management/ManagedWireTapTest.java | 3 ---
 .../java/org/apache/camel/management/ManagementTestSupport.java   | 2 --
 .../org/apache/camel/management/MultiInstanceProcessorTest.java   | 2 --
 .../apache/camel/management/MultipleEventNotifierEventsTest.java  | 3 ---
 .../org/apache/camel/management/PublishEventNotifierTest.java     | 3 ---
 .../apache/camel/management/PublishEventNotifierToRouteTest.java  | 3 ---
 .../java/org/apache/camel/management/RemoveEventNotifierTest.java | 3 ---
 .../org/apache/camel/management/RemoveRouteDefinitionTest.java    | 3 ---
 .../TwoManagedCamelContextAutoAssignedNameClashTest.java          | 3 ---
 .../apache/camel/management/TwoManagedCamelContextClashTest.java  | 3 ---
 .../org/apache/camel/management/TwoManagedCamelContextTest.java   | 3 ---
 .../org/apache/camel/management/TwoManagedNamePatternTest.java    | 3 ---
 .../org/apache/camel/model/GenerateXmFromCamelContextTest.java    | 3 ---
 .../src/test/java/org/apache/camel/model/GenerateXmlTest.java     | 3 ---
 .../src/test/java/org/apache/camel/model/LoadRestFromXmlTest.java | 3 ---
 .../test/java/org/apache/camel/model/LoadRouteFromXmlTest.java    | 3 ---
 .../org/apache/camel/model/LoadRouteFromXmlWithInterceptTest.java | 3 ---
 .../apache/camel/model/LoadRouteFromXmlWithOnExceptionTest.java   | 3 ---
 .../org/apache/camel/model/LoadRouteFromXmlWithPolicyTest.java    | 3 ---
 .../org/apache/camel/model/StartingRoutesErrorReportedTest.java   | 3 ---
 camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java | 3 ---
 .../src/test/java/org/apache/camel/model/XmlTestSupport.java      | 3 ---
 .../test/java/org/apache/camel/processor/AsyncLoopCopyTest.java   | 3 ---
 .../src/test/java/org/apache/camel/processor/AsyncLoopTest.java   | 3 ---
 .../camel/processor/BatchResequencerAllowDuplicatesTest.java      | 3 ---
 .../apache/camel/processor/BatchResequencerJMSPriorityTest.java   | 3 ---
 .../apache/camel/processor/BatchResequencerWithDuplicateTest.java | 3 ---
 .../camel/processor/BeanOgnMethodWithXPathInjectionTest.java      | 3 ---
 .../camel/processor/BeanProcessorSpecializedMessageTest.java      | 3 ---
 .../apache/camel/processor/BeanRecipientListNoMethodNameTest.java | 3 ---
 .../java/org/apache/camel/processor/BeanRecipientListTest.java    | 3 ---
 .../org/apache/camel/processor/BeanRecipientListTimeoutTest.java  | 3 ---
 .../src/test/java/org/apache/camel/processor/BeanRouteTest.java   | 3 ---
 .../java/org/apache/camel/processor/BeanWithExceptionTest.java    | 3 ---
 .../org/apache/camel/processor/BeanWithXPathInjectionTest.java    | 3 ---
 .../java/org/apache/camel/processor/BreadcrumbDisabledTest.java   | 3 ---
 .../src/test/java/org/apache/camel/processor/BreadcrumbTest.java  | 3 ---
 .../java/org/apache/camel/processor/CBRHeaderPredicateTest.java   | 3 ---
 .../camel/processor/CBRPredicateBeanThrowExceptionTest.java       | 3 ---
 .../apache/camel/processor/CBRSimplePredicateEmptyBodyTest.java   | 3 ---
 .../org/apache/camel/processor/CBRWhenUnmarshalEndChoiceTest.java | 3 ---
 .../java/org/apache/camel/processor/CBRWithLoadBalancerTest.java  | 3 ---
 .../java/org/apache/camel/processor/CBRWithMulticastTest.java     | 3 ---
 .../java/org/apache/camel/processor/CBRWithRecipientListTest.java | 3 ---
 .../test/java/org/apache/camel/processor/CBRWithWireTapTest.java  | 3 ---
 .../src/test/java/org/apache/camel/processor/ChannelTest.java     | 3 ---
 .../src/test/java/org/apache/camel/processor/ChoiceAsyncTest.java | 3 ---
 .../org/apache/camel/processor/ChoiceCompoundPredicateTest.java   | 3 ---
 .../test/java/org/apache/camel/processor/ChoiceNoActionTest.java  | 3 ---
 .../java/org/apache/camel/processor/ChoiceNoErrorHandlerTest.java | 2 --
 .../src/test/java/org/apache/camel/processor/ChoiceTest.java      | 3 ---
 .../org/apache/camel/processor/ChoiceWhenNotPredicateTest.java    | 3 ---
 .../test/java/org/apache/camel/processor/ChoiceWithEndTest.java   | 3 ---
 .../apache/camel/processor/ChoiceWithSimpleExpressionTest.java    | 3 ---
 .../camel/processor/CreateRouteWithNonExistingEndpointTest.java   | 3 ---
 .../org/apache/camel/processor/CustomProcessorFactoryTest.java    | 3 ---
 .../java/org/apache/camel/processor/CustomRoutePolicyTest.java    | 3 ---
 .../apache/camel/processor/CustomScheduledRoutePolicyTest.java    | 3 ---
 .../java/org/apache/camel/processor/DataFormatServiceTest.java    | 2 --
 .../src/test/java/org/apache/camel/processor/DataFormatTest.java  | 3 ---
 .../DeadLetterChannelBuilderWithInvalidDeadLetterUriTest.java     | 3 ---
 .../DeadLetterChannelRedeliverWithDelayBlockingTest.java          | 2 --
 .../java/org/apache/camel/processor/DeadLetterChannelTest.java    | 3 ---
 .../camel/processor/DeadLetterChannelUseOriginalInBodyTest.java   | 2 --
 .../processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java | 3 ---
 .../processor/DefaultErrorHandlerExplicitConfiguredTest.java      | 2 --
 .../camel/processor/DefaultErrorHandlerOnExceptionTest.java       | 2 --
 .../java/org/apache/camel/processor/DefaultErrorHandlerTest.java  | 2 --
 .../apache/camel/processor/DefinitionPolicyPerProcessorTest.java  | 3 ---
 .../java/org/apache/camel/processor/DelayInterceptorTest.java     | 2 --
 .../java/org/apache/camel/processor/DelayerAsyncDelayedTest.java  | 3 ---
 .../test/java/org/apache/camel/processor/DelayerPerRouteTest.java | 3 ---
 .../src/test/java/org/apache/camel/processor/DelayerTest.java     | 3 ---
 .../java/org/apache/camel/processor/DelayerWhileShutdownTest.java | 2 --
 .../camel/processor/DoubleLoadBalancerMisconfigurationTest.java   | 3 ---
 .../test/java/org/apache/camel/processor/DualPipelineTest.java    | 3 ---
 .../test/java/org/apache/camel/processor/DynamicRouter2Test.java  | 3 ---
 .../test/java/org/apache/camel/processor/DynamicRouter3Test.java  | 3 ---
 .../org/apache/camel/processor/DynamicRouterAnnotationTest.java   | 3 ---
 .../apache/camel/processor/DynamicRouterExchangeHeaders2Test.java | 3 ---
 .../apache/camel/processor/DynamicRouterExchangeHeadersTest.java  | 3 ---
 .../camel/processor/DynamicRouterExchangePropertiesTest.java      | 3 ---
 .../test/java/org/apache/camel/processor/DynamicRouterTest.java   | 3 ---
 .../processor/Endpoint2MustBeStartedBeforeSendProcessorTest.java  | 3 ---
 .../processor/EndpointMustBeStartedBeforeSendProcessorTest.java   | 3 ---
 .../ErrorHandlerOnExceptionRedeliveryAndHandledTest.java          | 3 ---
 .../apache/camel/processor/ErrorHandlerWrappedEachNodeTest.java   | 2 --
 .../camel/processor/EventNotifierExchangeSentExampleTest.java     | 3 ---
 .../apache/camel/processor/ExceptionHandlerStreamCacheTest.java   | 2 --
 .../org/apache/camel/processor/ExchangeCreatedTimestampTest.java  | 3 ---
 .../apache/camel/processor/ExchangeIdempotentConsumerTest.java    | 3 ---
 .../camel/processor/FailOverLoadBalanceWithRedeliveryTest.java    | 3 ---
 .../camel/processor/FailoverMaximumFailoverAttemptsTest.java      | 3 ---
 .../org/apache/camel/processor/FailoverRoundRobinGoodBadTest.java | 3 ---
 .../org/apache/camel/processor/FailoverRoundRobinStickyTest.java  | 3 ---
 .../java/org/apache/camel/processor/FailoverRoundRobinTest.java   | 3 ---
 .../test/java/org/apache/camel/processor/FailoverStickyTest.java  | 3 ---
 .../src/test/java/org/apache/camel/processor/FaultRouteTest.java  | 3 ---
 .../java/org/apache/camel/processor/FileIdempotentClearTest.java  | 3 ---
 .../camel/processor/FileIdempotentConsumerLoadStoreTest.java      | 3 ---
 .../org/apache/camel/processor/FileIdempotentConsumerTest.java    | 3 ---
 .../java/org/apache/camel/processor/FileIdempotentRemoveTest.java | 3 ---
 .../org/apache/camel/processor/FileIdempotentTrunkStoreTest.java  | 3 ---
 .../org/apache/camel/processor/FileRollbackOnCompletionTest.java  | 3 ---
 .../java/org/apache/camel/processor/FilterBeforeSplitTest.java    | 2 --
 .../java/org/apache/camel/processor/FilterNotMatchedTest.java     | 3 ---
 .../src/test/java/org/apache/camel/processor/FilterNotTest.java   | 3 ---
 .../test/java/org/apache/camel/processor/FilterSimpleTest.java    | 3 ---
 .../src/test/java/org/apache/camel/processor/FilterTest.java      | 3 ---
 .../src/test/java/org/apache/camel/processor/FlipRoutePolicy.java | 3 ---
 .../test/java/org/apache/camel/processor/FlipRoutePolicyTest.java | 3 ---
 .../src/test/java/org/apache/camel/processor/FromToInOutTest.java | 3 ---
 .../java/org/apache/camel/processor/HandleFaultPerRouteTest.java  | 3 ---
 .../org/apache/camel/processor/IdempotentConsumerAsyncTest.java   | 3 ---
 .../camel/processor/IdempotentConsumerCompletionEagerTest.java    | 3 ---
 .../apache/camel/processor/IdempotentConsumerConcurrentTest.java  | 2 --
 .../org/apache/camel/processor/IdempotentConsumerEagerTest.java   | 3 ---
 .../apache/camel/processor/IdempotentConsumerNoMessageIdTest.java | 3 ---
 .../camel/processor/IdempotentConsumerRemoveOnFailureTest.java    | 3 ---
 .../camel/processor/IdempotentConsumerRepoExceptionTest.java      | 3 ---
 .../java/org/apache/camel/processor/IdempotentConsumerTest.java   | 3 ---
 .../processor/IdempotentConsumerUsingCustomRepositoryTest.java    | 3 ---
 .../apache/camel/processor/InheritErrorHandlerDefaultTest.java    | 3 ---
 .../org/apache/camel/processor/InheritErrorHandlerFalseTest.java  | 3 ---
 .../org/apache/camel/processor/InheritErrorHandlerTrueTest.java   | 3 ---
 .../java/org/apache/camel/processor/InlinedProcessorIdTest.java   | 3 ---
 .../src/test/java/org/apache/camel/processor/JoinRoutesTest.java  | 3 ---
 .../test/java/org/apache/camel/processor/LanguageBuilderTest.java | 3 ---
 .../java/org/apache/camel/processor/LogGlobalLogNameTest.java     | 3 ---
 .../test/java/org/apache/camel/processor/LogProcessorTest.java    | 3 ---
 .../camel/processor/LogProcessorWithProvidedLoggerTest.java       | 3 ---
 .../test/java/org/apache/camel/processor/LogPropertiesTest.java   | 3 ---
 .../test/java/org/apache/camel/processor/LoopCopyErrorTest.java   | 3 ---
 .../src/test/java/org/apache/camel/processor/LoopCopyTest.java    | 3 ---
 .../src/test/java/org/apache/camel/processor/LoopNoCopyTest.java  | 3 ---
 camel-core/src/test/java/org/apache/camel/processor/LoopTest.java | 3 ---
 .../src/test/java/org/apache/camel/processor/MDCAsyncTest.java    | 3 ---
 .../apache/camel/processor/MDCOnCompletionOnCompletionTest.java   | 3 ---
 .../test/java/org/apache/camel/processor/MDCOnCompletionTest.java | 3 ---
 .../src/test/java/org/apache/camel/processor/MDCResetTest.java    | 2 --
 camel-core/src/test/java/org/apache/camel/processor/MDCTest.java  | 3 ---
 .../java/org/apache/camel/processor/MDCWithBreadcrumbTest.java    | 3 ---
 .../java/org/apache/camel/processor/MarkRollbackOnlyTest.java     | 3 ---
 .../apache/camel/processor/MessageHistoryCopyExchangeTest.java    | 3 ---
 .../org/apache/camel/processor/MessageHistoryDumpRoutingTest.java | 3 ---
 .../test/java/org/apache/camel/processor/MethodFilterTest.java    | 3 ---
 .../apache/camel/processor/MulticastCompletedPropertyTest.java    | 3 ---
 .../camel/processor/MulticastFineGrainedErrorHandlingTest.java    | 3 ---
 .../processor/MulticastKeepOriginalMessageUnchangedTest.java      | 3 ---
 .../apache/camel/processor/MulticastNoStopOnExceptionTest.java    | 3 ---
 .../camel/processor/MulticastParallelAllTimeoutAwareTest.java     | 3 ---
 .../camel/processor/MulticastParallelFailureEndpointTest.java     | 3 ---
 .../processor/MulticastParallelFineGrainedErrorHandlingTest.java  | 3 ---
 .../apache/camel/processor/MulticastParallelLastTimeoutTest.java  | 3 ---
 .../camel/processor/MulticastParallelMiddleTimeoutTest.java       | 3 ---
 .../camel/processor/MulticastParallelNoStopOnExceptionTest.java   | 3 ---
 .../camel/processor/MulticastParallelStopOnExceptionTest.java     | 3 ---
 .../apache/camel/processor/MulticastParallelStreamingTest.java    | 3 ---
 .../camel/processor/MulticastParallelStreamingTimeoutTest.java    | 3 ---
 .../camel/processor/MulticastParallelStreamingTwoTimeoutTest.java | 3 ---
 .../org/apache/camel/processor/MulticastParallelStressTest.java   | 3 ---
 .../java/org/apache/camel/processor/MulticastParallelTest.java    | 3 ---
 .../org/apache/camel/processor/MulticastParallelTimeout2Test.java | 3 ---
 .../org/apache/camel/processor/MulticastParallelTimeout3Test.java | 3 ---
 .../apache/camel/processor/MulticastParallelTimeoutAwareTest.java | 3 ---
 .../org/apache/camel/processor/MulticastParallelTimeoutTest.java  | 3 ---
 .../camel/processor/MulticastParallelTwoTimeoutMiddleTest.java    | 3 ---
 .../apache/camel/processor/MulticastParallelTwoTimeoutTest.java   | 3 ---
 .../MulticastStopOnExceptionLastWithOnExceptionTest.java          | 3 ---
 .../org/apache/camel/processor/MulticastStopOnExceptionTest.java  | 3 ---
 .../processor/MulticastStopOnExceptionWithOnExceptionTest.java    | 3 ---
 .../org/apache/camel/processor/MulticastStreamCachingTest.java    | 3 ---
 .../src/test/java/org/apache/camel/processor/MulticastTest.java   | 3 ---
 .../apache/camel/processor/MulticastThreadPoolProfileTest.java    | 3 ---
 .../java/org/apache/camel/processor/MulticastUnitOfWorkTest.java  | 2 --
 .../apache/camel/processor/MulticastWithOnExceptionFirstTest.java | 3 ---
 .../apache/camel/processor/MulticastWithOnExceptionLastTest.java  | 3 ---
 .../org/apache/camel/processor/MulticastWithOnExceptionTest.java  | 3 ---
 .../java/org/apache/camel/processor/MyAggregationStrategy.java    | 1 -
 .../org/apache/camel/processor/MyLoggingSentEventNotifer.java     | 3 ---
 .../src/test/java/org/apache/camel/processor/MyValidator.java     | 3 ---
 .../test/java/org/apache/camel/processor/NavigateRouteTest.java   | 2 --
 .../org/apache/camel/processor/NewProcessorAndServiceTest.java    | 3 ---
 .../test/java/org/apache/camel/processor/NoErrorHandlerTest.java  | 3 ---
 .../NotAllowRedeliveryWhileStoppingDeadLetterChannelTest.java     | 3 ---
 .../camel/processor/NotAllowRedeliveryWhileStoppingTest.java      | 3 ---
 .../OnCompletionAndInterceptAndOnExceptionGlobalTest.java         | 3 ---
 .../processor/OnCompletionAndInterceptGlobalSSEnabledTest.java    | 3 ---
 .../camel/processor/OnCompletionAndInterceptGlobalTest.java       | 3 ---
 .../org/apache/camel/processor/OnCompletionAndInterceptTest.java  | 3 ---
 .../java/org/apache/camel/processor/OnCompletionAsyncTest.java    | 3 ---
 .../java/org/apache/camel/processor/OnCompletionContainsTest.java | 3 ---
 .../apache/camel/processor/OnCompletionGlobalCustomPoolTest.java  | 3 ---
 .../java/org/apache/camel/processor/OnCompletionGlobalTest.java   | 3 ---
 .../apache/camel/processor/OnCompletionInvalidConfiguredTest.java | 3 ---
 .../processor/OnCompletionMoreGlobalRouteCompletionTest.java      | 3 ---
 .../org/apache/camel/processor/OnCompletionMoreGlobalTest.java    | 3 ---
 .../apache/camel/processor/OnCompletionOnCompleteOnlyTest.java    | 3 ---
 .../org/apache/camel/processor/OnCompletionOnFailureOnlyTest.java | 3 ---
 .../processor/OnCompletionRouteScopeOverrideGlobalScopeTest.java  | 3 ---
 .../org/apache/camel/processor/OnCompletionShouldBeLastTest.java  | 3 ---
 .../test/java/org/apache/camel/processor/OnCompletionTest.java    | 3 ---
 .../apache/camel/processor/OnCompletionUseOriginalBodyTest.java   | 3 ---
 .../java/org/apache/camel/processor/OnCompletionWhenTest.java     | 3 ---
 .../apache/camel/processor/OnExceptionContinueToRouteTest.java    | 3 ---
 .../src/test/java/org/apache/camel/processor/PipelineMEPTest.java | 2 --
 .../src/test/java/org/apache/camel/processor/PipelineTest.java    | 3 ---
 .../java/org/apache/camel/processor/PolicyPerProcessorTest.java   | 3 ---
 .../test/java/org/apache/camel/processor/PolicyPerRouteTest.java  | 3 ---
 .../camel/processor/ProducerTemplateDisableEventNotifierTest.java | 3 ---
 .../camel/processor/RecipeientListWithSimpleExpressionTest.java   | 3 ---
 .../camel/processor/RecipientListAggregationStrategyTest.java     | 3 ---
 .../java/org/apache/camel/processor/RecipientListBeanTest.java    | 3 ---
 .../camel/processor/RecipientListDoNotStopOnExceptionTest.java    | 3 ---
 .../RecipientListExchangePropertyAggregationStrategyTest.java     | 3 ---
 .../apache/camel/processor/RecipientListExchangePropertyTest.java | 3 ---
 .../processor/RecipientListFineGrainedErrorHandlingTest.java      | 3 ---
 .../java/org/apache/camel/processor/RecipientListLeakTest.java    | 3 ---
 .../java/org/apache/camel/processor/RecipientListNoCacheTest.java | 3 ---
 .../RecipientListParallelAggregateThreadPoolIssueTest.java        | 3 ---
 .../RecipientListParallelFineGrainedErrorHandlingTest.java        | 3 ---
 .../RecipientListParallelStopOnExceptionWithOnExceptionTest.java  | 3 ---
 .../camel/processor/RecipientListParallelStreamingTest.java       | 3 ---
 .../org/apache/camel/processor/RecipientListParallelTest.java     | 3 ---
 .../apache/camel/processor/RecipientListParallelTimeoutTest.java  | 3 ---
 .../org/apache/camel/processor/RecipientListReturnValueTest.java  | 2 --
 .../apache/camel/processor/RecipientListStopOnExceptionTest.java  | 3 ---
 .../RecipientListStopOnExceptionWithOnExceptionTest.java          | 3 ---
 .../test/java/org/apache/camel/processor/RecipientListTest.java   | 3 ---
 .../apache/camel/processor/RecipientListWithArrayHeaderTest.java  | 3 ---
 .../apache/camel/processor/RecipientListWithDelimiterTest.java    | 3 ---
 .../processor/RecipientListWithStringDelimitedHeaderTest.java     | 3 ---
 .../processor/RecipientListWithStringDelimitedPropertyTest.java   | 3 ---
 .../camel/processor/RedeliverWithExceptionAndFaultTest.java       | 3 ---
 .../camel/processor/RedeliveryErrorHandlerBlockedDelayTest.java   | 3 ---
 .../camel/processor/RedeliveryErrorHandlerLogHandledTest.java     | 3 ---
 .../processor/RedeliveryErrorHandlerNonBlockedDelayTest.java      | 3 ---
 .../RedeliveryErrorHandlerNonBlockedRedeliveryHeaderTest.java     | 3 ---
 .../camel/processor/RedeliveryOnExceptionBlockedDelayTest.java    | 3 ---
 .../apache/camel/processor/RedeliveryPolicyDelayPatternTest.java  | 3 ---
 .../apache/camel/processor/RedeliveryPolicyPerExceptionTest.java  | 3 ---
 .../ReduceStacksNeededDuringRoutingSendProcessorTest.java         | 3 ---
 .../camel/processor/ReduceStacksNeededDuringRoutingTest.java      | 3 ---
 .../src/test/java/org/apache/camel/processor/ResequencerTest.java | 3 ---
 .../org/apache/camel/processor/RollbackCustomMessageTest.java     | 3 ---
 .../apache/camel/processor/RollbackDefaultErrorHandlerTest.java   | 3 ---
 .../org/apache/camel/processor/RollbackDefaultMessageTest.java    | 3 ---
 .../src/test/java/org/apache/camel/processor/RollbackTest.java    | 3 ---
 .../java/org/apache/camel/processor/RouteAutoStartupTest.java     | 3 ---
 .../org/apache/camel/processor/RouteContextProcessorTest.java     | 2 --
 .../java/org/apache/camel/processor/RouteFormattedUriTest.java    | 3 ---
 .../src/test/java/org/apache/camel/processor/RouteIdTest.java     | 3 ---
 .../java/org/apache/camel/processor/RouteNoAutoStartupTest.java   | 3 ---
 .../org/apache/camel/processor/RoutePerformanceCountTest.java     | 3 ---
 .../java/org/apache/camel/processor/RoutePoliciesRefTest.java     | 3 ---
 .../test/java/org/apache/camel/processor/RoutePoliciesTest.java   | 3 ---
 .../org/apache/camel/processor/RouteServicesStartupOrderTest.java | 3 ---
 .../apache/camel/processor/RouteShutdownNotReverseOrderTest.java  | 3 ---
 .../org/apache/camel/processor/RouteShutdownReverseOrderTest.java | 3 ---
 .../org/apache/camel/processor/RouteStartupOrderClashTest.java    | 3 ---
 .../camel/processor/RouteStartupOrderDirectReverseTest.java       | 3 ---
 .../org/apache/camel/processor/RouteStartupOrderDirectTest.java   | 3 ---
 .../org/apache/camel/processor/RouteStartupOrderSimpleTest.java   | 3 ---
 .../RouteStartupOrderSuspendResumeNoAutoStartupTest.java          | 3 ---
 .../camel/processor/RouteStartupOrderSuspendResumeTest.java       | 3 ---
 .../java/org/apache/camel/processor/RouteStartupOrderTest.java    | 3 ---
 .../apache/camel/processor/RouteStartupOrderWithDefaultTest.java  | 3 ---
 .../src/test/java/org/apache/camel/processor/RouteStopTest.java   | 2 --
 .../processor/RouteWithConstantFieldFromExchangeFailTest.java     | 3 ---
 .../camel/processor/RouteWithConstantFieldFromExchangeTest.java   | 3 ---
 .../org/apache/camel/processor/RoutingSlipInOutAndInOnlyTest.java | 3 ---
 .../java/org/apache/camel/processor/RoutingSlipNoCacheTest.java   | 3 ---
 .../java/org/apache/camel/processor/SamplingThrottlerTest.java    | 3 ---
 .../test/java/org/apache/camel/processor/ScriptExternalTest.java  | 3 ---
 .../src/test/java/org/apache/camel/processor/ScriptTest.java      | 3 ---
 .../org/apache/camel/processor/SendToNonExistingEndpointTest.java | 3 ---
 .../java/org/apache/camel/processor/SetBodyProcessorTest.java     | 3 ---
 .../src/test/java/org/apache/camel/processor/SetHeaderTest.java   | 3 ---
 .../apache/camel/processor/SetHeaderUsingDslExpressionsTest.java  | 3 ---
 .../org/apache/camel/processor/ShutdownCompleteAllTasksTest.java  | 3 ---
 .../camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java      | 3 ---
 .../test/java/org/apache/camel/processor/ShutdownDeferTest.java   | 3 ---
 .../java/org/apache/camel/processor/ShutdownNotDeferTest.java     | 3 ---
 .../apache/camel/processor/ShutdownSedaAndDirectEndpointTest.java | 3 ---
 .../test/java/org/apache/camel/processor/SimpleDirectTest.java    | 3 ---
 .../java/org/apache/camel/processor/SimpleMockSampleTest.java     | 3 ---
 .../src/test/java/org/apache/camel/processor/SimpleMockTest.java  | 3 ---
 .../org/apache/camel/processor/SimpleProcessorIdAwareTest.java    | 3 ---
 .../test/java/org/apache/camel/processor/SimpleProcessorTest.java | 3 ---
 .../org/apache/camel/processor/SimpleProcessorTraceableTest.java  | 3 ---
 .../org/apache/camel/processor/SimpleTryCatchFinallyTest.java     | 3 ---
 .../java/org/apache/camel/processor/SimpleTryFinallyTest.java     | 3 ---
 .../camel/processor/SimpleTryThrowExceptionFinallyTest.java       | 3 ---
 .../src/test/java/org/apache/camel/processor/SimulatorTest.java   | 3 ---
 .../java/org/apache/camel/processor/SplitAggregateInOutTest.java  | 3 ---
 .../java/org/apache/camel/processor/SplitParallelTimeoutTest.java | 3 ---
 .../test/java/org/apache/camel/processor/SplitWithEndTest.java    | 3 ---
 .../org/apache/camel/processor/SplitterCompletedPropertyTest.java | 3 ---
 .../java/org/apache/camel/processor/SplitterMethodCallTest.java   | 3 ---
 .../apache/camel/processor/SplitterNoAggregationStrategyTest.java | 3 ---
 .../org/apache/camel/processor/SplitterNoStopOnExceptionTest.java | 3 ---
 .../java/org/apache/camel/processor/SplitterOnCompletionTest.java | 3 ---
 .../org/apache/camel/processor/SplitterParallelBigFileTest.java   | 3 ---
 .../camel/processor/SplitterParallelNoStopOnExceptionTest.java    | 3 ---
 .../camel/processor/SplitterParallelStopOnExceptionTest.java      | 3 ---
 .../SplitterParallelStopOnExceptionWithOnExceptionTest.java       | 3 ---
 .../test/java/org/apache/camel/processor/SplitterPojoTest.java    | 3 ---
 .../processor/SplitterShareUnitOfWorkCompletionAwareTest.java     | 3 ---
 .../org/apache/camel/processor/SplitterStopOnExceptionTest.java   | 3 ---
 .../processor/SplitterStopOnExceptionWithOnExceptionTest.java     | 3 ---
 .../java/org/apache/camel/processor/SplitterStreamCacheTest.java  | 3 ---
 .../camel/processor/SplitterStreamingErrorHandlingTest.java       | 3 ---
 .../SplitterStreamingStopOnExceptionErrorHandlingTest.java        | 3 ---
 .../org/apache/camel/processor/SplitterStreamingUoWIssueTest.java | 3 ---
 .../camel/processor/SplitterStreamingWithErrorHandlerTest.java    | 3 ---
 .../src/test/java/org/apache/camel/processor/SplitterTest.java    | 3 ---
 .../java/org/apache/camel/processor/SplitterUoWIssueTest.java     | 3 ---
 .../org/apache/camel/processor/SplitterWithDualMulticastTest.java | 3 ---
 .../org/apache/camel/processor/SplitterWithMulticastTest.java     | 3 ---
 .../org/apache/camel/processor/StreamCachingOnlyRouteTest.java    | 3 ---
 .../org/apache/camel/processor/StreamCachingPerRouteTest.java     | 3 ---
 .../StreamSourceContentBasedRouterNoErrorHandlerTest.java         | 2 --
 ...StreamSourceContentBasedRouterSSEnabledOnCamelContextTest.java | 2 --
 .../camel/processor/StreamSourceContentBasedRouterTest.java       | 2 --
 .../apache/camel/processor/ThreadsCoreAndMaxPoolInvalidTest.java  | 3 ---
 .../camel/processor/ThreadsCoreAndMaxPoolKeepAliveTimeTest.java   | 3 ---
 .../org/apache/camel/processor/ThreadsCoreAndMaxPoolTest.java     | 3 ---
 .../test/java/org/apache/camel/processor/ThreadsCorePoolTest.java | 3 ---
 .../test/java/org/apache/camel/processor/ThreadsDefaultTest.java  | 3 ---
 .../java/org/apache/camel/processor/ThreadsMaxQueueSizeTest.java  | 3 ---
 .../org/apache/camel/processor/ThreadsRejectedExecutionTest.java  | 3 ---
 .../org/apache/camel/processor/ThreadsRejectedPolicyTest.java     | 3 ---
 .../java/org/apache/camel/processor/ThreadsRequestReplyTest.java  | 3 ---
 .../apache/camel/processor/ThreadsZeroInCoreAndMaxPoolTest.java   | 3 ---
 .../org/apache/camel/processor/ThrottlerAsyncDelayedTest.java     | 3 ---
 .../apache/camel/processor/ThrottlerInvalidConfiguredTest.java    | 3 ---
 .../java/org/apache/camel/processor/ThrottlerMethodCallTest.java  | 3 ---
 .../java/org/apache/camel/processor/ThrottlerNullEvalTest.java    | 3 ---
 .../java/org/apache/camel/processor/ThrottlingGroupingTest.java   | 3 ---
 .../apache/camel/processor/ThrottlingInflightRoutePolicyTest.java | 3 ---
 .../org/apache/camel/processor/ThrowExceptionMessageTest.java     | 3 ---
 .../org/apache/camel/processor/ThrowExceptionNullMessageTest.java | 3 ---
 .../test/java/org/apache/camel/processor/ThrowExceptionTest.java  | 3 ---
 .../java/org/apache/camel/processor/ToEndpointPropertyTest.java   | 3 ---
 .../test/java/org/apache/camel/processor/TraceDelayerTest.java    | 3 ---
 .../java/org/apache/camel/processor/TraceInterceptorTest.java     | 3 ---
 .../java/org/apache/camel/processor/TracePerRouteManualTest.java  | 3 ---
 .../java/org/apache/camel/processor/TracerConfigurationTest.java  | 3 ---
 .../src/test/java/org/apache/camel/processor/TransformTest.java   | 3 ---
 .../test/java/org/apache/camel/processor/TransformViaDSLTest.java | 3 ---
 .../org/apache/camel/processor/TryCatchContinueToRouteTest.java   | 3 ---
 .../camel/processor/TryCatchMustHaveExceptionConfiguredTest.java  | 3 ---
 .../java/org/apache/camel/processor/TryCatchNestedChoiceTest.java | 3 ---
 .../processor/TypeConverterRegistryStatsPerformanceTest.java      | 3 ---
 .../java/org/apache/camel/processor/UnitOfWorkProducerTest.java   | 3 ---
 .../camel/processor/UnitOfWorkSynchronizationAdapterTest.java     | 3 ---
 .../src/test/java/org/apache/camel/processor/UnitOfWorkTest.java  | 3 ---
 .../org/apache/camel/processor/UnitOfWorkWithAsyncFlowTest.java   | 3 ---
 .../test/java/org/apache/camel/processor/ValidateRegExpTest.java  | 3 ---
 .../java/org/apache/camel/processor/ValidateSimpleRegExpTest.java | 3 ---
 .../test/java/org/apache/camel/processor/ValidateSimpleTest.java  | 3 ---
 .../src/test/java/org/apache/camel/processor/ValidationTest.java  | 3 ---
 .../org/apache/camel/processor/ValidationWithExceptionTest.java   | 3 ---
 .../apache/camel/processor/ValidationWithInFlowExceptionTest.java | 3 ---
 .../org/apache/camel/processor/ValidationWithTryCatchTest.java    | 3 ---
 .../java/org/apache/camel/processor/VerySimpleDirectTest.java     | 3 ---
 .../org/apache/camel/processor/WireTapBeanAsProcessorTest.java    | 2 --
 .../src/test/java/org/apache/camel/processor/WireTapBeanTest.java | 2 --
 .../java/org/apache/camel/processor/WireTapCustomPool2Test.java   | 2 --
 .../java/org/apache/camel/processor/WireTapCustomPoolTest.java    | 2 --
 .../java/org/apache/camel/processor/WireTapExpressionTest.java    | 2 --
 .../java/org/apache/camel/processor/WireTapNewExchangeTest.java   | 3 ---
 .../java/org/apache/camel/processor/WireTapStreamCachingTest.java | 3 ---
 .../src/test/java/org/apache/camel/processor/WireTapTest.java     | 2 --
 .../processor/WireTapUsingFireAndForgetCopyAsDefaultTest.java     | 3 ---
 .../apache/camel/processor/WireTapUsingFireAndForgetCopyTest.java | 3 ---
 .../org/apache/camel/processor/WireTapUsingFireAndForgetTest.java | 3 ---
 .../src/test/java/org/apache/camel/processor/XPathChoiceTest.java | 3 ---
 .../src/test/java/org/apache/camel/processor/XPathFilterTest.java | 3 ---
 .../XPathWithNamespaceBuilderFilterAndResultTypeTest.java         | 3 ---
 .../camel/processor/XPathWithNamespaceBuilderFilterTest.java      | 3 ---
 .../org/apache/camel/processor/XPathWithNamespacesFilterTest.java | 3 ---
 .../camel/processor/aggregator/AbstractDistributedTest.java       | 3 ---
 .../processor/aggregator/AggregateClosedCorrelationKeyTest.java   | 3 ---
 .../processor/aggregator/AggregateCompleteAllOnStopTest.java      | 3 ---
 .../processor/aggregator/AggregateCompletionIntervalTest.java     | 2 --
 .../processor/aggregator/AggregateCompletionOnlyOneTest.java      | 3 ---
 .../processor/aggregator/AggregateCompletionOnlyTwoTest.java      | 3 ---
 .../processor/aggregator/AggregateCompletionPredicateTest.java    | 3 ---
 .../aggregator/AggregateConcurrentPerCorrelationKeyTest.java      | 3 ---
 .../camel/processor/aggregator/AggregateDiscardOnTimeoutTest.java | 3 ---
 .../processor/aggregator/AggregateEagerCheckCompletionTest.java   | 3 ---
 .../processor/aggregator/AggregateExpressionSizeFallbackTest.java | 3 ---
 .../aggregator/AggregateExpressionSizeOverrideFixedTest.java      | 3 ---
 .../AggregateExpressionSizeOverrideFixedTimeoutTest.java          | 3 ---
 .../camel/processor/aggregator/AggregateExpressionSizeTest.java   | 3 ---
 .../aggregator/AggregateExpressionTimeoutFallbackTest.java        | 3 ---
 .../aggregator/AggregateExpressionTimeoutPerGroupTest.java        | 3 ---
 .../processor/aggregator/AggregateExpressionTimeoutTest.java      | 3 ---
 .../aggregator/AggregateForceCompletionOnStopParallelTest.java    | 3 ---
 .../processor/aggregator/AggregateForceCompletionOnStopTest.java  | 3 ---
 .../aggregator/AggregateIgnoreInvalidCorrelationKeysTest.java     | 3 ---
 .../camel/processor/aggregator/AggregateLostGroupIssueTest.java   | 2 --
 .../camel/processor/aggregator/AggregateMultipleSourceTest.java   | 3 ---
 .../processor/aggregator/AggregateNewExchangeAndConfirmTest.java  | 2 --
 .../processor/aggregator/AggregateParallelProcessingTest.java     | 3 ---
 .../aggregator/AggregatePreCompleteAwareStrategyTest.java         | 3 ---
 .../aggregator/AggregatePreCompleteAwareStrategyTimeoutTest.java  | 3 ---
 .../apache/camel/processor/aggregator/AggregateProcessorTest.java | 3 ---
 .../AggregateProcessorTimeoutCompletionRestartTest.java           | 2 --
 .../processor/aggregator/AggregateRepositoryReturnNullTest.java   | 3 ---
 .../aggregator/AggregateShouldSkipFilteredExchangesTest.java      | 2 --
 .../processor/aggregator/AggregateShutdownThreadPoolTest.java     | 3 ---
 .../processor/aggregator/AggregateSimplePredicateEagerTest.java   | 3 ---
 .../camel/processor/aggregator/AggregateSimplePredicateTest.java  | 3 ---
 .../camel/processor/aggregator/AggregateSimpleSizeTest.java       | 3 ---
 .../camel/processor/aggregator/AggregateSimpleTimeoutTest.java    | 3 ---
 .../processor/aggregator/AggregateThreadPoolProfileTest.java      | 3 ---
 .../camel/processor/aggregator/AggregateTimeoutManualTest.java    | 2 --
 .../camel/processor/aggregator/AggregateTimeoutOnlyTest.java      | 2 --
 .../apache/camel/processor/aggregator/AggregateTimeoutTest.java   | 3 ---
 .../aggregator/AggregateTimeoutWithExecutorServiceTest.java       | 2 --
 .../camel/processor/aggregator/AggregatorConcurrencyTest.java     | 3 ---
 .../camel/processor/aggregator/AggregatorExceptionHandleTest.java | 2 --
 .../processor/aggregator/AggregatorExceptionInPredicateTest.java  | 2 --
 .../org/apache/camel/processor/aggregator/AggregatorTest.java     | 3 ---
 .../apache/camel/processor/aggregator/AlbertoAggregatorTest.java  | 3 ---
 .../camel/processor/aggregator/BeanBeforeAggregateIssueTest.java  | 3 ---
 .../processor/aggregator/DistributedCompletionIntervalTest.java   | 2 --
 .../aggregator/DistributedConcurrentPerCorrelationKeyTest.java    | 3 ---
 .../aggregator/DistributedOptimisticLockFailingTest.java          | 3 ---
 .../apache/camel/processor/aggregator/DistributedTimeoutTest.java | 3 ---
 .../processor/aggregator/EnricherRouteNumberOfProcessorTest.java  | 3 ---
 .../processor/aggregator/SplitRouteNumberOfProcessorTest.java     | 3 ---
 .../async/AsyncDeadLetterChannelExecutorServiceRefTest.java       | 2 --
 .../apache/camel/processor/async/AsyncDeadLetterChannelTest.java  | 2 --
 .../camel/processor/async/AsyncDefaultErrorHandlerTest.java       | 2 --
 .../org/apache/camel/processor/async/AsyncEndpointCBRTest.java    | 3 ---
 .../processor/async/AsyncEndpointCustomAsyncInterceptorTest.java  | 3 ---
 .../camel/processor/async/AsyncEndpointCustomInterceptorTest.java | 2 --
 .../camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java | 3 ---
 .../apache/camel/processor/async/AsyncEndpointDelayUoWTest.java   | 3 ---
 .../camel/processor/async/AsyncEndpointDualMulticastTest.java     | 3 ---
 .../processor/async/AsyncEndpointDualTopicLoadBalanceTest.java    | 3 ---
 .../apache/camel/processor/async/AsyncEndpointEnricherTest.java   | 3 ---
 .../processor/async/AsyncEndpointEventNotifierSendingTest.java    | 3 ---
 .../camel/processor/async/AsyncEndpointEventNotifierTest.java     | 3 ---
 .../async/AsyncEndpointFailOverLoadBalanceMixed2Test.java         | 3 ---
 .../async/AsyncEndpointFailOverLoadBalanceMixed3Test.java         | 3 ---
 .../async/AsyncEndpointFailOverLoadBalanceMixedTest.java          | 3 ---
 .../async/AsyncEndpointFailOverLoadBalanceOnlyAsyncTest.java      | 3 ---
 .../async/AsyncEndpointFailedAfterDeadLetterChannelTest.java      | 3 ---
 .../async/AsyncEndpointFailedAfterOnExceptionContinueTest.java    | 3 ---
 .../async/AsyncEndpointFailedAfterOnExceptionHandledTest.java     | 3 ---
 .../camel/processor/async/AsyncEndpointFailedAfterTest.java       | 3 ---
 .../async/AsyncEndpointFailureProcessorContinueTest.java          | 3 ---
 .../camel/processor/async/AsyncEndpointFailureProcessorTest.java  | 3 ---
 .../org/apache/camel/processor/async/AsyncEndpointFilterTest.java | 3 ---
 .../processor/async/AsyncEndpointIdempotentConsumerTest.java      | 3 ---
 .../org/apache/camel/processor/async/AsyncEndpointLoopTest.java   | 3 ---
 .../async/AsyncEndpointMulticastFineGrainedErrorHandlingTest.java | 3 ---
 .../apache/camel/processor/async/AsyncEndpointMulticastTest.java  | 3 ---
 .../apache/camel/processor/async/AsyncEndpointPipelineTest.java   | 3 ---
 .../org/apache/camel/processor/async/AsyncEndpointPolicyTest.java | 3 ---
 .../camel/processor/async/AsyncEndpointRecipientList2Test.java    | 3 ---
 .../camel/processor/async/AsyncEndpointRecipientList3Test.java    | 3 ---
 .../camel/processor/async/AsyncEndpointRecipientList4Test.java    | 3 ---
 .../processor/async/AsyncEndpointRecipientListBean3Test.java      | 3 ---
 .../processor/async/AsyncEndpointRecipientListBean4Test.java      | 3 ---
 .../camel/processor/async/AsyncEndpointRecipientListBeanTest.java | 3 ---
 .../AsyncEndpointRecipientListFineGrainedErrorHandlingTest.java   | 3 ---
 .../processor/async/AsyncEndpointRecipientListParallel2Test.java  | 3 ---
 .../processor/async/AsyncEndpointRecipientListParallel3Test.java  | 3 ---
 .../processor/async/AsyncEndpointRecipientListParallel4Test.java  | 3 ---
 .../processor/async/AsyncEndpointRecipientListParallel5Test.java  | 3 ---
 .../processor/async/AsyncEndpointRecipientListParallelTest.java   | 3 ---
 .../camel/processor/async/AsyncEndpointRecipientListTest.java     | 3 ---
 .../AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay2Test.java  | 3 ---
 .../AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay3Test.java  | 3 ---
 .../AsyncEndpointRedeliveryErrorHandlerNonBlockedDelayTest.java   | 3 ---
 .../processor/async/AsyncEndpointRoundRobinLoadBalanceTest.java   | 3 ---
 .../camel/processor/async/AsyncEndpointRoutingSlip2Test.java      | 3 ---
 .../camel/processor/async/AsyncEndpointRoutingSlip3Test.java      | 3 ---
 .../camel/processor/async/AsyncEndpointRoutingSlipBean2Test.java  | 3 ---
 .../camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java  | 3 ---
 .../async/AsyncEndpointRoutingSlipBeanNonBlockingTest.java        | 3 ---
 .../camel/processor/async/AsyncEndpointRoutingSlipBeanTest.java   | 3 ---
 .../camel/processor/async/AsyncEndpointRoutingSlipTest.java       | 3 ---
 .../apache/camel/processor/async/AsyncEndpointSamplingTest.java   | 3 ---
 .../apache/camel/processor/async/AsyncEndpointSedaInOnlyTest.java | 3 ---
 .../org/apache/camel/processor/async/AsyncEndpointSedaTest.java   | 3 ---
 .../processor/async/AsyncEndpointSingleTopicLoadBalanceTest.java  | 3 ---
 .../async/AsyncEndpointSplitFineGrainedErrorHandlingTest.java     | 3 ---
 .../org/apache/camel/processor/async/AsyncEndpointSplitTest.java  | 3 ---
 .../async/AsyncEndpointSplitUseLatestAggregationStrategyTest.java | 3 ---
 .../org/apache/camel/processor/async/AsyncEndpointStopTest.java   | 3 ---
 .../camel/processor/async/AsyncEndpointSynchronousFalseTest.java  | 3 ---
 .../camel/processor/async/AsyncEndpointSynchronousTest.java       | 3 ---
 .../java/org/apache/camel/processor/async/AsyncEndpointTest.java  | 3 ---
 .../apache/camel/processor/async/AsyncEndpointTransformTest.java  | 3 ---
 .../camel/processor/async/AsyncEndpointTryCatchFinally2Test.java  | 3 ---
 .../camel/processor/async/AsyncEndpointTryCatchFinally3Test.java  | 3 ---
 .../camel/processor/async/AsyncEndpointTryCatchFinally4Test.java  | 3 ---
 .../camel/processor/async/AsyncEndpointTryCatchFinally5Test.java  | 3 ---
 .../camel/processor/async/AsyncEndpointTryCatchFinallyTest.java   | 3 ---
 .../apache/camel/processor/async/AsyncEndpointUoWFailedTest.java  | 3 ---
 .../org/apache/camel/processor/async/AsyncEndpointUoWTest.java    | 3 ---
 .../camel/processor/async/AsyncEndpointWithDelayerTest.java       | 3 ---
 .../camel/processor/async/AsyncEndpointWithHandleFaultTest.java   | 3 ---
 .../apache/camel/processor/async/AsyncEndpointWithJMXTest.java    | 3 ---
 .../camel/processor/async/AsyncEndpointWithStreamCachingTest.java | 3 ---
 .../camel/processor/async/AsyncEndpointWithTracingTest.java       | 3 ---
 .../async/AsyncFailureProcessorWithRedeliveryAndDelayTest.java    | 3 ---
 .../processor/async/AsyncFailureProcessorWithRedeliveryTest.java  | 3 ---
 .../org/apache/camel/processor/async/AsyncInOnlyEndpointTest.java | 3 ---
 .../test/java/org/apache/camel/processor/async/AsyncMDCTest.java  | 3 ---
 .../async/AsyncOnExceptionFailureProcessorWithRedeliveryTest.java | 3 ---
 .../processor/async/AsyncProcessorAwaitManagerInterruptTest.java  | 3 ---
 .../camel/processor/async/AsyncProcessorAwaitManagerTest.java     | 3 ---
 .../java/org/apache/camel/processor/async/AsyncProducerTest.java  | 3 ---
 .../org/apache/camel/processor/async/AsyncRouteWithErrorTest.java | 3 ---
 .../apache/camel/processor/async/AsyncSedaInOnlyEndpointTest.java | 3 ---
 .../org/apache/camel/processor/async/AsyncTwoEndpointTest.java    | 3 ---
 .../java/org/apache/camel/processor/async/MyAsyncComponent.java   | 3 ---
 .../java/org/apache/camel/processor/async/MyAsyncEndpoint.java    | 3 ---
 .../java/org/apache/camel/processor/async/MyAsyncProducer.java    | 3 ---
 .../processor/enricher/EnricherAggregateOnExceptionTest.java      | 3 ---
 .../processor/enricher/EnricherAsyncUnhandledExceptionTest.java   | 3 ---
 .../enricher/EnricherDefaultAggregationStrategyTest.java          | 3 ---
 .../java/org/apache/camel/processor/enricher/EnricherRefTest.java | 3 ---
 .../processor/enricher/PollEnricherAggregateOnExceptionTest.java  | 3 ---
 .../org/apache/camel/processor/enricher/PollEnricherRefTest.java  | 3 ---
 .../camel/processor/intercept/DualInterceptSimpleRouteTest.java   | 3 ---
 .../camel/processor/intercept/FromFileInterceptSendToIssue.java   | 2 --
 .../camel/processor/intercept/IntercepFromWithPredicateTest.java  | 3 ---
 .../apache/camel/processor/intercept/InterceptFromRouteTest.java  | 3 ---
 .../camel/processor/intercept/InterceptFromRouteTestSupport.java  | 3 ---
 .../camel/processor/intercept/InterceptFromWhenNoStopTest.java    | 3 ---
 .../apache/camel/processor/intercept/InterceptFromWhenTest.java   | 3 ---
 .../processor/intercept/InterceptFromWhenWithChoiceTest.java      | 3 ---
 .../intercept/InterceptFromWithPredicateAndProceedRouteTest.java  | 3 ---
 .../intercept/InterceptFromWithPredicateAndStopRouteTest.java     | 3 ---
 .../processor/intercept/InterceptFromWithPredicateRouteTest.java  | 3 ---
 .../camel/processor/intercept/InterceptFromWithStopRouteTest.java | 3 ---
 .../processor/intercept/InterceptFromWithoutProceedRouteTest.java | 3 ---
 .../intercept/InterceptSendToEndpointConditionalSkip2Test.java    | 2 --
 .../intercept/InterceptSendToEndpointConditionalSkip3Test.java    | 2 --
 .../intercept/InterceptSendToEndpointConditionalSkipTest.java     | 2 --
 .../processor/intercept/InterceptSendToEndpointDynamicTest.java   | 2 --
 .../processor/intercept/InterceptSendToEndpointInOnException.java | 3 ---
 .../camel/processor/intercept/InterceptSendToEndpointTest.java    | 2 --
 .../intercept/InterceptSendToEndpointWithParametersTest.java      | 3 ---
 .../processor/intercept/InterceptSendToEndpointWithStopTest.java  | 2 --
 .../camel/processor/intercept/InterceptSendToExceptionTest.java   | 3 ---
 .../camel/processor/intercept/InterceptSendToFaultTest.java       | 3 ---
 .../apache/camel/processor/intercept/InterceptSendToIssue.java    | 2 --
 .../camel/processor/intercept/InterceptSimpleRouteStopTest.java   | 3 ---
 .../camel/processor/intercept/InterceptSimpleRouteTest.java       | 3 ---
 .../processor/intercept/InterceptSimpleRouteWhenStopTest.java     | 3 ---
 .../camel/processor/intercept/InterceptSimpleRouteWhenTest.java   | 3 ---
 .../camel/processor/interceptor/AdviceWithAutoStartupTest.java    | 3 ---
 .../interceptor/AdviceWithMockEndpointsHavingParameterTest.java   | 3 ---
 .../camel/processor/interceptor/AdviceWithMockEndpointsTest.java  | 3 ---
 .../interceptor/AdviceWithMockEndpointsWithSkipTest.java          | 3 ---
 .../interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java  | 3 ---
 .../interceptor/AdviceWithRecipientListMockEndpointsTest.java     | 3 ---
 .../apache/camel/processor/interceptor/AdviceWithRouteIdTest.java | 3 ---
 .../org/apache/camel/processor/interceptor/AdviceWithTest.java    | 3 ---
 .../AdviceWithTwoRoutesContextScopedOnExceptionTest.java          | 3 ---
 .../processor/interceptor/AdviceWithTwoRoutesOnExceptionTest.java | 3 ---
 .../camel/processor/interceptor/AdviceWithTwoRoutesTest.java      | 3 ---
 .../interceptor/AuditInterceptorAsyncDelegateIssueTest.java       | 3 ---
 .../processor/interceptor/AuditInterceptorDelegateIssueTest.java  | 3 ---
 .../camel/processor/interceptor/DebugExceptionBreakpointTest.java | 3 ---
 .../processor/interceptor/DebugExceptionEventBreakpointTest.java  | 3 ---
 .../camel/processor/interceptor/DebugSingleStepConditionTest.java | 3 ---
 .../apache/camel/processor/interceptor/DebugSingleStepTest.java   | 3 ---
 .../java/org/apache/camel/processor/interceptor/DebugTest.java    | 3 ---
 .../processor/interceptor/InterceptorStrategyNotOrderedTest.java  | 3 ---
 .../processor/interceptor/InterceptorStrategyOrderedTest.java     | 3 ---
 .../apache/camel/processor/interceptor/NoStreamCachingTest.java   | 3 ---
 .../processor/onexception/DoCatchDirectDynamicRouteTest.java      | 3 ---
 .../onexception/DoCatchDirectRecipientListStreamingTest.java      | 3 ---
 .../processor/onexception/DoCatchDirectRecipientListTest.java     | 3 ---
 .../camel/processor/onexception/DoCatchDirectRouteTest.java       | 3 ---
 .../processor/onexception/ErrorOccurredInOnExceptionRoute.java    | 3 ---
 .../apache/camel/processor/onexception/OnCatchHandledTest.java    | 3 ---
 .../camel/processor/onexception/OnExceptionAfterRouteTest.java    | 3 ---
 .../OnExceptionAndDLCErrorHandlerIssueReverseTest.java            | 3 ---
 .../onexception/OnExceptionAndDLCErrorHandlerIssueTest.java       | 3 ---
 .../onexception/OnExceptionCallSubRouteNoErrorHandlerTest.java    | 3 ---
 .../processor/onexception/OnExceptionContinuePredicateTest.java   | 3 ---
 .../processor/onexception/OnExceptionContinueSubRouteTest.java    | 3 ---
 .../processor/onexception/OnExceptionContinueSubSubRouteTest.java | 3 ---
 .../camel/processor/onexception/OnExceptionContinueTest.java      | 3 ---
 .../onexception/OnExceptionContinueTwoPredicateTest.java          | 3 ---
 .../camel/processor/onexception/OnExceptionContinueTwoTest.java   | 3 ---
 .../OnExceptionGlobalAndDLCErrorHandlerIssueReverseTest.java      | 3 ---
 .../onexception/OnExceptionGlobalAndDLCErrorHandlerIssueTest.java | 3 ---
 .../processor/onexception/OnExceptionHandledAndContinueTest.java  | 3 ---
 .../camel/processor/onexception/OnExceptionHandledTest.java       | 3 ---
 .../processor/onexception/OnExceptionUseOriginalBodyTest.java     | 2 --
 .../processor/onexception/OnExceptionUseOriginalMessageTest.java  | 3 ---
 .../onexception/OnExceptionWithRouteAndContinueTest.java          | 3 ---
 .../camel/processor/onexception/OnExceptionsPerRouteTest.java     | 3 ---
 .../processor/onexception/RouteScopedOnExceptionSameTypeTest.java | 3 ---
 .../camel/processor/resequencer/ResequencerFileNameTest.java      | 3 ---
 .../processor/validation/DefaultValidationErrorHandlerTest.java   | 3 ---
 .../test/java/org/apache/camel/support/AttributedQNameTest.java   | 3 ---
 .../test/java/org/apache/camel/support/DefaultTimeoutMapTest.java | 3 ---
 .../java/org/apache/camel/support/RecordableInputStreamTest.java  | 3 ---
 .../test/java/org/apache/camel/support/RecordableReaderTest.java  | 3 ---
 .../test/java/org/apache/camel/support/ServiceSupportTest.java    | 3 ---
 .../camel/support/XMLTokenExpressionIteratorGroupingTest.java     | 3 ---
 .../src/test/java/org/apache/camel/util/AnotherExampleBean.java   | 3 ---
 .../test/java/org/apache/camel/util/CamelContextHelperTest.java   | 3 ---
 .../test/java/org/apache/camel/util/CaseInsensitiveMapTest.java   | 3 ---
 .../src/test/java/org/apache/camel/util/CollectionHelperTest.java | 3 ---
 .../java/org/apache/camel/util/CollectionStringBufferTest.java    | 3 ---
 .../src/test/java/org/apache/camel/util/EndpointHelperTest.java   | 3 ---
 .../src/test/java/org/apache/camel/util/ExchangeHelperTest.java   | 3 ---
 .../java/org/apache/camel/util/ExpressionListComparatorTest.java  | 3 ---
 camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java  | 3 ---
 camel-core/src/test/java/org/apache/camel/util/IOHelperTest.java  | 3 ---
 .../src/test/java/org/apache/camel/util/InetAddressUtilTest.java  | 3 ---
 .../src/test/java/org/apache/camel/util/KeyValueHolderTest.java   | 3 ---
 camel-core/src/test/java/org/apache/camel/util/LRUCacheTest.java  | 3 ---
 .../src/test/java/org/apache/camel/util/ObjectHelperTest.java     | 3 ---
 .../test/java/org/apache/camel/util/OrderedComparatorTest.java    | 3 ---
 .../src/test/java/org/apache/camel/util/OtherExampleBean.java     | 3 ---
 .../src/test/java/org/apache/camel/util/PackageHelperTest.java    | 3 ---
 .../java/org/apache/camel/util/PredicateAssertHelperTest.java     | 3 ---
 camel-core/src/test/java/org/apache/camel/util/TimeTest.java      | 3 ---
 .../src/test/java/org/apache/camel/util/URISupportTest.java       | 3 ---
 .../camel/util/concurrent/SubmitOrderedCompletionServiceTest.java | 3 ---
 .../camel/util/concurrent/SynchronousExecutorServiceTest.java     | 3 ---
 .../src/test/java/org/apache/camel/util/jndi/ExampleBean.java     | 3 ---
 camel-core/src/test/java/org/apache/camel/util/jndi/JndiTest.java | 3 ---
 .../java/org/apache/camel/component/ahc/ws/WsProducerTest.java    | 3 ---
 .../camel/component/ahc/ws/WsProducerUsingStreamingTest.java      | 3 ---
 .../java/org/apache/camel/component/ahc/ws/WssProducerTest.java   | 2 --
 .../apache/camel/component/ahc/HttpHeaderFilterStrategyTest.java  | 3 ---
 .../component/atmosphere/websocket/CamelWebSocketServlet.java     | 1 -
 .../main/java/org/apache/camel/component/atom/AtomProducer.java   | 2 --
 .../java/org/apache/camel/component/atom/UpdatedDateFilter.java   | 2 --
 .../main/java/org/apache/camel/component/feed/EntryFilter.java    | 2 --
 .../camel/component/atom/AtomHttpNoCamelParametersTest.java       | 3 ---
 .../apache/camel/component/atom/AtomPollingUnthrottledTest.java   | 3 ---
 .../test/java/org/apache/camel/component/atom/AtomRouteTest.java  | 3 ---
 .../java/org/apache/camel/component/aws/ec2/EC2Constants.java     | 1 -
 .../java/org/apache/camel/component/aws/kms/KMSConstants.java     | 1 -
 .../main/java/org/apache/camel/component/aws/mq/MQConstants.java  | 1 -
 .../main/java/org/apache/camel/component/aws/s3/S3Constants.java  | 1 -
 .../main/java/org/apache/camel/component/aws/sqs/SqsProducer.java | 1 -
 .../org/apache/camel/dataformat/barcode/BarcodeParameters.java    | 1 -
 .../camel/dataformat/barcode/BarcodeDataFormatCamelTest.java      | 1 -
 .../component/bean/validator/BeanValidatorConfigurationTest.java  | 3 ---
 .../camel/component/bean/validator/BeanValidatorRouteTest.java    | 3 ---
 .../bean/validator/BeanValidatorXMLConfigurationRouteTest.java    | 3 ---
 .../test/java/org/apache/camel/component/bean/validator/Car.java  | 3 ---
 .../test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java | 2 --
 .../dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java  | 3 ---
 .../apache/camel/dataformat/bindy/csv/BindyPatternLocaleTest.java | 3 ---
 .../apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java | 3 ---
 .../apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java  | 3 ---
 .../camel/dataformat/bindy/model/simple/pipeline/MyData.java      | 3 ---
 .../apache/camel/dataformat/bindy/model/tab/PurchaseOrder.java    | 3 ---
 .../apache/camel/blueprint/CamelConsumerTemplateFactoryBean.java  | 2 --
 .../java/org/apache/camel/blueprint/CamelContextFactoryBean.java  | 2 --
 .../java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java | 2 --
 .../camel/blueprint/CamelFluentProducerTemplateFactoryBean.java   | 2 --
 .../apache/camel/blueprint/CamelProducerTemplateFactoryBean.java  | 2 --
 .../apache/camel/blueprint/CamelRedeliveryPolicyFactoryBean.java  | 2 --
 .../org/apache/camel/blueprint/CamelThreadPoolFactoryBean.java    | 2 --
 .../org/apache/camel/blueprint/ContextScanRouteBuilderFinder.java | 2 --
 .../main/java/org/apache/camel/blueprint/ErrorHandlerType.java    | 2 --
 .../org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java | 2 --
 .../java/org/apache/camel/component/boon/BoonConcurrentTest.java  | 3 ---
 .../org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java     | 3 ---
 .../camel/core/xml/AbstractCamelConsumerTemplateFactoryBean.java  | 2 --
 .../apache/camel/core/xml/AbstractCamelContextFactoryBean.java    | 2 --
 .../core/xml/AbstractCamelFluentProducerTemplateFactoryBean.java  | 2 --
 .../camel/core/xml/AbstractCamelProducerTemplateFactoryBean.java  | 2 --
 .../camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java  | 2 --
 .../apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java | 2 --
 .../apache/camel/core/xml/CamelPropertyPlaceholderDefinition.java | 2 --
 .../org/apache/camel/core/xml/CamelProxyFactoryDefinition.java    | 2 --
 .../org/apache/camel/core/xml/CamelServiceExporterDefinition.java | 2 --
 .../camel/core/xml/CamelStreamCachingStrategyDefinition.java      | 2 --
 .../component/crypto/cms/exception/CryptoCmsFormatException.java  | 1 -
 .../crypto/cms/exception/CryptoCmsInvalidKeyException.java        | 1 -
 .../exception/CryptoCmsNoKeyOrCertificateForAliasException.java   | 1 -
 .../exception/CryptoCmsSignatureInvalidContentHashException.java  | 1 -
 .../camel/converter/crypto/DefaultPGPPublicKeyAccessor.java       | 1 -
 .../camel/converter/crypto/DefaultPGPSecretKeyAccessor.java       | 1 -
 .../java/org/apache/camel/converter/crypto/PGPDataFormat.java     | 1 -
 .../org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java | 1 -
 .../org/apache/camel/converter/crypto/PGPPassphraseAccessor.java  | 1 -
 .../converter/crypto/PGPSecretKeyAndPrivateKeyAndUserId.java      | 1 -
 .../component/cxf/common/header/CxfHeaderFilterStrategy.java      | 2 --
 .../apache/camel/component/cxf/common/header/CxfHeaderHelper.java | 2 --
 .../component/cxf/common/header/SoapMessageHeaderFilter.java      | 2 --
 .../apache/camel/component/cxf/common/message/CxfConstants.java   | 2 --
 .../camel/component/cxf/common/message/CxfMessageMapper.java      | 2 --
 .../component/cxf/common/message/DefaultCxfMessageMapper.java     | 4 ----
 .../org/apache/camel/component/cxf/transport/CamelConduit.java    | 3 ---
 .../apache/camel/component/cxf/transport/CamelDestination.java    | 1 -
 .../camel/component/cxf/transport/CamelTransportConstants.java    | 3 ---
 .../camel/component/cxf/transport/CamelTransportFactory.java      | 3 ---
 .../src/main/java/org/apache/camel/component/cxf/CxfBinding.java  | 1 -
 .../src/main/java/org/apache/camel/component/cxf/CxfConsumer.java | 2 --
 .../src/main/java/org/apache/camel/component/cxf/CxfPayload.java  | 2 --
 .../src/main/java/org/apache/camel/component/cxf/CxfProducer.java | 2 --
 .../java/org/apache/camel/component/cxf/CxfSpringEndpoint.java    | 2 --
 .../java/org/apache/camel/component/cxf/DefaultCxfBinding.java    | 2 --
 .../org/apache/camel/component/cxf/HybridSourceDataBinding.java   | 2 --
 .../org/apache/camel/component/cxf/WSDLServiceFactoryBean.java    | 1 -
 .../org/apache/camel/component/cxf/converter/CxfConverter.java    | 2 --
 .../camel/component/cxf/converter/DelegatingXMLStreamReader.java  | 3 ---
 .../cxf/interceptors/ConfigureDocLitWrapperInterceptor.java       | 2 --
 .../java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java   | 2 --
 .../camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java      | 4 ----
 .../org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java | 2 --
 .../org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java  | 1 -
 .../cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java          | 2 --
 .../component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java    | 2 --
 .../apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java   | 2 --
 .../test/java/org/apache/camel/component/cxf/CxfEndpointTest.java | 2 --
 .../component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java     | 2 --
 .../camel/component/cxf/CxfJavaOnlyCamelContextAwareTest.java     | 2 --
 .../apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java    | 2 --
 .../camel/component/cxf/CxfMultipleConsumersSupportTest.java      | 3 ---
 .../component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java | 2 --
 .../apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java   | 2 --
 .../org/apache/camel/component/cxf/CxfProducerOperationTest.java  | 3 ---
 .../apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java | 3 ---
 .../test/java/org/apache/camel/component/cxf/CxfProducerTest.java | 3 ---
 .../org/apache/camel/component/cxf/DefaultCxfBindingTest.java     | 3 ---
 .../camel/component/cxf/LoggingInterceptorInMessageModeTest.java  | 4 ----
 .../java/org/apache/camel/component/cxf/ServiceClassRefTest.java  | 2 --
 .../component/cxf/converter/CxfPayLoadStreamCacheRouterTest.java  | 2 --
 .../apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java | 1 -
 .../component/cxf/jaxrs/simplebinding/testbean/Customer.java      | 4 ----
 .../component/cxf/jaxrs/simplebinding/testbean/CustomerList.java  | 4 ----
 .../camel/component/cxf/jaxrs/simplebinding/testbean/Order.java   | 4 ----
 .../camel/component/cxf/jaxrs/simplebinding/testbean/Product.java | 4 ----
 .../org/apache/camel/component/cxf/jaxrs/testbean/Customer.java   | 4 ----
 .../camel/component/cxf/jaxrs/testbean/CustomerService.java       | 4 ----
 .../java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java | 4 ----
 .../org/apache/camel/component/cxf/jaxrs/testbean/Product.java    | 4 ----
 .../camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java  | 6 ++----
 .../cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java          | 8 +++-----
 .../cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java          | 1 -
 .../apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java  | 2 --
 .../camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java  | 6 ++----
 .../camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test.java  | 2 --
 .../camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java    | 2 --
 .../test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java  | 1 -
 .../java/org/apache/camel/component/cxf/mtom/HelloImpl12.java     | 1 -
 .../java/org/apache/camel/component/cxf/mtom/MtomTestHelper.java  | 2 --
 .../component/cxf/soap/headers/CxfMessageHeadersRelayTest.java    | 2 --
 .../camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java    | 2 --
 .../component/cxf/spring/FileToCxfMessageDataFormatTest.java      | 3 ---
 .../java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java | 4 ----
 .../test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java   | 4 ----
 .../camel/component/cxf/wssecurity/client/UTPasswordCallback.java | 2 --
 .../camel/component/cxf/wssecurity/server/UTPasswordCallback.java | 2 --
 .../java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java     | 2 --
 .../disruptor/DirectRequestReplyAndDisruptorInOnlyTest.java       | 3 ---
 .../camel/component/disruptor/DisruptorComplexInOutTest.java      | 3 ---
 .../disruptor/DisruptorConcurrentConsumersNPEIssueTest.java       | 3 ---
 .../component/disruptor/DisruptorConcurrentConsumersTest.java     | 3 ---
 .../apache/camel/component/disruptor/DisruptorConcurrentTest.java | 3 ---
 .../apache/camel/component/disruptor/DisruptorConfigureTest.java  | 3 ---
 .../camel/component/disruptor/DisruptorInOnlyChainedTest.java     | 3 ---
 .../org/apache/camel/component/disruptor/DisruptorInOnlyTest.java | 3 ---
 .../camel/component/disruptor/DisruptorInOutBigChainedTest.java   | 3 ---
 .../camel/component/disruptor/DisruptorInOutChainedTest.java      | 3 ---
 .../component/disruptor/DisruptorInOutChainedTimeoutTest.java     | 3 ---
 .../disruptor/DisruptorInOutChainedWithOnCompletionTest.java      | 3 ---
 .../org/apache/camel/component/disruptor/DisruptorInOutTest.java  | 3 ---
 .../disruptor/DisruptorInOutWithErrorDeadLetterChannelTest.java   | 3 ---
 .../camel/component/disruptor/DisruptorInOutWithErrorTest.java    | 3 ---
 .../camel/component/disruptor/DisruptorMultipleConsumersTest.java | 3 ---
 .../apache/camel/component/disruptor/DisruptorNoConsumerTest.java | 3 ---
 .../disruptor/DisruptorReconfigureWithBlockingProducer.java       | 3 ---
 .../component/disruptor/DisruptorRemoveRouteThenAddAgainTest.java | 3 ---
 .../apache/camel/component/disruptor/DisruptorRingBufferTest.java | 3 ---
 .../org/apache/camel/component/disruptor/DisruptorRouteTest.java  | 3 ---
 .../camel/component/disruptor/DisruptorTimeoutDisabledTest.java   | 3 ---
 .../apache/camel/component/disruptor/DisruptorTimeoutTest.java    | 3 ---
 .../component/disruptor/DisruptorWaitForTaskAsPropertyTest.java   | 3 ---
 .../component/disruptor/DisruptorWaitForTaskCompleteTest.java     | 3 ---
 .../disruptor/DisruptorWaitForTaskIfReplyExpectedTest.java        | 3 ---
 .../disruptor/DisruptorWaitForTaskNeverOnCompletionTest.java      | 3 ---
 .../camel/component/disruptor/DisruptorWaitForTaskNeverTest.java  | 3 ---
 .../disruptor/FileDisruptorShutdownCompleteAllTasksTest.java      | 3 ---
 .../disruptor/vm/DisruptorVmConcurrentConsumersTest.java          | 3 ---
 .../vm/DisruptorVmDifferentOptionsOnConsumerAndProducerTest.java  | 3 ---
 .../component/disruptor/vm/DisruptorVmInOnlyChainedTest.java      | 3 ---
 .../camel/component/disruptor/vm/DisruptorVmInOnlyTest.java       | 3 ---
 .../camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java | 3 ---
 .../disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java          | 3 ---
 .../apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java | 3 ---
 .../component/disruptor/vm/DisruptorVmInOutWithErrorTest.java     | 3 ---
 .../disruptor/vm/DisruptorVmMultipleContextsStartStopTest.java    | 3 ---
 .../apache/camel/component/disruptor/vm/DisruptorVmQueueTest.java | 3 ---
 .../camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java | 3 ---
 .../camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java | 3 ---
 .../disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java          | 3 ---
 .../disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java   | 3 ---
 .../component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java   | 3 ---
 .../org/apache/camel/component/dozer/example/abc/ABCOrder.java    | 1 -
 .../apache/camel/component/dozer/example/abc/ObjectFactory.java   | 1 -
 .../org/apache/camel/component/dozer/example/xyz/LineItem.java    | 1 -
 .../org/apache/camel/component/dozer/example/xyz/XYZOrder.java    | 1 -
 .../main/java/org/apache/camel/component/ejb/EjbComponent.java    | 2 --
 .../main/java/org/apache/camel/component/ejb/EjbRegistryBean.java | 2 --
 .../java/org/apache/camel/component/ejb/GreaterCamelBeanTest.java | 3 ---
 .../apache/camel/component/ejb/GreaterCamelEjbPropertiesTest.java | 3 ---
 .../java/org/apache/camel/component/ejb/GreaterCamelEjbTest.java  | 3 ---
 .../src/test/java/org/apache/camel/component/ejb/GreaterImpl.java | 3 ---
 .../test/java/org/apache/camel/component/ejb/GreaterLocal.java    | 3 ---
 .../src/test/java/org/apache/camel/component/ejb/GreaterTest.java | 3 ---
 .../org/apache/camel/component/ejb/SpringGreaterCamelEjbTest.java | 3 ---
 .../camel/component/elasticsearch/ElasticsearchOperation.java     | 1 -
 .../org/apache/camel/component/flatpack/FlatpackComponent.java    | 2 --
 .../org/apache/camel/component/flatpack/FlatpackConverter.java    | 3 ---
 .../org/apache/camel/component/flatpack/FlatpackProducer.java     | 3 ---
 .../org/apache/camel/dataformat/flatpack/FlatpackDataFormat.java  | 2 --
 .../java/org/apache/camel/component/flatpack/CharsetTest.java     | 3 ---
 .../camel/component/flatpack/DelimitedErrorWithUnmarshalTest.java | 3 ---
 .../java/org/apache/camel/component/flatpack/DelimitedTest.java   | 3 ---
 .../camel/component/flatpack/DelimitedWithNoDescriptorTest.java   | 3 ---
 .../camel/component/flatpack/DelimitedWithUnmarshalTest.java      | 3 ---
 .../apache/camel/component/flatpack/FixedLengthAllowLongTest.java | 3 ---
 .../component/flatpack/FixedLengthAllowShortAndLongTest.java      | 3 ---
 .../camel/component/flatpack/FixedLengthAllowShortTest.java       | 3 ---
 .../java/org/apache/camel/component/flatpack/FixedLengthTest.java | 3 ---
 .../camel/component/flatpack/FixedLengthWithUnmarshalTest.java    | 3 ---
 .../org/apache/camel/component/flatpack/HeaderAndTrailerTest.java | 3 ---
 .../apache/camel/component/flatpack/InvalidFixedLengthTest.java   | 3 ---
 .../java/org/apache/camel/component/flatpack/NoSplitRowsTest.java | 2 --
 .../org/apache/camel/component/flatpack/StreamedSplitTest.java    | 3 ---
 .../org/apache/camel/component/flatpack/XMLNoSplitRowsTest.java   | 2 --
 .../org/apache/camel/component/flatpack/XMLSplitRowsTest.java     | 2 --
 .../component/freemarker/FreemarkerBodyAsDomainObjectTest.java    | 2 --
 .../camel/component/freemarker/FreemarkerConcurrentTest.java      | 3 ---
 .../camel/component/freemarker/FreemarkerSetHeaderTest.java       | 3 ---
 .../component/freemarker/FreemarkerTemplateInHeaderTest.java      | 3 ---
 .../org/apache/camel/component/file/remote/FtpsComponent.java     | 2 --
 .../org/apache/camel/component/file/remote/FtpsConfiguration.java | 2 --
 .../org/apache/camel/component/file/remote/FtpsOperations.java    | 2 --
 .../file/remote/RemoteFilePollingConsumerPollStrategy.java        | 2 --
 .../file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java      | 2 --
 .../file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java   | 2 --
 .../file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java      | 2 --
 .../file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java   | 2 --
 .../file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java      | 2 --
 .../file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java   | 2 --
 .../file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java      | 2 --
 .../file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java   | 2 --
 .../FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java       | 2 --
 .../file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java | 2 --
 .../file/remote/FileToFtpsWithDefaultSettingsIPV6Test.java        | 2 --
 .../component/file/remote/FileToFtpsWithDefaultSettingsTest.java  | 2 --
 .../file/remote/FileToFtpsWithFtpClientConfigRefTest.java         | 2 --
 .../component/file/remote/FromFilePercentSignInPasswordTest.java  | 3 ---
 .../remote/FromFilePercentSignInPasswordUserInfoEncodedTest.java  | 3 ---
 .../file/remote/FromFilePercentSignInPasswordUserInfoTest.java    | 3 ---
 .../file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java   | 3 ---
 .../camel/component/file/remote/FromFileToFtpDeleteTest.java      | 3 ---
 .../camel/component/file/remote/FromFileToFtpNotStepwiseTest.java | 3 ---
 .../org/apache/camel/component/file/remote/FromFileToFtpTest.java | 3 ---
 .../component/file/remote/FromFileTransferLoggingLevelTest.java   | 3 ---
 .../file/remote/FromFileTransferLoggingLevelVerboseTest.java      | 3 ---
 .../camel/component/file/remote/FromFtpActivePortRangeTest.java   | 3 ---
 .../camel/component/file/remote/FromFtpClientConfigRefTest.java   | 3 ---
 .../camel/component/file/remote/FromFtpClientDataTimeoutTest.java | 3 ---
 .../camel/component/file/remote/FromFtpClientSoTimeout2Test.java  | 3 ---
 .../camel/component/file/remote/FromFtpClientSoTimeoutTest.java   | 3 ---
 .../file/remote/FromFtpDoNotDeleteFileIfProcessFailsTest.java     | 3 ---
 ...romFtpNoEndpointPathRelativeMoveToAbsoluteNotStepwiseTest.java | 3 ---
 .../remote/FromFtpNoEndpointPathRelativeMoveToAbsoluteTest.java   | 3 ---
 .../camel/component/file/remote/FromFtpPassiveModeTest.java       | 3 ---
 .../file/remote/FromFtpRecursiveNoopNotStepwiseTest.java          | 3 ---
 .../camel/component/file/remote/FromFtpRecursiveNoopTest.java     | 3 ---
 .../file/remote/FromFtpServerLanguageCodeAndTimeoutTest.java      | 3 ---
 .../component/file/remote/FromFtpServerLanguageCodeTest.java      | 3 ---
 ...SimpleNoEndpointPathRelativeMoveToAbsoluteNotStepwiseTest.java | 3 ---
 .../FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java    | 3 ---
 ...SimpleNoEndpointPathRelativeMoveToRelativeNotStepwiseTest.java | 3 ---
 .../FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java    | 3 ---
 .../FromFtpSimpleRelativeMoveToAbsoluteNotStepwiseTest.java       | 3 ---
 .../file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java      | 3 ---
 .../FromFtpSimpleRelativeMoveToRelativeNotStepwiseTest.java       | 3 ---
 .../file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java      | 3 ---
 .../file/remote/FromFtpSimulateNetworkIssueRecoverTest.java       | 2 --
 .../camel/component/file/remote/FromFtpThirdPoolOkTest.java       | 3 ---
 .../org/apache/camel/component/file/remote/FromFtpToMockTest.java | 3 ---
 .../camel/component/file/remote/FtpBrowsableEndpointTest.java     | 3 ---
 .../apache/camel/component/file/remote/FtpConnectTimeoutTest.java | 3 ---
 .../camel/component/file/remote/FtpConsumerAbsolutePathTest.java  | 3 ---
 .../camel/component/file/remote/FtpConsumerAsyncStressTest.java   | 3 ---
 .../camel/component/file/remote/FtpConsumerAutoCreateTest.java    | 3 ---
 .../camel/component/file/remote/FtpConsumerBodyAsStringTest.java  | 3 ---
 .../file/remote/FtpConsumerDoneFileNameFixedStepwiseTest.java     | 3 ---
 .../component/file/remote/FtpConsumerDoneFileNameFixedTest.java   | 3 ---
 .../file/remote/FtpConsumerDoneFileNameStepwiseTest.java          | 3 ---
 .../camel/component/file/remote/FtpConsumerDoneFileNameTest.java  | 3 ---
 .../component/file/remote/FtpConsumerDualDoneFileNameTest.java    | 3 ---
 .../camel/component/file/remote/FtpConsumerFileSplitTest.java     | 3 ---
 .../component/file/remote/FtpConsumerIPV6BodyAsStringTest.java    | 3 ---
 .../remote/FtpConsumerLocalWorkDirectoryAsAbsolutePathTest.java   | 3 ---
 .../file/remote/FtpConsumerLocalWorkDirectoryDirectTest.java      | 3 ---
 .../component/file/remote/FtpConsumerLocalWorkDirectoryTest.java  | 3 ---
 .../remote/FtpConsumerLocalWorkDirectoryWorkOnPayloadTest.java    | 3 ---
 .../component/file/remote/FtpConsumerMaxMessagesPerPollTest.java  | 3 ---
 .../component/file/remote/FtpConsumerMultipleDirectoriesTest.java | 3 ---
 .../file/remote/FtpConsumerNotEagerMaxMessagesPerPollTest.java    | 3 ---
 .../component/file/remote/FtpConsumerResumeDownloadTest.java      | 3 ---
 .../component/file/remote/FtpConsumerWithNoFileOptionTest.java    | 2 --
 .../file/remote/FtpNoReconnectAttemptUnknownHostTest.java         | 3 ---
 .../camel/component/file/remote/FtpProducerConcurrentTest.java    | 2 --
 .../camel/component/file/remote/FtpProducerDoneFileNameTest.java  | 3 ---
 .../file/remote/FtpProducerFileExistAppendNoFileBeforeTest.java   | 3 ---
 .../component/file/remote/FtpProducerFileExistAppendTest.java     | 3 ---
 .../camel/component/file/remote/FtpProducerFileExistFailTest.java | 3 ---
 .../component/file/remote/FtpProducerFileExistIgnoreTest.java     | 3 ---
 .../file/remote/FtpProducerFileExistOverrideNoFileBeforeTest.java | 3 ---
 ...cerFileExistOverrideNotEagerDeleteTargetFileTwoUploadTest.java | 3 ---
 .../component/file/remote/FtpProducerFileExistOverrideTest.java   | 3 ---
 .../file/remote/FtpProducerFileExistOverrideTwoUploadTest.java    | 3 ---
 .../component/file/remote/FtpProducerFileFastExistFailTest.java   | 3 ---
 .../component/file/remote/FtpProducerRootFileExistFailTest.java   | 3 ---
 .../component/file/remote/FtpProducerTempFileExistIssueTest.java  | 3 ---
 .../file/remote/FtpReconnectAttemptServerStoppedTest.java         | 3 ---
 .../component/file/remote/FtpReconnectAttemptUnknownHostTest.java | 3 ---
 .../camel/component/file/remote/FtpRecursiveDepth2Test.java       | 3 ---
 .../camel/component/file/remote/FtpRecursiveDepth3Test.java       | 3 ---
 .../apache/camel/component/file/remote/FtpRecursiveDepthTest.java | 3 ---
 .../camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java | 3 ---
 ...impleConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest.java | 3 ---
 .../file/remote/FtpSimpleConsumeStreamingPartialReadTest.java     | 3 ---
 .../component/file/remote/FtpSimpleConsumeStreamingTest.java      | 3 ---
 .../remote/FtpSimpleConsumeStreamingWithMultipleFilesTest.java    | 3 ---
 .../remote/FtpsServerExplicitSSLWithClientAuthTestSupport.java    | 2 --
 .../remote/FtpsServerExplicitSSLWithoutClientAuthTestSupport.java | 2 --
 .../remote/FtpsServerExplicitTLSWithClientAuthTestSupport.java    | 2 --
 .../remote/FtpsServerExplicitTLSWithoutClientAuthTestSupport.java | 2 --
 .../remote/FtpsServerImplicitSSLWithClientAuthTestSupport.java    | 2 --
 .../remote/FtpsServerImplicitSSLWithoutClientAuthTestSupport.java | 2 --
 .../remote/FtpsServerImplicitTLSWithClientAuthTestSupport.java    | 2 --
 .../remote/FtpsServerImplicitTLSWithoutClientAuthTestSupport.java | 2 --
 .../apache/camel/component/file/remote/FtpsServerTestSupport.java | 2 --
 .../file/remote/RecipientListErrorHandlingIssueTest.java          | 3 ---
 .../apache/camel/component/file/remote/UriConfigurationTest.java  | 3 ---
 .../apache/camel/component/file/remote/sftp/SftpChmodTest.java    | 3 ---
 .../camel/component/file/remote/sftp/SftpConsumeTemplateTest.java | 3 ---
 .../component/file/remote/sftp/SftpConsumerAutoCreateTest.java    | 3 ---
 .../camel/component/file/remote/sftp/SftpProduceTempFileTest.java | 3 ---
 .../file/remote/sftp/SftpProducerFileWithPathNoStepwiseTest.java  | 3 ---
 .../component/file/remote/sftp/SftpProducerFileWithPathTest.java  | 3 ---
 .../camel/component/file/remote/sftp/SftpServerTestSupport.java   | 3 ---
 .../camel/component/file/remote/sftp/SftpSetCipherTest.java       | 3 ---
 .../file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java        | 3 ---
 .../remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java    | 3 ---
 .../file/remote/sftp/SftpSimpleConsumeRecursiveTest.java          | 3 ---
 .../remote/sftp/SftpSimpleConsumeStreamingPartialReadTest.java    | 2 --
 .../file/remote/sftp/SftpSimpleConsumeStreamingTest.java          | 3 ---
 .../sftp/SftpSimpleConsumeStreamingWithMultipleFilesTest.java     | 3 ---
 .../camel/component/file/remote/sftp/SftpSimpleConsumeTest.java   | 3 ---
 .../component/file/remote/sftp/SftpSimpleIPV6ConsumeTest.java     | 3 ---
 .../file/remote/sftp/SftpSimpleProduceDisconnectTest.java         | 3 ---
 .../file/remote/sftp/SftpSimpleProduceNotStepwiseTest.java        | 3 ---
 .../camel/component/file/remote/sftp/SftpSimpleProduceTest.java   | 3 ---
 .../camel/component/geocoder/http/AuthenticationMethod.java       | 2 --
 .../java/org/apache/camel/language/groovy/GroovyExpression.java   | 3 ---
 .../java/org/apache/camel/language/groovy/GroovyLanguage.java     | 3 ---
 .../org/apache/camel/language/groovy/GroovyExpressionTest.java    | 3 ---
 .../org/apache/camel/language/groovy/GroovyInvokeMethodTest.java  | 3 ---
 .../java/org/apache/camel/language/groovy/GroovyLanguageTest.java | 3 ---
 .../apache/camel/language/groovy/GroovySetFixedHeaderTest.java    | 3 ---
 .../org/apache/camel/language/groovy/GroovySetHeaderTest.java     | 3 ---
 .../org/apache/camel/language/groovy/LanguageGroovyRouteTest.java | 3 ---
 .../java/org/apache/camel/processor/groovy/GroovyFilterTest.java  | 3 ---
 .../org/apache/camel/processor/groovy/GroovySumFilterTest.java    | 3 ---
 .../apache/camel/processor/groovy/InlinedGroovyScriptTest.java    | 3 ---
 .../java/org/apache/camel/component/gson/GsonConcurrentTest.java  | 3 ---
 .../apache/camel/component/gson/SpringGsonJsonDataFormatTest.java | 3 ---
 .../component/hazelcast/HazelcastSedaConcurrentConsumersTest.java | 1 -
 .../java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java | 3 ---
 .../src/main/java/org/apache/camel/http/common/HttpMessage.java   | 3 ---
 .../org/apache/camel/component/http4/HttpClientConfigurer.java    | 2 --
 .../main/java/org/apache/camel/component/http4/HttpComponent.java | 2 --
 .../main/java/org/apache/camel/component/http4/HttpConstants.java | 3 ---
 .../org/apache/camel/component/http4/HttpPollingConsumer.java     | 2 --
 .../main/java/org/apache/camel/component/http4/HttpProducer.java  | 3 ---
 .../test/java/org/apache/camel/component/http4/BaseHttpTest.java  | 4 ----
 .../test/java/org/apache/camel/component/http4/BaseHttpsTest.java | 4 ----
 .../org/apache/camel/component/http4/HttpAuthenticationTest.java  | 4 ----
 .../test/java/org/apache/camel/component/http4/HttpBodyTest.java  | 4 ----
 .../org/apache/camel/component/http4/HttpBridgeEndpointTest.java  | 4 ----
 .../org/apache/camel/component/http4/HttpCamelHeadersTest.java    | 4 ----
 .../java/org/apache/camel/component/http4/HttpCharsetTest.java    | 4 ----
 .../apache/camel/component/http4/HttpClientConfigurerTest.java    | 3 ---
 .../org/apache/camel/component/http4/HttpCompressionTest.java     | 4 ----
 .../java/org/apache/camel/component/http4/HttpConcurrentTest.java | 3 ---
 .../apache/camel/component/http4/HttpDefaultPortNumberTest.java   | 3 ---
 .../apache/camel/component/http4/HttpDisableStreamCacheTest.java  | 4 ----
 .../http4/HttpEndpointOptionsNotChangeComponentTest.java          | 2 --
 .../camel/component/http4/HttpHeaderFilterStrategyTest.java       | 3 ---
 .../camel/component/http4/HttpInvalidConfigurationTest.java       | 2 --
 .../component/http4/HttpInvalidHttpClientConfigurationTest.java   | 2 --
 .../java/org/apache/camel/component/http4/HttpMethodsTest.java    | 4 ----
 .../camel/component/http4/HttpNoConnectionRedeliveryTest.java     | 3 ---
 .../org/apache/camel/component/http4/HttpNoConnectionTest.java    | 3 ---
 .../test/java/org/apache/camel/component/http4/HttpPathTest.java  | 4 ----
 .../org/apache/camel/component/http4/HttpPollingConsumerTest.java | 4 ----
 .../camel/component/http4/HttpProducerConnectionCloseTest.java    | 2 --
 .../component/http4/HttpProducerExplicitConnectionCloseTest.java  | 2 --
 .../camel/component/http4/HttpProducerSelectMethodTest.java       | 2 --
 .../component/http4/HttpProducerWithSystemPropertiesTest.java     | 4 ----
 .../org/apache/camel/component/http4/HttpProxyServerTest.java     | 4 ----
 .../test/java/org/apache/camel/component/http4/HttpQueryTest.java | 4 ----
 .../apache/camel/component/http4/HttpReferenceParameterTest.java  | 2 --
 .../java/org/apache/camel/component/http4/HttpSOTimeoutTest.java  | 4 ----
 .../org/apache/camel/component/http4/HttpServerTestSupport.java   | 2 --
 .../camel/component/http4/HttpThrowExceptionOnFailureTest.java    | 4 ----
 .../apache/camel/component/http4/HttpWithHttpUriHeaderTest.java   | 4 ----
 .../org/apache/camel/component/http4/HttpsAuthenticationTest.java | 4 ----
 .../test/java/org/apache/camel/component/http4/HttpsGetTest.java  | 4 ----
 .../org/apache/camel/component/http4/HttpsServerTestSupport.java  | 4 ----
 .../component/http4/handler/AuthenticationValidationHandler.java  | 4 ----
 .../camel/component/http4/handler/BasicValidationHandler.java     | 4 ----
 .../camel/component/http4/handler/DelayValidationHandler.java     | 4 ----
 .../camel/component/http4/handler/HeaderValidationHandler.java    | 4 ----
 .../http4/handler/ProxyAuthenticationValidationHandler.java       | 4 ----
 .../main/java/org/apache/camel/component/irc/IrcComponent.java    | 2 --
 .../src/main/java/org/apache/camel/component/irc/IrcLogger.java   | 2 --
 .../test/java/org/apache/camel/component/irc/CodehausIrcChat.java | 3 ---
 .../org/apache/camel/component/irc/IrcMultiChannelRouteTest.java  | 3 ---
 .../test/java/org/apache/camel/component/irc/IrcOnReplyTest.java  | 3 ---
 .../test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java  | 3 ---
 .../test/java/org/apache/camel/component/irc/IrcRouteTest.java    | 3 ---
 .../org/apache/camel/component/jackson/JacksonConcurrentTest.java | 3 ---
 .../camel/component/jackson/SpringJacksonEnableFeatureTest.java   | 3 ---
 .../camel/component/jackson/SpringJacksonJsonDataFormatTest.java  | 3 ---
 .../component/jackson/SpringJacksonMarshalUnmarshalListTest.java  | 3 ---
 .../apache/camel/component/jacksonxml/JacksonConcurrentTest.java  | 3 ---
 .../component/jacksonxml/SpringJacksonEnableFeatureTest.java      | 3 ---
 .../component/jacksonxml/SpringJacksonJsonDataFormatTest.java     | 3 ---
 .../jacksonxml/SpringJacksonMarshalUnmarshalListTest.java         | 3 ---
 .../src/main/java/org/apache/camel/component/jasypt/Main.java     | 3 ---
 .../camel/component/jasypt/BlueprintJasyptProperties2Test.java    | 3 ---
 .../camel/component/jasypt/BlueprintJasyptProperties3Test.java    | 3 ---
 .../camel/component/jasypt/BlueprintJasyptPropertiesTest.java     | 3 ---
 .../org/apache/camel/component/jasypt/JasyptPropertiesTest.java   | 3 ---
 .../src/test/java/org/apache/camel/component/jasypt/MainTest.java | 3 ---
 .../jasypt/SpringJasyptBridgePropertiesAutowireTest.java          | 3 ---
 .../camel/component/jasypt/SpringJasyptBridgePropertiesTest.java  | 3 ---
 .../camel/component/jasypt/SpringJasyptProperties2Test.java       | 3 ---
 .../apache/camel/component/jasypt/SpringJasyptPropertiesTest.java | 3 ---
 .../org/apache/camel/converter/jaxb/FallbackTypeConverter.java    | 3 ---
 .../main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java | 2 --
 .../java/org/apache/camel/converter/jaxb/NonXmlCharFilterer.java  | 1 -
 .../java/org/apache/camel/converter/jaxb/address/Address.java     | 1 -
 .../org/apache/camel/converter/jaxb/address/ObjectFactory.java    | 1 -
 .../org/apache/camel/converter/jaxb/person/ObjectFactory.java     | 1 -
 .../test/java/org/apache/camel/converter/jaxb/person/Person.java  | 1 -
 .../java/org/apache/camel/example/DataFormatComponentTest.java    | 3 ---
 .../java/org/apache/camel/example/DataFormatConcurrentTest.java   | 3 ---
 .../test/java/org/apache/camel/example/DataFormatDataSetTest.java | 3 ---
 .../src/test/java/org/apache/camel/example/DataFormatTest.java    | 3 ---
 .../camel/example/ExplicitEncodingAndXMLCharFilteringTest.java    | 3 ---
 .../java/org/apache/camel/example/ExplicitFileEncodingTest.java   | 3 ---
 .../test/java/org/apache/camel/example/InvalidOrderException.java | 3 ---
 .../src/test/java/org/apache/camel/example/JAXBConvertTest.java   | 3 ---
 .../org/apache/camel/example/JaxbConcurrentDataFormatTest.java    | 3 ---
 .../src/test/java/org/apache/camel/example/PurchaseOrder.java     | 3 ---
 .../java/org/apache/camel/example/RouteWithErrorHandlerTest.java  | 3 ---
 .../test/java/org/apache/camel/example/SpringDataFormatTest.java  | 3 ---
 .../apache/camel/example/SpringDataFormatWithEncodingTest.java    | 3 ---
 .../SpringDataFormatWithMarshalAndUnmarshalUsingRefTest.java      | 3 ---
 ...pringDataFormatWithMarshalAndUnmarshalUsingSpringBeanTest.java | 3 ---
 .../src/test/java/org/apache/camel/example/UnmarshalTest.java     | 3 ---
 .../src/test/java/org/apache/camel/foo/bar/ObjectFactory.java     | 1 -
 .../src/test/java/org/apache/camel/foo/bar/PersonType.java        | 1 -
 .../src/main/java/org/apache/camel/component/jcr/JcrConsumer.java | 2 --
 .../component/jcr/JcrRouteDifferentWorkspaceTestSupport.java      | 1 -
 .../java/org/apache/camel/component/jcr/JcrRouteTestSupport.java  | 2 --
 .../main/java/org/apache/camel/component/jdbc/JdbcComponent.java  | 3 ---
 .../main/java/org/apache/camel/component/jdbc/JdbcProducer.java   | 3 ---
 .../test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java  | 1 -
 .../apache/camel/component/jetty/CamelContinuationServlet.java    | 2 --
 .../org/apache/camel/component/jetty/DefaultJettyHttpBinding.java | 3 ---
 .../java/org/apache/camel/component/jetty/JettyConverter.java     | 3 ---
 .../java/org/apache/camel/component/jetty/JettyHttpBinding.java   | 2 --
 .../java/org/apache/camel/component/jetty/JettyHttpComponent.java | 2 --
 .../java/org/apache/camel/component/jetty/JettyHttpEndpoint.java  | 3 ---
 .../java/org/apache/camel/component/jetty/JettyHttpProducer.java  | 3 ---
 .../camel/component/jetty/ConvertPayloadToInputStreamTest.java    | 3 ---
 .../apache/camel/component/jetty/HttpAuthMethodPriorityTest.java  | 3 ---
 .../component/jetty/HttpBasicAuthComponentConfiguredTest.java     | 3 ---
 .../java/org/apache/camel/component/jetty/HttpBasicAuthTest.java  | 3 ---
 .../java/org/apache/camel/component/jetty/HttpConverterTest.java  | 3 ---
 .../apache/camel/component/jetty/HttpFilterCamelHeadersTest.java  | 3 ---
 .../camel/component/jetty/HttpFilterNoCamelHeadersTest.java       | 3 ---
 .../component/jetty/HttpOperationsFailedExceptionUriTest.java     | 3 ---
 .../org/apache/camel/component/jetty/HttpPollingConsumerTest.java | 3 ---
 .../org/apache/camel/component/jetty/HttpProducerByteTest.java    | 3 ---
 .../apache/camel/component/jetty/HttpProducerConcurrentTest.java  | 2 --
 .../camel/component/jetty/HttpProducerConnectionCloseTest.java    | 3 ---
 .../camel/component/jetty/HttpProducerJMXBeansIssueTest.java      | 3 ---
 .../camel/component/jetty/HttpProducerOkStatusCodeRangeTest.java  | 3 ---
 .../apache/camel/component/jetty/HttpProducerQueryParamTest.java  | 3 ---
 .../apache/camel/component/jetty/HttpProducerSOTimeoutTest.java   | 2 --
 .../apache/camel/component/jetty/HttpRedirectNoLocationTest.java  | 3 ---
 .../java/org/apache/camel/component/jetty/HttpRedirectTest.java   | 3 ---
 .../jetty/HttpReturnDataNotInputStreamConvertableTest.java        | 3 ---
 .../org/apache/camel/component/jetty/HttpReturnFaultTest.java     | 3 ---
 .../test/java/org/apache/camel/component/jetty/HttpRouteTest.java | 3 ---
 .../java/org/apache/camel/component/jetty/HttpSendFileTest.java   | 3 ---
 .../camel/component/jetty/HttpStreamCacheFileIssueTest.java       | 3 ---
 .../camel/component/jetty/HttpStreamCacheFileResponseTest.java    | 3 ---
 .../camel/component/jetty/HttpStreamCacheFileStopIssueTest.java   | 3 ---
 .../org/apache/camel/component/jetty/HttpStreamCacheFileTest.java | 3 ---
 .../org/apache/camel/component/jetty/HttpTwoEndpointTest.java     | 3 ---
 .../org/apache/camel/component/jetty/HttpTwoServerPortsTest.java  | 3 ---
 .../camel/component/jetty/JettyCallHttpThenExceptionTest.java     | 3 ---
 .../camel/component/jetty/JettyContinuationDisabledTest.java      | 3 ---
 .../component/jetty/JettyEndpointContinuationDisabledTest.java    | 3 ---
 .../java/org/apache/camel/component/jetty/JettyHandle404Test.java | 2 --
 .../apache/camel/component/jetty/JettyOnExceptionHandledTest.java | 3 ---
 .../org/apache/camel/component/jetty/JettySessionSupportTest.java | 3 ---
 .../camel/component/jetty/JettySimplifiedHandle404Test.java       | 2 --
 .../org/apache/camel/component/jetty/JettySimulateInOnlyTest.java | 3 ---
 .../org/apache/camel/component/jetty/JettySuspendResumeTest.java  | 3 ---
 .../java/org/apache/camel/component/jetty/JettySuspendTest.java   | 3 ---
 .../camel/component/jetty/JettySuspendWhileInProgressTest.java    | 3 ---
 .../apache/camel/component/jetty/MultiThreadedHttpGetTest.java    | 3 ---
 .../component/jetty/SpringJettyNoConnectionRedeliveryTest.java    | 3 ---
 .../apache/camel/component/jetty/SpringJettyNoConnectionTest.java | 3 ---
 .../org/apache/camel/component/jetty/async/JettyAsyncCBRTest.java | 3 ---
 .../component/jetty/async/JettyAsyncContinuationDisabledTest.java | 3 ---
 .../jetty/async/JettyAsyncContinuationTimeoutOkTest.java          | 3 ---
 .../component/jetty/async/JettyAsyncContinuationTimeoutTest.java  | 3 ---
 .../jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java     | 3 ---
 .../apache/camel/component/jetty/async/JettyAsyncFilterTest.java  | 3 ---
 .../org/apache/camel/component/jetty/async/JettyAsyncTest.java    | 3 ---
 .../camel/component/jetty/async/JettyAsyncThrottleTest.java       | 2 --
 .../camel/component/jetty/async/JettyAsyncTransformTest.java      | 3 ---
 .../component/jetty/async/JettyAsyncTryCatchFinallyTest.java      | 3 ---
 .../org/apache/camel/component/jetty/async/MyAsyncComponent.java  | 3 ---
 .../org/apache/camel/component/jetty/async/MyAsyncEndpoint.java   | 3 ---
 .../org/apache/camel/component/jetty/async/MyAsyncProducer.java   | 3 ---
 .../apache/camel/component/jetty/javabody/HttpJavaBodyTest.java   | 3 ---
 .../org/apache/camel/component/jetty/javabody/MyCoolBean.java     | 3 ---
 .../HttpJettyProducerRecipientListCustomThreadPoolTest.java       | 3 ---
 .../jetty/jettyproducer/HttpJettyProducerRecipientListTest.java   | 3 ---
 .../jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java     | 3 ---
 .../jetty/jettyproducer/JettyHttpProderReturnFaultTest.java       | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java    | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java    | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerConcurrentTest.java      | 2 --
 .../JettyHttpProducerContentTypeEncodingInQuoteTest.java          | 3 ---
 .../jettyproducer/JettyHttpProducerGoogleAsynchronousTest.java    | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerGoogleTest.java          | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerJavaBodyTest.java        | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerPutContentTest.java      | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerQueryParamTest.java      | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerRedirectTest.java        | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerSendFileTest.java        | 3 ---
 .../jettyproducer/JettyHttpProducerSimulate404ErrorTest.java      | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java   | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerSuspendTest.java         | 3 ---
 .../JettyHttpProducerSuspendWhileInProgressTest.java              | 3 ---
 .../jettyproducer/JettyHttpProducerSynchronousFalseTest.java      | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerSynchronousTest.java     | 3 ---
 .../jetty/jettyproducer/JettyHttpProducerTimeoutTest.java         | 3 ---
 .../jettyproducer/JettyHttpProducerTransferExceptionTest.java     | 3 ---
 .../component/jetty/jettyproducer/JettyProducerHandle404Test.java | 2 --
 .../apache/camel/component/jetty/jettyproducer/MyCoolBean.java    | 3 ---
 .../java/org/apache/camel/component/jetty/manual/JettyManual.java | 2 --
 .../apache/camel/component/jetty/proxy/HttpClientProxyTest.java   | 3 ---
 .../jetty/proxy/HttpClientProxyTransferExceptionTest.java         | 3 ---
 .../org/apache/camel/component/jetty/proxy/MyAppException.java    | 3 ---
 .../org/apache/camel/component/jetty/proxy/MyCoolService.java     | 3 ---
 .../org/apache/camel/component/jetty/proxy/MyCoolServiceBean.java | 3 ---
 .../apache/camel/dataformat/jibx/JibxDataFormatMarshallTest.java  | 3 ---
 .../jibx/JibxDataFormatMarshallWithBindingNameTest.java           | 3 ---
 .../org/apache/camel/dataformat/jibx/model/PurchaseOrder.java     | 3 ---
 .../org/apache/camel/dataformat/jibx/model/PurchaseOrder2.java    | 3 ---
 .../org/apache/camel/component/validator/jing/JingComponent.java  | 2 --
 .../org/apache/camel/component/validator/jing/JingValidator.java  | 2 --
 .../org/apache/camel/component/validator/jing/RNCRouteTest.java   | 3 ---
 .../org/apache/camel/component/validator/jing/RNGRouteTest.java   | 3 ---
 .../main/java/org/apache/camel/component/jms/ConsumerType.java    | 3 ---
 .../apache/camel/component/jms/DefaultJmsKeyFormatStrategy.java   | 2 --
 .../camel/component/jms/DefaultJmsMessageListenerContainer.java   | 2 --
 .../apache/camel/component/jms/DefaultQueueBrowseStrategy.java    | 2 --
 .../java/org/apache/camel/component/jms/DestinationEndpoint.java  | 2 --
 .../org/apache/camel/component/jms/EndpointMessageListener.java   | 2 --
 .../src/main/java/org/apache/camel/component/jms/JmsBinding.java  | 2 --
 .../main/java/org/apache/camel/component/jms/JmsComponent.java    | 2 --
 .../java/org/apache/camel/component/jms/JmsConfiguration.java     | 3 ---
 .../src/main/java/org/apache/camel/component/jms/JmsConsumer.java | 2 --
 .../org/apache/camel/component/jms/JmsHeaderFilterStrategy.java   | 3 ---
 .../java/org/apache/camel/component/jms/JmsKeyFormatStrategy.java | 2 --
 .../src/main/java/org/apache/camel/component/jms/JmsMessage.java  | 2 --
 .../java/org/apache/camel/component/jms/JmsMessageHelper.java     | 2 --
 .../main/java/org/apache/camel/component/jms/JmsMessageType.java  | 2 --
 .../src/main/java/org/apache/camel/component/jms/JmsProducer.java | 3 ---
 .../java/org/apache/camel/component/jms/JmsProviderMetadata.java  | 2 --
 .../java/org/apache/camel/component/jms/JmsQueueEndpoint.java     | 2 --
 .../org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java | 2 --
 .../org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java | 2 --
 .../java/org/apache/camel/component/jms/MessageSentCallback.java  | 2 --
 .../camel/component/jms/PassThroughJmsKeyFormatStrategy.java      | 2 --
 .../java/org/apache/camel/component/jms/QueueBrowseStrategy.java  | 3 ---
 .../src/main/java/org/apache/camel/component/jms/ReplyToType.java | 2 --
 .../camel/component/jms/SimpleJmsMessageListenerContainer.java    | 2 --
 .../apache/camel/component/jms/reply/CorrelationTimeoutMap.java   | 2 --
 .../org/apache/camel/component/jms/reply/QueueReplyHandler.java   | 2 --
 .../org/apache/camel/component/jms/reply/QueueReplyManager.java   | 2 --
 .../java/org/apache/camel/component/jms/reply/ReplyHandler.java   | 2 --
 .../java/org/apache/camel/component/jms/reply/ReplyHolder.java    | 2 --
 .../java/org/apache/camel/component/jms/reply/ReplyManager.java   | 2 --
 .../org/apache/camel/component/jms/reply/ReplyManagerSupport.java | 2 --
 .../camel/component/jms/reply/TemporaryQueueReplyHandler.java     | 2 --
 .../camel/component/jms/reply/TemporaryQueueReplyManager.java     | 2 --
 .../jms/reply/UseMessageIdAsCorrelationIdMessageSentCallback.java | 2 --
 .../camel/component/jms/ActiveMQOriginalDestinationTest.java      | 3 ---
 .../java/org/apache/camel/component/jms/BrowsableQueueTest.java   | 3 ---
 .../java/org/apache/camel/component/jms/CamelJmsTestHelper.java   | 2 --
 .../apache/camel/component/jms/ConsumeJmsBytesMessageTest.java    | 3 ---
 .../org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java  | 3 ---
 .../apache/camel/component/jms/ConsumeJmsObjectMessageTest.java   | 3 ---
 .../apache/camel/component/jms/ConsumeMessageConverterTest.java   | 3 ---
 .../camel/component/jms/ConsumerTemplateJmsSelectorTest.java      | 3 ---
 .../component/jms/DefaultJmsHeaderKeyFormatStrategyTest.java      | 3 ---
 .../apache/camel/component/jms/JmsAllowAdditionalHeadersTest.java | 3 ---
 .../java/org/apache/camel/component/jms/JmsAutoStartupTest.java   | 3 ---
 .../camel/component/jms/JmsBatchResequencerJMSPriorityTest.java   | 2 --
 .../java/org/apache/camel/component/jms/JmsClientAckTest.java     | 3 ---
 .../java/org/apache/camel/component/jms/JmsComponentTest.java     | 3 ---
 .../org/apache/camel/component/jms/JmsConsumeTemplateTest.java    | 3 ---
 .../jms/JmsConsumerRestartPickupConfigurationChangesTest.java     | 3 ---
 .../camel/component/jms/JmsCustomHeaderFilterStrategyTest.java    | 3 ---
 .../apache/camel/component/jms/JmsDeadLetterChannelInOutTest.java | 3 ---
 .../org/apache/camel/component/jms/JmsDeadLetterQueueTest.java    | 2 --
 .../jms/JmsDeadLetterQueueUsingTransferExchangeTest.java          | 2 --
 .../apache/camel/component/jms/JmsDestinationResolverTest.java    | 3 ---
 .../java/org/apache/camel/component/jms/JmsDurableTopicTest.java  | 3 ---
 .../apache/camel/component/jms/JmsEagerLoadingPropertiesTest.java | 3 ---
 .../apache/camel/component/jms/JmsEndpointConfigurationTest.java  | 3 ---
 .../test/java/org/apache/camel/component/jms/JmsFilterTest.java   | 1 -
 .../org/apache/camel/component/jms/JmsHeaderFilteringTest.java    | 4 ----
 .../camel/component/jms/JmsHeaderFilteringWithSpringTest.java     | 4 ----
 .../camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java       | 3 ---
 .../camel/component/jms/JmsInOnlyWithReplyToAsHeaderTest.java     | 3 ---
 ...InOnlyWithReplyToDisabledButJMSReplyToHeaderPreservedTest.java | 3 ---
 .../camel/component/jms/JmsInOnlyWithReplyToDisabledTest.java     | 3 ---
 .../camel/component/jms/JmsInOnlyWithReplyToHeaderTest.java       | 3 ---
 .../camel/component/jms/JmsInOnlyWithReplyToHeaderTopicTest.java  | 3 ---
 .../camel/component/jms/JmsInOnlyWithReplyToNotPreservedTest.java | 3 ---
 .../org/apache/camel/component/jms/JmsInOnlyWithReplyToTest.java  | 3 ---
 .../apache/camel/component/jms/JmsInOutDisableTimeToLiveTest.java | 3 ---
 .../org/apache/camel/component/jms/JmsInOutNonPersistentTest.java | 3 ---
 .../apache/camel/component/jms/JmsInOutSynchronousFalseTest.java  | 3 ---
 .../org/apache/camel/component/jms/JmsInOutSynchronousTest.java   | 3 ---
 .../camel/component/jms/JmsIncludeAllJMSXPropertiesTest.java      | 4 ----
 .../component/jms/JmsMessageCreatedStrategyComponentTest.java     | 3 ---
 .../component/jms/JmsMessageCreatedStrategyEndpointTest.java      | 3 ---
 .../java/org/apache/camel/component/jms/JmsMessageTypeTest.java   | 3 ---
 .../org/apache/camel/component/jms/JmsMultipleConsumersTest.java  | 3 ---
 .../camel/component/jms/JmsNotIncludeAllJMSXPropertiesTest.java   | 4 ----
 .../jms/JmsOnCompletionAndInterceptAndOnExceptionTest.java        | 3 ---
 .../org/apache/camel/component/jms/JmsPollingConsumerTest.java    | 3 ---
 .../apache/camel/component/jms/JmsProducerDisableReplyToTest.java | 3 ---
 .../apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java  | 3 ---
 .../org/apache/camel/component/jms/JmsProduerConcurrentTest.java  | 3 ---
 .../camel/component/jms/JmsProduerConcurrentWithReplyTest.java    | 3 ---
 .../test/java/org/apache/camel/component/jms/JmsQosRouteTest.java | 3 ---
 .../java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java  | 3 ---
 .../jms/JmsRequestReplyExclusiveReplyToComponentTest.java         | 2 --
 .../jms/JmsRequestReplyExclusiveReplyToConcurrentTest.java        | 3 ---
 .../jms/JmsRequestReplyExclusiveReplyToRemoveAddRouteTest.java    | 3 ---
 .../camel/component/jms/JmsRequestReplyExclusiveReplyToTest.java  | 2 --
 .../component/jms/JmsRequestReplyFixedReplyToInEndpointTest.java  | 3 ---
 .../camel/component/jms/JmsRequestReplyManualReplyTest.java       | 3 ---
 .../component/jms/JmsRequestReplyManualWithJMSReplyToTest.java    | 3 ---
 .../JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java  | 3 ---
 .../camel/component/jms/JmsRequestReplySharedReplyToTest.java     | 3 ---
 .../org/apache/camel/component/jms/JmsRouteRequestReplyTest.java  | 3 ---
 .../test/java/org/apache/camel/component/jms/JmsRouteTest.java    | 3 ---
 .../camel/component/jms/JmsRouteUsingDifferentHeadersTest.java    | 3 ---
 .../apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java    | 3 ---
 .../camel/component/jms/JmsRouteUsingSpringAndJmsNameTest.java    | 3 ---
 .../camel/component/jms/JmsRouteUsingSpringJMSTemplateTest.java   | 3 ---
 .../org/apache/camel/component/jms/JmsRouteUsingSpringTest.java   | 3 ---
 .../camel/component/jms/JmsRouteUsingSpringWithAutoWireTest.java  | 3 ---
 .../component/jms/JmsRouteWithCustomKeyFormatStrategyTest.java    | 2 --
 .../component/jms/JmsRouteWithCustomListenerContainerTest.java    | 2 --
 .../component/jms/JmsRouteWithDefaultKeyFormatStrategyTest.java   | 3 ---
 .../org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java    | 2 --
 .../apache/camel/component/jms/JmsRouteWithObjectMessageTest.java | 3 ---
 .../jms/JmsRouteWithPassThroughKeyFormatStrategyTest.java         | 2 --
 .../java/org/apache/camel/component/jms/JmsSelectorInTest.java    | 3 ---
 .../test/java/org/apache/camel/component/jms/JmsSelectorTest.java | 3 ---
 .../test/java/org/apache/camel/component/jms/JmsSessionTest.java  | 3 ---
 .../java/org/apache/camel/component/jms/JmsSimpleHeaderTest.java  | 3 ---
 .../camel/component/jms/JmsSplitterParallelChainedTest.java       | 2 --
 .../org/apache/camel/component/jms/JmsSplitterParallelTest.java   | 3 ---
 .../java/org/apache/camel/component/jms/JmsSuspendResumeTest.java | 3 ---
 .../camel/component/jms/JmsTestConnectionOnStartupTest.java       | 3 ---
 .../camel/component/jms/JmsThrottlingInflightRoutePolicyTest.java | 3 ---
 .../src/test/java/org/apache/camel/component/jms/JmsToDTest.java  | 3 ---
 .../src/test/java/org/apache/camel/component/jms/JmsToTest.java   | 3 ---
 .../org/apache/camel/component/jms/JmsTransactedRouteTest.java    | 3 ---
 .../org/apache/camel/component/jms/JmsTransferExceptionTest.java  | 3 ---
 .../camel/component/jms/JmsTransferExchangeFromSplitterTest.java  | 3 ---
 .../org/apache/camel/component/jms/JmsTransferExchangeTest.java   | 3 ---
 .../java/org/apache/camel/component/jms/JmsTransferFaultTest.java | 3 ---
 .../test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java | 2 --
 .../java/org/apache/camel/component/jms/JmsXPathHeaderTest.java   | 2 --
 .../java/org/apache/camel/component/jms/MapJmsMessageTest.java    | 3 ---
 .../camel/component/jms/PassThroughJmsKeyFormatStrategyTest.java  | 3 ---
 .../apache/camel/component/jms/ProduceMessageConverterTest.java   | 3 ---
 .../test/java/org/apache/camel/component/jms/PurchaseOrder.java   | 2 --
 .../org/apache/camel/component/jms/SpringJmsSelectorTest.java     | 3 ---
 .../org/apache/camel/component/jms/SpringJmsXPathHeaderTest.java  | 2 --
 .../org/apache/camel/component/jms/async/AsyncJmsInOutTest.java   | 3 ---
 .../apache/camel/component/jms/async/AsyncJmsProducerTest.java    | 3 ---
 .../org/apache/camel/component/jms/bind/JmsMessageBindTest.java   | 3 ---
 .../src/test/java/org/apache/camel/component/jms/bind/MyBean.java | 3 ---
 .../jms/config/JmsEndpointWithCustomDestinationTest.java          | 3 ---
 .../apache/camel/component/jms/discovery/JmsDiscoveryTest.java    | 3 ---
 .../java/org/apache/camel/component/jms/discovery/MyRegistry.java | 2 --
 .../java/org/apache/camel/component/jms/discovery/MyService.java  | 3 ---
 .../camel/component/jms/issues/ActiveMQPropagateHeadersTest.java  | 3 ---
 .../component/jms/issues/JmsAnotherCustomJMSReplyToTest.java      | 3 ---
 .../camel/component/jms/issues/JmsCustomJMSReplyToIssueTest.java  | 3 ---
 .../component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java      | 3 ---
 .../JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java      | 2 --
 .../java/org/apache/camel/component/jms/issues/JmsHammerTest.java | 2 --
 .../org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java | 3 ---
 .../apache/camel/component/jms/issues/JmsInOnlyParameterTest.java | 3 ---
 .../jms/issues/JmsInOutExclusiveTopicRecipientListTest.java       | 3 ---
 .../camel/component/jms/issues/JmsInOutExclusiveTopicTest.java    | 3 ---
 .../org/apache/camel/component/jms/issues/JmsInOutIssueTest.java  | 3 ---
 .../apache/camel/component/jms/issues/JmsInOutParallelTest.java   | 3 ---
 .../component/jms/issues/JmsInOutPersistentReplyQueueTest.java    | 3 ---
 .../component/jms/issues/JmsInOutRepeatedInvocationsTest.java     | 3 ---
 .../camel/component/jms/issues/JmsInOutRoutingSlipTest.java       | 3 ---
 .../jms/issues/JmsInOutUseMessageIDasCorrelationIDTest.java       | 3 ---
 .../component/jms/issues/JmsInOutWithSpringRestartIssueTest.java  | 3 ---
 .../jms/issues/JmsJMSReplyToConsumerEndpointUsingInOutTest.java   | 2 --
 .../component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java | 2 --
 .../apache/camel/component/jms/issues/JmsMQSpecialHeaderTest.java | 3 ---
 .../jms/issues/JmsMessageHeaderContentBasedRouterTest.java        | 2 --
 .../apache/camel/component/jms/issues/JmsMutateMessageTest.java   | 3 ---
 .../component/jms/issues/JmsMutateRemoveHeaderMessageTest.java    | 3 ---
 .../JmsPassThroughtJmsKeyFormatStrategyEndUserIssueTest.java      | 3 ---
 .../issues/JmsPassThroughtJmsKeyFormatStrategyEndpointTest.java   | 3 ---
 .../jms/issues/JmsPassThroughtJmsKeyFormatStrategyTest.java       | 3 ---
 ...PassThroughtJmsKeyFormatStrategyUsingJmsConfigurationTest.java | 3 ---
 .../camel/component/jms/issues/JmsReplyToLoopIssueTest.java       | 3 ---
 .../camel/component/jms/issues/JmsRoutingSlipIssueTest.java       | 3 ---
 .../issues/JmsSendToAlotOfDestinationWithSameEndpointTest.java    | 3 ---
 .../camel/component/jms/issues/JmsTypeConverterIssueTest.java     | 2 --
 .../java/org/apache/camel/component/jms/issues/LarsIssueTest.java | 2 --
 .../org/apache/camel/component/jms/issues/MQSeriesHeaderTest.java | 2 --
 .../component/jms/issues/RequestReplyWithProducerIssueTest.java   | 3 ---
 .../apache/camel/component/jms/issues/TempReplyToIssueTest.java   | 3 ---
 .../org/apache/camel/component/jms/remoting/JmsRemotingTest.java  | 3 ---
 .../java/org/apache/camel/component/jms/temp/JmsProviderTest.java | 3 ---
 .../apache/camel/component/jms/temp/TemporaryQueueRouteTest.java  | 3 ---
 .../camel/component/jms/tuning/PerformanceRoutePojoTest.java      | 3 ---
 .../apache/camel/component/jms/tuning/PerformanceRouteTest.java   | 3 ---
 .../java/org/apache/camel/component/jms/tuning/RoutePojo.java     | 3 ---
 .../apache/camel/component/jms/tx/AsyncEndpointJmsTX2Test.java    | 3 ---
 .../camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java   | 3 ---
 .../component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java     | 3 ---
 .../camel/component/jms/tx/AsyncEndpointJmsTXRollback2Test.java   | 3 ---
 .../camel/component/jms/tx/AsyncEndpointJmsTXRollbackTest.java    | 3 ---
 .../camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java | 3 ---
 .../org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java | 3 ---
 .../component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java   | 3 ---
 .../camel/component/jms/tx/AsyncEndpointJmsTXWireTapTest.java     | 3 ---
 .../camel/component/jms/tx/JMSTXInOutPersistentQueueTest.java     | 3 ---
 .../apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.java   | 3 ---
 .../jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java       | 3 ---
 .../jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java        | 3 ---
 .../camel/component/jms/tx/JmsToJmsTransactedSecurityTest.java    | 3 ---
 .../org/apache/camel/component/jms/tx/JmsToJmsTransactedTest.java | 3 ---
 .../org/apache/camel/component/jms/tx/RouteIdTransactedTest.java  | 3 ---
 .../camel/component/jms/tx/TransactedAsyncUsingThreadsTest.java   | 3 ---
 .../java/org/apache/camel/component/jmx/MockEndpointFixture.java  | 1 -
 .../camel/component/johnzon/SpringJohnzonJsonDataFormatTest.java  | 3 ---
 .../src/main/java/org/apache/camel/component/jpa/Callback.java    | 3 ---
 .../src/main/java/org/apache/camel/component/jpa/Consumed.java    | 2 --
 .../main/java/org/apache/camel/component/jpa/DeleteHandler.java   | 2 --
 .../main/java/org/apache/camel/component/jpa/JpaComponent.java    | 2 --
 .../main/java/org/apache/camel/component/jpa/JpaConstants.java    | 2 --
 .../src/main/java/org/apache/camel/component/jpa/JpaConsumer.java | 3 ---
 .../src/main/java/org/apache/camel/component/jpa/JpaProducer.java | 3 ---
 .../main/java/org/apache/camel/component/jpa/QueryBuilder.java    | 2 --
 .../main/java/org/apache/camel/component/jpa/QueryFactory.java    | 2 --
 .../camel/processor/idempotent/jpa/JpaMessageIdRepository.java    | 3 ---
 .../apache/camel/processor/idempotent/jpa/MessageProcessed.java   | 3 ---
 .../org/apache/camel/component/jpa/AbstractJpaMethodTest.java     | 3 ---
 .../java/org/apache/camel/component/jpa/JpaComponentTest.java     | 3 ---
 .../test/java/org/apache/camel/component/jpa/JpaEndpointTest.java | 3 ---
 .../src/test/java/org/apache/camel/component/jpa/JpaTest.java     | 3 ---
 .../test/java/org/apache/camel/component/jpa/JpaUseMergeTest.java | 3 ---
 .../java/org/apache/camel/component/jpa/JpaUsePersistTest.java    | 3 ---
 .../camel/component/jpa/JpaUsingCustomPersistenceUnitTest.java    | 3 ---
 .../org/apache/camel/component/jpa/JpaWithNamedQueryTest.java     | 3 ---
 .../org/apache/camel/component/jpa/JpaWithNativeQueryTest.java    | 3 ---
 .../component/jpa/JpaWithNativeQueryWithResultClassTest.java      | 3 ---
 .../java/org/apache/camel/component/jpa/JpaWithQueryTest.java     | 3 ---
 .../java/org/apache/camel/component/jpa/QueryBuilderTest.java     | 3 ---
 .../src/test/java/org/apache/camel/examples/Address.java          | 3 ---
 .../src/test/java/org/apache/camel/examples/Customer.java         | 3 ---
 .../src/test/java/org/apache/camel/examples/MultiSteps.java       | 2 --
 .../src/test/java/org/apache/camel/examples/SendEmail.java        | 2 --
 .../src/test/java/org/apache/camel/examples/VersionedItem.java    | 2 --
 .../test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java | 3 ---
 .../java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java | 3 ---
 .../java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java   | 3 ---
 .../org/apache/camel/processor/jpa/JpaIdempotentConsumerTest.java | 3 ---
 .../java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java | 3 ---
 .../java/org/apache/camel/processor/jpa/JpaPreConsumedTest.java   | 3 ---
 .../org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java | 3 ---
 .../org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java     | 3 ---
 .../camel/processor/jpa/JpaProducerPassingEntityManagerTest.java  | 3 ---
 .../org/apache/camel/processor/jpa/JpaProducerRemoveTest.java     | 3 ---
 .../apache/camel/processor/jpa/JpaRouteConsumeLockEntityTest.java | 3 ---
 .../java/org/apache/camel/processor/jpa/JpaRouteEndpointTest.java | 3 ---
 .../apache/camel/processor/jpa/JpaRouteMaximumResultsTest.java    | 3 ---
 .../camel/processor/jpa/JpaRouteSharedEntityManagerTest.java      | 3 ---
 .../apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java  | 3 ---
 .../test/java/org/apache/camel/processor/jpa/JpaRouteTest.java    | 3 ---
 .../camel/processor/jpa/JpaRoutemaxMessagesPerPollTest.java       | 3 ---
 .../java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java    | 3 ---
 .../test/java/org/apache/camel/processor/jpa/JpaWireTapTest.java  | 3 ---
 .../src/main/java/org/apache/camel/jsonpath/JsonPath.java         | 2 --
 .../main/java/org/apache/camel/component/ldap/LdapComponent.java  | 2 --
 .../main/java/org/apache/camel/component/ldap/LdapProducer.java   | 3 ---
 .../org/apache/camel/component/leveldb/LevelDBCamelCodec.java     | 3 ---
 .../leveldb/LevelDBAggregateConcurrentDifferentGroupsTest.java    | 3 ---
 .../leveldb/LevelDBAggregateConcurrentSameGroupTest.java          | 3 ---
 .../java/org/apache/camel/component/mail/ContentTypeResolver.java | 2 --
 .../main/java/org/apache/camel/component/mail/MailComponent.java  | 2 --
 .../java/org/apache/camel/component/mail/MailConfiguration.java   | 2 --
 .../main/java/org/apache/camel/component/mail/MailConverters.java | 2 --
 .../main/java/org/apache/camel/component/mail/MailMessage.java    | 2 --
 .../src/main/java/org/apache/camel/component/mail/MailUtils.java  | 2 --
 .../org/apache/camel/component/mail/FromFileSendMailTest.java     | 3 ---
 .../org/apache/camel/component/mail/MailCollectionHeaderTest.java | 3 ---
 .../camel/component/mail/MailComponentRecipientSetTest.java       | 3 ---
 .../java/org/apache/camel/component/mail/MailComponentTest.java   | 3 ---
 .../camel/component/mail/MailConsumerUnsupportedCharsetTest.java  | 3 ---
 .../java/org/apache/camel/component/mail/MailConvertersTest.java  | 3 ---
 .../org/apache/camel/component/mail/MailCustomMailSenderTest.java | 3 ---
 .../java/org/apache/camel/component/mail/MailEndpointTest.java    | 3 ---
 .../java/org/apache/camel/component/mail/MailMessageTest.java     | 3 ---
 .../apache/camel/component/mail/MailProducerConcurrentTest.java   | 2 --
 .../camel/component/mail/MailProducerUnsupportedCharsetTest.java  | 3 ---
 .../test/java/org/apache/camel/component/mail/MailRouteTest.java  | 3 ---
 .../apache/camel/component/mail/MailToMultipleEndpointsTest.java  | 3 ---
 .../org/apache/camel/component/mail/MimeMessageConsumeTest.java   | 3 ---
 .../camel/component/mail/MultipleDestinationConsumeTest.java      | 3 ---
 .../java/org/apache/camel/component/mina2/Mina2Component.java     | 2 --
 .../java/org/apache/camel/component/mina2/Mina2Constants.java     | 2 --
 .../main/java/org/apache/camel/component/mina2/Mina2Consumer.java | 2 --
 .../java/org/apache/camel/component/mina2/Mina2Converter.java     | 2 --
 .../java/org/apache/camel/component/mina2/Mina2PayloadHelper.java | 2 --
 .../main/java/org/apache/camel/component/mina2/Mina2Producer.java | 2 --
 .../camel/component/mina2/Mina2UdpProtocolCodecFactory.java       | 3 ---
 .../java/org/apache/camel/component/mina2/Mina2ComponentTest.java | 2 --
 .../component/mina2/Mina2ComponentWithConfigurationTest.java      | 3 ---
 .../java/org/apache/camel/component/mina2/Mina2ConverterTest.java | 3 ---
 .../java/org/apache/camel/component/mina2/Mina2EncodingTest.java  | 2 --
 .../camel/component/mina2/Mina2ExchangeDefaultTimeOutTest.java    | 2 --
 .../java/org/apache/camel/component/mina2/Mina2FileTcpTest.java   | 3 ---
 .../java/org/apache/camel/component/mina2/Mina2FileUdpTest.java   | 3 ---
 .../org/apache/camel/component/mina2/Mina2MaxLineLengthTest.java  | 3 ---
 .../camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java | 3 ---
 .../apache/camel/component/mina2/Mina2ProducerConcurrentTest.java | 3 ---
 .../camel/component/mina2/Mina2SslContextParametersTcpTest.java   | 3 ---
 .../camel/component/mina2/Mina2SslContextParametersUdpTest.java   | 3 ---
 .../camel/component/mina2/Mina2SslContextParametersVmTest.java    | 3 ---
 .../component/mina2/Mina2SslGlobalContextParametersTcpTest.java   | 3 ---
 .../mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java          | 2 --
 .../test/java/org/apache/camel/component/mina2/Mina2TcpTest.java  | 3 ---
 .../org/apache/camel/component/mina2/Mina2TcpWithInOutTest.java   | 3 ---
 .../component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java    | 2 --
 .../camel/component/mina2/Mina2TransferExchangeOptionTest.java    | 2 --
 .../org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java  | 3 ---
 .../test/java/org/apache/camel/component/mina2/Mina2UdpTest.java  | 3 ---
 .../apache/camel/component/mina2/Mina2UdpUsingTemplateTest.java   | 3 ---
 .../java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java | 3 ---
 .../camel/component/mina2/Mina2VMTransferExchangeOptionTest.java  | 2 --
 .../test/java/org/apache/camel/component/mina2/Mina2VmTest.java   | 3 ---
 .../org/apache/camel/component/mongodb/gridfs/GridFsConsumer.java | 3 ---
 .../apache/camel/component/mongodb/gridfs/GridFsConsumerTest.java | 3 ---
 .../test/java/org/apache/camel/component/mqtt/MQTTBrigeTest.java  | 2 --
 .../java/org/apache/camel/component/mqtt/MQTTDuplicatesTest.java  | 2 --
 .../apache/camel/component/validator/msv/RelaxNGRouteTest.java    | 3 ---
 .../src/main/java/org/apache/camel/language/mvel/MVEL.java        | 1 -
 .../main/java/org/apache/camel/language/mvel/MvelLanguage.java    | 2 --
 .../camel/component/mybatis/DefaultMyBatisProcessingStrategy.java | 3 ---
 .../java/org/apache/camel/component/mybatis/MyBatisComponent.java | 3 ---
 .../java/org/apache/camel/component/mybatis/MyBatisConstants.java | 2 --
 .../apache/camel/component/mybatis/MyBatisProcessingStrategy.java | 2 --
 .../java/org/apache/camel/component/mybatis/MyBatisProducer.java  | 3 ---
 .../java/org/apache/camel/component/mybatis/StatementType.java    | 2 --
 .../src/test/java/org/apache/camel/component/mybatis/Account.java | 3 ---
 .../java/org/apache/camel/component/nagios/NagiosComponent.java   | 3 ---
 .../org/apache/camel/component/nagios/NagiosConfiguration.java    | 3 ---
 .../java/org/apache/camel/component/nagios/NagiosConstants.java   | 3 ---
 .../org/apache/camel/component/nagios/NagiosEventNotifier.java    | 2 --
 .../java/org/apache/camel/component/nagios/NagiosProducer.java    | 3 ---
 .../org/apache/camel/component/nagios/NagiosAsyncSendTest.java    | 3 ---
 .../apache/camel/component/nagios/NagiosEventNotifierTest.java    | 3 ---
 .../test/java/org/apache/camel/component/nagios/NagiosTest.java   | 3 ---
 .../apache/camel/component/nagios/NagiosXorEncryptionTest.java    | 3 ---
 .../apache/camel/component/netty4/http/LogCaptureAppender.java    | 2 --
 .../java/org/apache/camel/component/netty4/NettyConstants.java    | 2 --
 .../java/org/apache/camel/component/netty4/NettyConverter.java    | 2 --
 .../main/java/org/apache/camel/component/netty4/NettyHelper.java  | 2 --
 .../org/apache/camel/component/netty4/NettyPayloadHelper.java     | 2 --
 .../java/org/apache/camel/component/netty4/TextLineDelimiter.java | 2 --
 .../org/apache/camel/component/netty4/LogCaptureAppender.java     | 2 --
 .../org/apache/camel/component/netty4/Netty2978IssueTest.java     | 3 ---
 .../component/netty4/NettyComponentWithConfigurationTest.java     | 3 ---
 .../org/apache/camel/component/netty4/NettyDisconnectTest.java    | 3 ---
 .../java/org/apache/camel/component/netty4/NettyFileTcpTest.java  | 3 ---
 .../component/netty4/NettyInOutCloseChannelWhenCompleteTest.java  | 3 ---
 .../org/apache/camel/component/netty4/NettyInOutFromSedaTest.java | 3 ---
 .../component/netty4/NettyInOutWithForcedNoResponseTest.java      | 3 ---
 .../camel/component/netty4/NettyProducerAsyncEndpointTest.java    | 3 ---
 .../camel/component/netty4/NettyProducerPoolDisabledTest.java     | 3 ---
 .../apache/camel/component/netty4/NettyRequestTimeoutTest.java    | 3 ---
 .../org/apache/camel/component/netty4/NettyReuseChannelTest.java  | 3 ---
 .../component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java   | 3 ---
 .../component/netty4/NettyTextlineInOnlyNullDelimiterTest.java    | 3 ---
 .../apache/camel/component/netty4/NettyTextlineInOnlyTest.java    | 3 ---
 .../camel/component/netty4/NettyTextlineInOutNonBlockingTest.java | 3 ---
 .../component/netty4/NettyTextlineInOutSynchronousFalseTest.java  | 3 ---
 .../camel/component/netty4/NettyTextlineInOutSynchronousTest.java | 3 ---
 .../org/apache/camel/component/netty4/NettyTextlineInOutTest.java | 3 ---
 .../camel/component/netty4/NettyTransferExchangeOptionTest.java   | 3 ---
 .../component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java   | 3 ---
 .../netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java      | 3 ---
 .../component/netty4/NettyUseSharedWorkerThreadPoolTest.java      | 3 ---
 .../netty4/SpringNettyUseSharedWorkerThreadPoolTest.java          | 3 ---
 .../src/main/java/org/apache/camel/language/ognl/OGNL.java        | 2 --
 .../main/java/org/apache/camel/language/ognl/OgnlExpression.java  | 2 --
 .../main/java/org/apache/camel/language/ognl/OgnlLanguage.java    | 2 --
 .../src/main/java/org/apache/camel/language/ognl/RootObject.java  | 3 ---
 .../src/test/java/org/apache/camel/language/ognl/OgnlTest.java    | 3 ---
 .../java/org/apache/camel/language/ognl/patterns/FilterTest.java  | 3 ---
 .../apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java | 3 ---
 .../quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java      | 3 ---
 .../org/apache/camel/component/quartz2/QuartzAutoStartTest.java   | 3 ---
 .../org/apache/camel/component/quartz2/QuartzComponentTest.java   | 3 ---
 .../org/apache/camel/component/quartz2/QuartzCronRouteTest.java   | 1 -
 .../camel/component/quartz2/QuartzEndpointConfigureTest.java      | 3 ---
 .../org/apache/camel/component/quartz2/QuartzInterruptTest.java   | 3 ---
 .../camel/component/quartz2/QuartzJobRouteUnderscoreTest.java     | 3 ---
 .../camel/component/quartz2/QuartzManuallyTriggerJobTest.java     | 1 -
 .../camel/component/quartz2/QuartzOneCamelContextRestartTest.java | 3 ---
 .../component/quartz2/QuartzOneCamelContextSuspendResumeTest.java | 3 ---
 .../apache/camel/component/quartz2/QuartzRepeatIntervalTest.java  | 3 ---
 .../apache/camel/component/quartz2/QuartzRouteFireNowTest.java    | 3 ---
 .../apache/camel/component/quartz2/QuartzRouteRestartTest.java    | 3 ---
 .../java/org/apache/camel/component/quartz2/QuartzRouteTest.java  | 3 ---
 .../org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java | 1 -
 .../org/apache/camel/component/quartz2/QuartzStopRouteTest.java   | 3 ---
 .../apache/camel/component/quartz2/QuartzSuspendRouteTest.java    | 3 ---
 .../camel/component/quartz2/QuartzTwoCamelContextRestartTest.java | 3 ---
 .../component/quartz2/QuartzTwoCamelContextSameNameClashTest.java | 3 ---
 .../component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java | 3 ---
 .../apache/camel/component/quartz2/QuartzTwoCamelContextTest.java | 3 ---
 .../quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java | 2 --
 .../apache/camel/component/quartz2/SpringQuartzCronRouteTest.java | 3 ---
 .../SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java   | 2 --
 .../quartz2/SpringQuartzPersistentStoreRestartAppTest.java        | 3 ---
 .../quartz2/SpringQuartzPersistentStoreRestartRouteTest.java      | 3 ---
 .../camel/component/quartz2/SpringQuartzPersistentStoreTest.java  | 3 ---
 .../camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java   | 3 ---
 .../camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java    | 3 ---
 .../camel/component/quickfixj/examples/AuthenticationExample.java | 1 -
 .../component/quickfixj/examples/SimpleMessagingExample.java      | 1 -
 .../java/org/apache/camel/component/rabbitmq/ReplyToType.java     | 2 --
 .../camel/component/rabbitmq/reply/CorrelationTimeoutMap.java     | 2 --
 .../camel/component/rabbitmq/reply/MessageSentCallback.java       | 2 --
 .../apache/camel/component/rabbitmq/reply/QueueReplyHandler.java  | 2 --
 .../org/apache/camel/component/rabbitmq/reply/ReplyHandler.java   | 2 --
 .../org/apache/camel/component/rabbitmq/reply/ReplyHolder.java    | 2 --
 .../org/apache/camel/component/rabbitmq/reply/ReplyManager.java   | 2 --
 .../component/rabbitmq/reply/TemporaryQueueReplyHandler.java      | 2 --
 .../component/rabbitmq/reply/TemporaryQueueReplyManager.java      | 2 --
 .../reply/UseMessageIdAsCorrelationIdMessageSentCallback.java     | 2 --
 .../org/apache/camel/component/restlet/MethodBasedRouter.java     | 2 --
 .../java/org/apache/camel/component/restlet/RestletBinding.java   | 2 --
 .../java/org/apache/camel/component/restlet/RestletComponent.java | 2 --
 .../java/org/apache/camel/component/restlet/RestletConstants.java | 2 --
 .../java/org/apache/camel/component/restlet/RestletConsumer.java  | 2 --
 .../camel/component/restlet/RestletHeaderFilterStrategy.java      | 2 --
 .../java/org/apache/camel/component/restlet/RestletProducer.java  | 2 --
 .../camel/component/restlet/converter/RestletConverter.java       | 4 ----
 .../java/org/apache/camel/component/restlet/AddQueryTest.java     | 4 ----
 .../restlet/RestRestletBindingInJaxbOutStringWithXmlTest.java     | 3 ---
 .../component/restlet/RestRestletBindingModeAutoWithJsonTest.java | 3 ---
 .../component/restlet/RestRestletBindingModeAutoWithXmlTest.java  | 3 ---
 .../camel/component/restlet/RestRestletBindingModeJsonTest.java   | 3 ---
 .../camel/component/restlet/RestRestletBindingModeXmlTest.java    | 3 ---
 .../component/restlet/RestRestletComponentConfigurationTest.java  | 3 ---
 .../component/restlet/RestRestletCustomDataFormatInvalidTest.java | 3 ---
 .../camel/component/restlet/RestRestletCustomDataFormatTest.java  | 3 ---
 .../apache/camel/component/restlet/RestRestletGetCorsTest.java    | 3 ---
 .../org/apache/camel/component/restlet/RestRestletGetTest.java    | 3 ---
 .../camel/component/restlet/RestRestletHttpOptionsTest.java       | 3 ---
 .../camel/component/restlet/RestRestletNoPathParameterTest.java   | 3 ---
 .../restlet/RestRestletPojoInOutCustomErrorResponseTest.java      | 3 ---
 .../apache/camel/component/restlet/RestRestletPojoInOutTest.java  | 3 ---
 .../camel/component/restlet/RestRestletPostJsonJaxbPojoTest.java  | 3 ---
 .../camel/component/restlet/RestRestletPostJsonPojoListTest.java  | 3 ---
 .../component/restlet/RestRestletPostJsonPojoOnExceptionTest.java | 3 ---
 .../camel/component/restlet/RestRestletPostJsonPojoTest.java      | 3 ---
 .../camel/component/restlet/RestRestletPostXmlJaxbPojoTest.java   | 3 ---
 .../component/restlet/RestRestletProducerGetJettyServerTest.java  | 3 ---
 .../camel/component/restlet/RestRestletProducerGetTest.java       | 3 ---
 .../component/restlet/RestRestletProducerGetUriParameterTest.java | 3 ---
 .../org/apache/camel/component/restlet/RestletAddRouteTest.java   | 3 ---
 .../apache/camel/component/restlet/RestletContentTypeTest.java    | 3 ---
 .../component/restlet/RestletEndpointUpdateEndpointUriTest.java   | 3 ---
 .../camel/component/restlet/RestletExceptionResponseTest.java     | 4 ----
 .../java/org/apache/camel/component/restlet/RestletFaultTest.java | 4 ----
 .../camel/component/restlet/RestletHeaderFilterStrategyTest.java  | 3 ---
 .../component/restlet/RestletHttpEmptyQueryParameterTest.java     | 3 ---
 .../restlet/RestletHttpsWithGlobalSSLContextParametersTest.java   | 3 ---
 .../restlet/RestletHttpsWithSSLContextParametersTest.java         | 3 ---
 .../camel/component/restlet/RestletMultiMethodsEndpointTest.java  | 2 --
 .../camel/component/restlet/RestletMultiRoutesEndpointTest.java   | 2 --
 .../component/restlet/RestletMultiUriTemplatesEndpointTest.java   | 2 --
 .../apache/camel/component/restlet/RestletPostContentTest.java    | 4 ----
 .../org/apache/camel/component/restlet/RestletPostFormTest.java   | 4 ----
 .../component/restlet/RestletPostXmlRouteAndJSONAsReturnTest.java | 3 ---
 .../apache/camel/component/restlet/RestletPostXmlRouteTest.java   | 3 ---
 .../org/apache/camel/component/restlet/RestletPostXmlTest.java    | 3 ---
 .../camel/component/restlet/RestletProducerBinaryStreamTest.java  | 3 ---
 .../camel/component/restlet/RestletProducerConcurrentTest.java    | 2 --
 .../apache/camel/component/restlet/RestletProducerGet2Test.java   | 3 ---
 .../component/restlet/RestletProducerGetResponseCodeTest.java     | 3 ---
 .../component/restlet/RestletProducerPropagateHeadersTest.java    | 3 ---
 .../restlet/RestletProducerStandardHeaderWarningTest.java         | 3 ---
 .../camel/component/restlet/RestletProducerSynchronouslyTest.java | 3 ---
 .../org/apache/camel/component/restlet/RestletProducerTest.java   | 3 ---
 .../java/org/apache/camel/component/restlet/RestletQueryTest.java | 4 ----
 .../apache/camel/component/restlet/RestletRecipientListTest.java  | 3 ---
 .../org/apache/camel/component/restlet/RestletRedirectTest.java   | 4 ----
 .../camel/component/restlet/RestletRequestAndResponseAPITest.java | 2 --
 .../org/apache/camel/component/restlet/RestletResponseTest.java   | 4 ----
 .../camel/component/restlet/RestletRestProducerPutTest.java       | 3 ---
 .../component/restlet/RestletRestProducerVerbUpperCaseTest.java   | 3 ---
 .../apache/camel/component/restlet/RestletRestartRouteTest.java   | 3 ---
 .../org/apache/camel/component/restlet/RestletSetBodyTest.java    | 3 ---
 .../org/apache/camel/component/restlet/RestletTestSupport.java    | 4 ----
 .../apache/camel/component/restlet/RestletTwoEndpointsTest.java   | 3 ---
 .../apache/camel/component/restlet/RestletValidUriQueryTest.java  | 4 ----
 .../camel/component/restlet/SpringRestRestletPojoInOutTest.java   | 3 ---
 .../apache/camel/component/restlet/route/TestRouteBuilder.java    | 2 --
 .../main/java/org/apache/camel/component/rmi/RmiComponent.java    | 3 ---
 .../src/main/java/org/apache/camel/component/rmi/RmiConsumer.java | 2 --
 .../src/main/java/org/apache/camel/component/rmi/RmiProducer.java | 3 ---
 .../main/java/org/apache/camel/component/rmi/RmiRegistryBean.java | 3 ---
 .../src/test/java/org/apache/camel/component/rmi/EchoService.java | 3 ---
 .../java/org/apache/camel/component/rmi/RmiConcurrencyTest.java   | 3 ---
 .../java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java | 3 ---
 .../camel/component/rmi/RmiIllegalArgumentExceptionTest.java      | 3 ---
 .../java/org/apache/camel/component/rmi/RmiRouteEndpointTest.java | 3 ---
 .../test/java/org/apache/camel/component/rmi/RmiRouteTest.java    | 3 ---
 .../org/apache/camel/component/rss/RssUriEncodingIssueTest.java   | 3 ---
 .../main/java/org/apache/camel/component/xquery/ResultFormat.java | 3 ---
 .../src/main/java/org/apache/camel/component/xquery/XQuery.java   | 2 --
 .../camel/component/xquery/XQueryAnnotationExpressionFactory.java | 3 ---
 .../java/org/apache/camel/component/xquery/XQueryBuilder.java     | 2 --
 .../java/org/apache/camel/language/xquery/XQueryLanguage.java     | 3 ---
 .../apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java   | 3 ---
 .../apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java | 3 ---
 .../src/test/java/org/apache/camel/builder/saxon/XPathTest.java   | 3 ---
 .../java/org/apache/camel/builder/saxon/XQueryFilterTest.java     | 3 ---
 .../org/apache/camel/builder/saxon/XQueryRecipientListTest.java   | 3 ---
 .../src/test/java/org/apache/camel/builder/saxon/XQueryTest.java  | 3 ---
 .../java/org/apache/camel/builder/saxon/XQueryTransformTest.java  | 3 ---
 .../org/apache/camel/builder/saxon/XQueryTransformTextTest.java   | 3 ---
 .../camel/builder/saxon/XQueryWithNamespacesFilterTest.java       | 3 ---
 .../java/org/apache/camel/component/xquery/SoapPayloadBean.java   | 3 ---
 .../org/apache/camel/component/xquery/SoapPayloadBeanTest.java    | 3 ---
 .../src/test/java/org/apache/camel/component/xquery/TestBean.java | 3 ---
 .../org/apache/camel/component/xquery/XQueryEndpointTest.java     | 3 ---
 .../java/org/apache/camel/component/xquery/XQueryExampleTest.java | 3 ---
 .../org/apache/camel/component/xquery/XQueryNullHeaderTest.java   | 3 ---
 .../apache/camel/component/xquery/XQueryStripWhitespaceTest.java  | 3 ---
 .../apache/camel/component/xquery/XQueryWithExplicitTypeTest.java | 3 ---
 .../apache/camel/component/xquery/XQueryWithExtensionTest.java    | 3 ---
 .../src/main/java/org/apache/camel/builder/script/Groovy.java     | 2 --
 .../src/main/java/org/apache/camel/builder/script/JavaScript.java | 2 --
 .../main/java/org/apache/camel/builder/script/ScriptBuilder.java  | 2 --
 .../apache/camel/builder/script/ScriptEvaluationException.java    | 2 --
 .../main/java/org/apache/camel/builder/script/ScriptLanguage.java | 3 ---
 .../org/apache/camel/builder/script/ScriptLanguageResolver.java   | 3 ---
 .../src/test/java/org/apache/camel/builder/script/Jsr223Test.java | 3 ---
 .../camel/builder/script/example/AnyLanguageFilterTest.java       | 3 ---
 .../apache/camel/builder/script/example/BeanShellFilterTest.java  | 3 ---
 .../org/apache/camel/builder/script/example/GroovyFilterTest.java | 3 ---
 .../apache/camel/builder/script/example/JavaScriptFilterTest.java | 3 ---
 .../org/apache/camel/language/script/JavaScriptLanguageTest.java  | 3 ---
 .../camel/component/servlet/ServletTransferExceptionTest.java     | 3 ---
 .../org/apache/camel/component/sjms/SjmsHeaderFilterStrategy.java | 3 ---
 .../main/java/org/apache/camel/component/sjms/SjmsMessage.java    | 2 --
 .../org/apache/camel/component/sjms/jms/JmsObjectFactory.java     | 3 ---
 .../java/org/apache/camel/component/sjms/CamelJmsTestHelper.java  | 2 --
 .../java/org/apache/camel/component/sjms/JmsSelectorTest.java     | 3 ---
 .../camel/component/sjms/consumer/EmptyMessageBodyTest.java       | 3 ---
 .../camel/component/sjms/consumer/InOnlyConsumerDefaultTest.java  | 3 ---
 .../camel/component/sjms/consumer/InOnlyConsumerQueueTest.java    | 3 ---
 .../component/sjms/consumer/InOnlyConsumerTempQueueTest.java      | 3 ---
 .../camel/component/sjms/consumer/InOnlyConsumerTopicTest.java    | 3 ---
 .../component/sjms/consumer/InOutConsumerQueueAsyncTest.java      | 3 ---
 .../camel/component/sjms/consumer/InOutConsumerQueueTest.java     | 3 ---
 .../component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java  | 3 ---
 .../camel/component/sjms/consumer/InOutConsumerTempQueueTest.java | 3 ---
 .../camel/component/sjms/consumer/InOutConsumerTopicTest.java     | 3 ---
 .../component/sjms/consumer/InOutSynchronousConsumerTest.java     | 3 ---
 .../org/apache/camel/component/sjms/it/ConnectionResourceIT.java  | 1 -
 .../camel/component/sjms/producer/AsyncQueueProducerTest.java     | 3 ---
 .../camel/component/sjms/producer/AsyncTopicProducerTest.java     | 3 ---
 .../main/java/org/apache/camel/component/smpp/SmppBinding.java    | 2 --
 .../main/java/org/apache/camel/component/smpp/SmppComponent.java  | 3 ---
 .../java/org/apache/camel/component/smpp/SmppConfiguration.java   | 2 --
 .../org/apache/camel/component/smpp/SmppConnectionFactory.java    | 2 --
 .../main/java/org/apache/camel/component/smpp/SmppConsumer.java   | 2 --
 .../main/java/org/apache/camel/component/smpp/SmppProducer.java   | 2 --
 .../java/org/apache/camel/component/smpp/SmppBindingTest.java     | 2 --
 .../java/org/apache/camel/component/smpp/SmppComponentTest.java   | 2 --
 .../org/apache/camel/component/smpp/SmppConfigurationTest.java    | 2 --
 .../apache/camel/component/smpp/SmppConnectionFactoryTest.java    | 2 --
 .../java/org/apache/camel/component/smpp/SmppConsumerTest.java    | 2 --
 .../java/org/apache/camel/component/smpp/SmppMessageTest.java     | 2 --
 .../camel/component/smpp/SmppProducerLazySessionCreationTest.java | 2 --
 .../java/org/apache/camel/component/smpp/SmppProducerTest.java    | 2 --
 .../component/smpp/integration/SmppComponentIntegrationTest.java  | 2 --
 .../smpp/integration/SmppComponentSpringIntegrationTest.java      | 2 --
 .../smpp/integration/SmppConsumerReconnectIntegrationTest.java    | 2 --
 .../smpp/integration/SmppProducerReconnectIntegrationTest.java    | 2 --
 .../org/apache/camel/converter/soap/name/QNameStrategyTest.java   | 3 ---
 .../java/org/apache/camel/dataformat/soap/SoapMarshalTest.java    | 3 ---
 .../org/apache/camel/dataformat/soap12/Soap12MarshalTest.java     | 3 ---
 .../java/org/apache/camel/component/solr/SolrCloudFixture.java    | 3 ---
 .../component/spring/integration/SpringIntegrationBinding.java    | 2 --
 .../component/spring/integration/SpringIntegrationComponent.java  | 2 --
 .../component/spring/integration/SpringIntegrationConsumer.java   | 2 --
 .../component/spring/integration/SpringIntegrationMessage.java    | 2 --
 .../component/spring/integration/SpringIntegrationProducer.java   | 1 -
 .../spring/integration/adapter/AbstractCamelAdapter.java          | 2 --
 .../component/spring/integration/adapter/CamelSourceAdapter.java  | 2 --
 .../component/spring/integration/adapter/CamelTargetAdapter.java  | 2 --
 .../adapter/config/AbstractCamelContextBeanDefinitionParaser.java | 2 --
 .../integration/adapter/config/CamelSourceAdapterParser.java      | 2 --
 .../integration/adapter/config/CamelTargetAdapterParser.java      | 2 --
 .../spring/integration/adapter/config/NamespaceHandler.java       | 2 --
 .../spring/integration/converter/SpringIntegrationConverter.java  | 2 --
 .../org/apache/camel/spring/javaconfig/patterns/FilterTest.java   | 2 --
 .../test/CamelSpringDelegatingTestContextLoaderTest.java          | 1 -
 .../test/java/org/apache/camel/spring/javaconfig/test/Cheese.java | 3 ---
 .../java/org/apache/camel/spring/javaconfig/test/MyConfig.java    | 3 ---
 .../org/apache/camel/spring/javaconfig/test/MyPostProcessor.java  | 2 --
 .../component/spring/security/config/BeanDefinitionParser.java    | 2 --
 .../src/test/java/net/javacrumbs/calc/model/ObjectFactory.java    | 1 -
 .../src/test/java/net/javacrumbs/calc/model/PlusRequest.java      | 1 -
 .../src/test/java/net/javacrumbs/calc/model/PlusResponse.java     | 1 -
 .../springws/test/helper/InMemoryWebServiceMessageSender2.java    | 1 -
 .../main/java/org/apache/camel/component/event/CamelEvent.java    | 2 --
 .../java/org/apache/camel/component/event/EventComponent.java     | 2 --
 .../main/java/org/apache/camel/component/event/EventConsumer.java | 2 --
 .../org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java | 2 --
 .../java/org/apache/camel/spring/CamelEndpointFactoryBean.java    | 2 --
 .../camel/spring/CamelFluentProducerTemplateFactoryBean.java      | 2 --
 .../org/apache/camel/spring/CamelProducerTemplateFactoryBean.java | 2 --
 .../org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java | 2 --
 .../java/org/apache/camel/spring/CamelRestContextFactoryBean.java | 2 --
 .../org/apache/camel/spring/CamelRouteContextFactoryBean.java     | 2 --
 .../java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java  | 2 --
 .../org/apache/camel/spring/ContextScanRouteBuilderFinder.java    | 2 --
 .../main/java/org/apache/camel/spring/ErrorHandlerDefinition.java | 2 --
 .../src/main/java/org/apache/camel/spring/ErrorHandlerType.java   | 2 --
 .../org/apache/camel/spring/PackageScanRouteBuilderFinder.java    | 2 --
 .../src/main/java/org/apache/camel/spring/SpringCamelContext.java | 2 --
 .../src/main/java/org/apache/camel/spring/SpringRouteBuilder.java | 2 --
 .../org/apache/camel/spring/handler/BeanDefinitionParser.java     | 2 --
 .../org/apache/camel/spring/spi/ApplicationContextRegistry.java   | 2 --
 .../src/main/java/org/apache/camel/spring/spi/SpringInjector.java | 2 --
 .../java/org/apache/camel/spring/spi/SpringTransactionPolicy.java | 2 --
 .../java/org/apache/camel/spring/spi/TransactionErrorHandler.java | 2 --
 .../apache/camel/spring/spi/TransactionErrorHandlerBuilder.java   | 2 --
 .../org/apache/camel/spring/spi/TransactionRollbackException.java | 2 --
 .../src/main/java/org/apache/camel/spring/util/MainRunner.java    | 2 --
 .../apache/camel/component/bean/AutowireConstructorRouteTest.java | 3 ---
 .../camel/component/bean/AutowireConstructorRouteTwoTest.java     | 3 ---
 .../test/java/org/apache/camel/component/bean/BeanRouteTest.java  | 3 ---
 .../apache/camel/component/bean/BeanWithRecipientListTest.java    | 3 ---
 .../test/java/org/apache/camel/component/bean/ExampleBean.java    | 2 --
 .../src/test/java/org/apache/camel/component/bean/RouterBean.java | 2 --
 .../org/apache/camel/component/dataset/SpringDataSetTest.java     | 3 ---
 .../test/java/org/apache/camel/component/event/DummyEvent.java    | 3 ---
 .../java/org/apache/camel/component/event/EventRouteTest.java     | 3 ---
 .../org/apache/camel/component/event/MistypedPackageTest.java     | 3 ---
 .../apache/camel/component/log/CustomExchangeFormatterTest.java   | 3 ---
 .../java/org/apache/camel/component/log/SpringLogMarkerTest.java  | 3 ---
 .../java/org/apache/camel/component/log/SpringLogMaskTest.java    | 3 ---
 .../test/java/org/apache/camel/component/log/SpringLogTest.java   | 3 ---
 .../properties/SpringAttributeNewLineRouteContextRefTest.java     | 3 ---
 .../camel/component/properties/SpringAttributeNewLineTest.java    | 3 ---
 .../component/properties/SpringBuilderRefBeanInjectTest.java      | 3 ---
 .../component/properties/SpringBuilderRefPropertiesTest.java      | 3 ---
 .../component/properties/SpringBuilderRefPropertyInjectTest.java  | 3 ---
 .../SpringErrorHandlerInlinedPropertiesPlaceholderTest.java       | 3 ---
 .../properties/SpringErrorHandlerPropertiesPlaceholderTest.java   | 3 ---
 .../camel/component/properties/SpringPackagePropertiesTest.java   | 3 ---
 .../component/properties/SpringPackageScanPropertiesTest.java     | 3 ---
 .../properties/SpringPropertiesAfterTransactedDSL2Test.java       | 3 ---
 .../properties/SpringPropertiesAfterTransactedDSLTest.java        | 3 ---
 .../SpringPropertiesComponentEIPChoiceConvertBodyToTest.java      | 3 ---
 .../properties/SpringPropertiesComponentEIPConvertBodyToTest.java | 3 ---
 .../properties/SpringPropertiesComponentInterceptFromTest.java    | 3 ---
 .../properties/SpringPropertiesComponentOnExceptionRefTest.java   | 3 ---
 .../properties/SpringPropertiesComponentOnExceptionTest.java      | 3 ---
 .../component/properties/SpringPropertiesComponentRefTest.java    | 3 ---
 .../camel/component/properties/SpringPropertiesResolver2Test.java | 3 ---
 .../camel/component/properties/SpringPropertiesResolver3Test.java | 3 ---
 .../camel/component/properties/SpringPropertiesResolverTest.java  | 3 ---
 .../camel/component/properties/SpringPropertiesRouteFromTest.java | 2 --
 .../camel/component/properties/SpringPropertiesRouteIdTest.java   | 2 --
 .../properties/SpringPropertyPlaceholderOnExceptionRefTest.java   | 2 --
 .../camel/component/properties/route/SpringSimpleRoute.java       | 3 ---
 .../camel/component/properties/route2/SpringBeanInjectRoute.java  | 3 ---
 .../component/properties/route2/SpringPropertyInjectRoute.java    | 3 ---
 .../test/java/org/apache/camel/component/rest/RestRefTest.java    | 3 ---
 .../camel/component/validator/SpringValidatorRouteTest.java       | 3 ---
 .../org/apache/camel/component/xslt/SpringXsltRouteFileTest.java  | 3 ---
 .../java/org/apache/camel/component/xslt/SpringXsltRouteTest.java | 3 ---
 .../org/apache/camel/spring/ApplicationContextTestSupport.java    | 3 ---
 .../test/java/org/apache/camel/spring/CamelContextAwareBean.java  | 3 ---
 .../test/java/org/apache/camel/spring/CamelContextAwareTest.java  | 3 ---
 .../java/org/apache/camel/spring/CamelContextFactoryBeanTest.java | 3 ---
 .../apache/camel/spring/CustomProcessorWithNamespacesTest.java    | 3 ---
 .../test/java/org/apache/camel/spring/DefaultJMXAgentTest.java    | 2 --
 .../test/java/org/apache/camel/spring/DisableJmxAgentTest.java    | 1 -
 .../test/java/org/apache/camel/spring/DummyLifecycleStrategy.java | 2 --
 .../test/java/org/apache/camel/spring/EndpointReferenceTest.java  | 3 ---
 .../src/test/java/org/apache/camel/spring/InjectedBean.java       | 3 ---
 .../src/test/java/org/apache/camel/spring/InjectedBeanTest.java   | 3 ---
 .../src/test/java/org/apache/camel/spring/JMXAgentTest.java       | 2 --
 .../org/apache/camel/spring/LifecycleStrategyInjectionTest.java   | 2 --
 .../src/test/java/org/apache/camel/spring/MainExampleTest.java    | 3 ---
 .../src/test/java/org/apache/camel/spring/MainTest.java           | 3 ---
 .../src/test/java/org/apache/camel/spring/MainVetoTest.java       | 3 ---
 .../camel/spring/MultipleLifecycleStrategyInjectionTest.java      | 2 --
 .../test/java/org/apache/camel/spring/NodeIdReferenceTest.java    | 3 ---
 .../test/java/org/apache/camel/spring/RegistryInjectionTest.java  | 2 --
 .../apache/camel/spring/RoutingUsingCamelContextFactoryTest.java  | 3 ---
 .../java/org/apache/camel/spring/SpringConsumerTemplateTest.java  | 2 --
 .../java/org/apache/camel/spring/SpringEndpointPropertyTest.java  | 3 ---
 .../org/apache/camel/spring/SpringLogDebugBodyMaxCharsTest.java   | 3 ---
 .../src/test/java/org/apache/camel/spring/SpringMDCTest.java      | 3 ---
 .../apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.java  | 3 ---
 .../java/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.java | 3 ---
 .../src/test/java/org/apache/camel/spring/SpringTestSupport.java  | 3 ---
 .../java/org/apache/camel/spring/aop/ExceptionInterceptor.java    | 3 ---
 .../src/test/java/org/apache/camel/spring/aop/MyCoolAopBean.java  | 3 ---
 .../apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java | 2 --
 .../java/org/apache/camel/spring/bind/BeanAsEndpointTest.java     | 3 ---
 .../src/test/java/org/apache/camel/spring/bind/BeanInfoTest.java  | 3 ---
 .../src/test/java/org/apache/camel/spring/bind/ExampleBean.java   | 2 --
 .../org/apache/camel/spring/bind/ProcessorAsEndpointTest.java     | 3 ---
 .../src/test/java/org/apache/camel/spring/bind/ProcessorStub.java | 3 ---
 .../org/apache/camel/spring/config/AnotherCamelProxyTest.java     | 3 ---
 .../apache/camel/spring/config/CamelContextAutoStartupTest.java   | 3 ---
 .../apache/camel/spring/config/CamelContextFactoryBeanTest.java   | 3 ---
 .../test/java/org/apache/camel/spring/config/CamelProxyTest.java  | 3 ---
 .../org/apache/camel/spring/config/CamelProxyUsingRefTest.java    | 3 ---
 .../camel/spring/config/ConsumerTemplateAlreadyExistTest.java     | 3 ---
 .../camel/spring/config/ConsumerTemplateAutoRegisterTest.java     | 3 ---
 .../camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java  | 3 ---
 .../camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java | 3 ---
 .../apache/camel/spring/config/CustomExecutorServiceManager.java  | 3 ---
 .../camel/spring/config/CustomExecutorServiceManagerTest.java     | 3 ---
 .../apache/camel/spring/config/CustomThreadPoolFactoryTest.java   | 3 ---
 .../apache/camel/spring/config/DefaultErrorHandlerConfigTest.java | 3 ---
 .../camel/spring/config/DependencyInjectCamelTemplateTest.java    | 3 ---
 .../camel/spring/config/DualCamelContextEndpointOutsideTest.java  | 3 ---
 .../org/apache/camel/spring/config/DummyErrorHandlerBuilder.java  | 3 ---
 .../apache/camel/spring/config/EndpointUriSetFromSpringTest.java  | 3 ---
 .../spring/config/ErrorHandlerCamelContextRefNotFoundTest.java    | 3 ---
 .../org/apache/camel/spring/config/ErrorHandlerConfigTest.java    | 3 ---
 .../spring/config/ErrorHandlerRouteContextRefNotFoundTest.java    | 3 ---
 .../spring/config/FluentProducerTemplateAutoRegisterTest.java     | 3 ---
 .../test/java/org/apache/camel/spring/config/MyDependsOnBean.java | 3 ---
 .../org/apache/camel/spring/config/MyDependsOnRouteBuilder.java   | 3 ---
 .../test/java/org/apache/camel/spring/config/MyProduceBean.java   | 3 ---
 .../test/java/org/apache/camel/spring/config/MyProxySender.java   | 3 ---
 .../java/org/apache/camel/spring/config/NamespacePrefixTest.java  | 3 ---
 .../camel/spring/config/OnExceptionNoExceptionConfiguredTest.java | 3 ---
 .../config/OneRouteRefOnExceptionAndDLCErrorHandlerTest.java      | 3 ---
 .../config/OneRouteRefOnExceptionAndTwoDLCErrorHandlerTest.java   | 3 ---
 .../apache/camel/spring/config/OneRouteRefOnExceptionTest.java    | 3 ---
 .../OneRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java      | 3 ---
 .../camel/spring/config/OneRouteRefReverseOnExceptionTest.java    | 3 ---
 .../camel/spring/config/ProducerTemplateAlreadyExistTest.java     | 3 ---
 .../config/ProducerTemplateAutoRegisterBeanIdExistsTest.java      | 3 ---
 .../camel/spring/config/ProducerTemplateAutoRegisterTest.java     | 3 ---
 .../config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java  | 3 ---
 .../camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java  | 3 ---
 .../camel/spring/config/ProducerTemplateMaximumCacheSizeTest.java | 3 ---
 .../ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java    | 3 ---
 .../camel/spring/config/RouteAutoStartupPropertiesTest.java       | 3 ---
 .../java/org/apache/camel/spring/config/RouteBuilderRef2Test.java | 3 ---
 .../java/org/apache/camel/spring/config/RouteBuilderRefTest.java  | 3 ---
 .../apache/camel/spring/config/RouteRefIncludeXmlFileTest.java    | 3 ---
 .../camel/spring/config/RouteRefMultipleCamelContextRefsTest.java | 3 ---
 .../org/apache/camel/spring/config/RouteRefMultipleRefsTest.java  | 3 ---
 .../apache/camel/spring/config/RouteRefMultipleRoutesTest.java    | 3 ---
 .../RouteRefPropertyPlaceholderMultipleCamelContextRefsTest.java  | 3 ---
 .../test/java/org/apache/camel/spring/config/RouteRefTest.java    | 3 ---
 .../camel/spring/config/SpringCamelContextDependsOnTest.java      | 3 ---
 .../camel/spring/config/SpringCamelContextNoDependsOnTest.java    | 3 ---
 .../camel/spring/config/SpringErrorHandlerConfigFallbackTest.java | 3 ---
 .../apache/camel/spring/config/SpringErrorHandlerConfigTest.java  | 3 ---
 .../spring/config/SpringProduceInjectedPrototypeBeanTest.java     | 3 ---
 .../spring/config/SpringProduceInjectedSingletonBeanTest.java     | 3 ---
 .../java/org/apache/camel/spring/config/TemplateUsingBean.java    | 3 ---
 .../config/TwoRouteRefOnExceptionAndDLCErrorHandlerTest.java      | 3 ---
 .../apache/camel/spring/config/TwoRouteRefOnExceptionTest.java    | 3 ---
 .../TwoRouteRefReverseOnExceptionAndDLCErrorHandlerTest.java      | 3 ---
 .../camel/spring/config/TwoRouteRefReverseOnExceptionTest.java    | 3 ---
 .../java/org/apache/camel/spring/config/XmlConfigTestSupport.java | 3 ---
 .../org/apache/camel/spring/example/AnotherFooEventConsumer.java  | 3 ---
 .../org/apache/camel/spring/example/ContentBasedRouteTest.java    | 3 ---
 .../src/test/java/org/apache/camel/spring/example/DummyBean.java  | 3 ---
 .../java/org/apache/camel/spring/example/FooEventConsumer.java    | 3 ---
 .../java/org/apache/camel/spring/example/FooEventRouteTest.java   | 3 ---
 .../java/org/apache/camel/spring/example/MyCamel1Consumer.java    | 3 ---
 .../java/org/apache/camel/spring/example/MyCamel2Consumer.java    | 3 ---
 .../org/apache/camel/spring/example/MyCamel2RecipientList.java    | 3 ---
 .../src/test/java/org/apache/camel/spring/example/MyConsumer.java | 2 --
 .../test/java/org/apache/camel/spring/example/MyProcessor.java    | 3 ---
 .../src/test/java/org/apache/camel/spring/example/MySender.java   | 2 --
 .../test/java/org/apache/camel/spring/example/MyVmConsumer.java   | 2 --
 .../java/org/apache/camel/spring/example/PojoConsumerTest.java    | 3 ---
 .../camel/spring/example/PojoDualCamelContextConsumerTest.java    | 3 ---
 .../test/java/org/apache/camel/spring/example/PojoSenderTest.java | 3 ---
 .../java/org/apache/camel/spring/example/PojoVmConsumerTest.java  | 3 ---
 .../java/org/apache/camel/spring/example/SimpleRouteTest.java     | 3 ---
 .../org/apache/camel/spring/example/SpringExpressionTrimTest.java | 3 ---
 .../org/apache/camel/spring/example/SpringXPathFilterTest.java    | 3 ---
 .../org/apache/camel/spring/example/test1/MyRouteBuilder.java     | 3 ---
 .../camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java | 3 ---
 .../camel/spring/file/SpringFileConsumerPreMoveIssueTest.java     | 3 ---
 .../org/apache/camel/spring/file/SpringFileLanguageCBRTest.java   | 3 ---
 .../java/org/apache/camel/spring/file/SpringFileRouteTest.java    | 3 ---
 .../camel/spring/file/SpringSimpleFileNameWithQuoteTest.java      | 3 ---
 .../org/apache/camel/spring/interceptor/AnnotatedBookStore.java   | 3 ---
 .../org/apache/camel/spring/interceptor/AnnotatedConsume.java     | 3 ---
 .../org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java | 3 ---
 .../java/org/apache/camel/spring/interceptor/AnnotatedRoute.java  | 3 ---
 .../apache/camel/spring/interceptor/ContainerWideInterceptor.java | 3 ---
 .../camel/spring/interceptor/ContainerWideInterceptorTest.java    | 3 ---
 .../spring/interceptor/MixedStreamCachingInterceptorTest.java     | 3 ---
 .../spring/interceptor/SpringInterceptorStrategyOrderedTest.java  | 3 ---
 .../TransactionalClientDataSourceOnExceptionRedeliveryTest.java   | 3 ---
 .../interceptor/TransactionalClientDataSourceRedeliveryTest.java  | 3 ---
 ...nalClientDataSourceTransactedWithFileLocalOnExceptionTest.java | 3 ---
 ...actionalClientDataSourceTransactedWithFileOnExceptionTest.java | 3 ---
 .../TransactionalClientDataSourceTransactedWithFileTest.java      | 3 ---
 ...SourceWithTransactedErrorHandlerOnExceptionRedeliveryTest.java | 3 ---
 .../interceptor/TransactionalClientWithAnnotatedBeanTest.java     | 3 ---
 .../spring/interceptor/TransactionalClientWithRollbackTest.java   | 2 --
 .../src/test/java/org/apache/camel/spring/issues/CoolService.java | 3 ---
 .../java/org/apache/camel/spring/issues/CustomIdIssuesTest.java   | 3 ---
 .../camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java   | 3 ---
 .../src/test/java/org/apache/camel/spring/issues/MyCoolRoute.java | 3 ---
 .../src/test/java/org/apache/camel/spring/issues/MyCoolStuff.java | 3 ---
 .../org/apache/camel/spring/issues/MyInjectionRouteBuilder.java   | 3 ---
 .../test/java/org/apache/camel/spring/issues/MyRouteBuilder.java  | 3 ---
 .../test/java/org/apache/camel/spring/issues/MyStatefulBean.java  | 3 ---
 .../camel/spring/issues/ProduceSplitMethodCallIssueTest.java      | 3 ---
 .../org/apache/camel/spring/issues/SpringCatchNestedFailTest.java | 3 ---
 .../issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java    | 3 ---
 .../apache/camel/spring/issues/SpringFinallyNestedFailTest.java   | 3 ---
 .../java/org/apache/camel/spring/issues/SpringPackageTest.java    | 3 ---
 .../issues/SpringPropertyPlaceholderFileEndpointIssueTest.java    | 3 ---
 .../camel/spring/issues/SpringPropertyPlaceholderIssueTest.java   | 3 ---
 .../camel/spring/issues/SpringRenameFileOnCommitIssueTest.java    | 3 ---
 .../camel/spring/issues/SpringSingletonScopedBeanIssueTest.java   | 3 ---
 ...ansactionErrorHandlerAndContextScopedOnExceptionIssueTest.java | 3 ---
 .../spring/issues/SpringTryCatchFinallyAndErrorHandlerTest.java   | 3 ---
 .../camel/spring/issues/SpringTryCatchWithSplitIssueTest.java     | 3 ---
 .../spring/issues/SpringTryCatchWithSplitNotHandledIssueTest.java | 3 ---
 .../org/apache/camel/spring/issues/SpringTryNestedFailTest.java   | 3 ---
 .../spring/issues/SpringTwoCamelContextDirectEndpointTest.java    | 3 ---
 .../java/org/apache/camel/spring/issues/contextscan/MyRoute.java  | 3 ---
 .../issues/contextscan/SpringRouteIsComponentAnnotatedTest.java   | 3 ---
 .../org/apache/camel/spring/issues/contextscan2/MyOtherRoute.java | 3 ---
 .../issues/contextscan2/SpringRouteIsComponentAnnotated2Test.java | 3 ---
 .../management/DualCamelContextManagedAutoAssignedNameTest.java   | 3 ---
 .../camel/spring/management/DualCamelContextManagedTest.java      | 3 ---
 .../java/org/apache/camel/spring/management/MyEventNotifier.java  | 3 ---
 .../spring/management/SpringDualLoggingEventNotifierTest.java     | 3 ---
 .../camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java  | 3 ---
 .../management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java   | 3 ---
 .../camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java     | 3 ---
 .../spring/management/SpringJmxEndpointInjectBeanRefTest.java     | 3 ---
 .../spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java  | 3 ---
 .../camel/spring/management/SpringJmxEndpointInjectBeanTest.java  | 3 ---
 .../management/SpringJmxRecipientListRegisterAlwaysTest.java      | 3 ---
 .../camel/spring/management/SpringJmxRecipientListTest.java       | 3 ---
 .../camel/spring/management/SpringLoggingEventNotifierTest.java   | 3 ---
 .../camel/spring/management/SpringManagedCustomProcessorTest.java | 3 ---
 .../camel/spring/management/SpringManagedErrorHandlerTest.java    | 3 ---
 .../spring/management/SpringManagedNamePatternFixedTest.java      | 3 ---
 .../camel/spring/management/SpringManagedNamePatternTest.java     | 3 ---
 .../SpringManagedRouteRemoveContextScopedErrorHandlerTest.java    | 3 ---
 ...ngManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java | 3 ---
 .../SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java      | 3 ---
 .../apache/camel/spring/management/SpringManagedSanitizeTest.java | 3 ---
 .../spring/management/SpringManagedStatisticsLevelOffTest.java    | 3 ---
 .../management/SpringManagedStatisticsLevelRoutesOnlyTest.java    | 3 ---
 .../camel/spring/management/SpringPublishEventNotifierTest.java   | 3 ---
 .../src/test/java/org/apache/camel/spring/mock/BeanMockTest.java  | 3 ---
 .../spring/mock/InterceptSendToMockEndpointStrategyTest.java      | 3 ---
 .../src/test/java/org/apache/camel/spring/mock/MyAssertions.java  | 2 --
 .../test/java/org/apache/camel/spring/patterns/FilterTest.java    | 4 +---
 .../postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java | 3 ---
 .../org/apache/camel/spring/postprocessor/MagicAnnotation.java    | 3 ---
 .../spring/postprocessor/MyRouteBuilderWithAutowiredPojo.java     | 3 ---
 .../PlainSpringCustomPostProcessorOnRouteBuilderTest.java         | 3 ---
 .../test/java/org/apache/camel/spring/postprocessor/TestPojo.java | 3 ---
 .../test/java/org/apache/camel/spring/processor/MyAggregator.java | 2 --
 .../test/java/org/apache/camel/spring/processor/MyCoolBean.java   | 3 ---
 .../test/java/org/apache/camel/spring/processor/MyProcessor.java  | 2 --
 .../camel/spring/processor/SpringAggregateFromWireTapTest.java    | 3 ---
 .../spring/processor/SpringAggregatorWithCustomStrategyTest.java  | 3 ---
 .../processor/SpringBatchResequencerAllowDuplicatesTest.java      | 3 ---
 .../spring/processor/SpringBatchResequencerJMSPriorityTest.java   | 3 ---
 .../camel/spring/processor/SpringCBRHeaderPredicateTest.java      | 3 ---
 .../java/org/apache/camel/spring/processor/SpringChoiceTest.java  | 3 ---
 .../camel/spring/processor/SpringComplexBlockWithEndTest.java     | 3 ---
 .../apache/camel/spring/processor/SpringCustomExpressionTest.java | 3 ---
 .../apache/camel/spring/processor/SpringCustomPredicateTest.java  | 3 ---
 .../camel/spring/processor/SpringCustomProcessorFactoryTest.java  | 3 ---
 .../SpringDeadLetterChannelLogExhaustedMessageHistoryTest.java    | 3 ---
 .../spring/processor/SpringDeadLetterChannelNoRedeliveryTest.java | 3 ---
 .../processor/SpringDeadLetterChannelUseOriginalBodyNewTest.java  | 3 ---
 .../processor/SpringDeadLetterChannelUseOriginalBodyTest.java     | 3 ---
 .../SpringDeadLetterChannelUseOriginalBodyWithFileTest.java       | 3 ---
 .../SpringDefaultErrorHandlerExchangeFormatterRefTest.java        | 3 ---
 .../SpringDefaultErrorHandlerLogExhaustedMessageHistoryTest.java  | 3 ---
 .../spring/processor/SpringDefaultErrorHandlerRetryWhileTest.java | 3 ---
 .../apache/camel/spring/processor/SpringDelayerPerRouteTest.java  | 3 ---
 .../processor/SpringErrorHandlerRedeliveryPolicyProfileTest.java  | 3 ---
 .../processor/SpringEventNotifierExchangeSentExampleTest.java     | 3 ---
 .../processor/SpringFailoverMaximumFailoverAttemptsTest.java      | 3 ---
 .../spring/processor/SpringFailoverRoundRobinStickyTest.java      | 3 ---
 .../camel/spring/processor/SpringFailoverRoundRobinTest.java      | 3 ---
 .../apache/camel/spring/processor/SpringFilterNoChildTest.java    | 3 ---
 .../java/org/apache/camel/spring/processor/SpringFilterTest.java  | 3 ---
 .../org/apache/camel/spring/processor/SpringFromEndpointTest.java | 3 ---
 .../camel/spring/processor/SpringFromMultipleEndpointTest.java    | 3 ---
 .../camel/spring/processor/SpringHandleFaultPerRouteTest.java     | 3 ---
 .../SpringIdempotentConsumerNoSkipDuplicateFilterTest.java        | 3 ---
 .../processor/SpringIdempotentConsumerNoSkipDuplicateTest.java    | 3 ---
 .../camel/spring/processor/SpringIdempotentConsumerTest.java      | 3 ---
 .../spring/processor/SpringInheritErrorHandlerDefaultTest.java    | 3 ---
 .../spring/processor/SpringInheritErrorHandlerFalseTest.java      | 3 ---
 .../camel/spring/processor/SpringInheritErrorHandlerTrueTest.java | 3 ---
 .../processor/SpringInterceptSendToEndpointDynamicTest.java       | 3 ---
 .../processor/SpringInterceptSendToEndpointInOnExceptionTest.java | 3 ---
 .../spring/processor/SpringInterceptSendToEndpointSkipTest.java   | 3 ---
 .../camel/spring/processor/SpringInterceptSendToEndpointTest.java | 3 ---
 .../spring/processor/SpringInterceptSendToEndpointWhenTest.java   | 3 ---
 .../org/apache/camel/spring/processor/SpringLoopCopyTest.java     | 3 ---
 .../org/apache/camel/spring/processor/SpringLoopDoWhileTest.java  | 3 ---
 .../org/apache/camel/spring/processor/SpringLoopNoCopyTest.java   | 3 ---
 .../java/org/apache/camel/spring/processor/SpringLoopTest.java    | 3 ---
 .../spring/processor/SpringMessageHistoryDumpRoutingTest.java     | 3 ---
 .../org/apache/camel/spring/processor/SpringMethodCallTest.java   | 3 ---
 .../spring/processor/SpringMulticastNoStopOnExceptionTest.java    | 3 ---
 .../camel/spring/processor/SpringMulticastOnPrepareTest.java      | 3 ---
 .../spring/processor/SpringMulticastStopOnExceptionTest.java      | 3 ---
 .../camel/spring/processor/SpringMulticastSubUnitOfWorkTest.java  | 3 ---
 .../camel/spring/processor/SpringNestedChoiceIssueTest.java       | 3 ---
 .../SpringOnCompletionAndInterceptAndOnExceptionGlobalTest.java   | 3 ---
 .../processor/SpringOnCompletionAndInterceptGlobalTest.java       | 3 ---
 .../spring/processor/SpringOnCompletionAndInterceptTest.java      | 3 ---
 .../camel/spring/processor/SpringOnCompletionGlobalTest.java      | 3 ---
 .../apache/camel/spring/processor/SpringOnCompletionModeTest.java | 3 ---
 .../spring/processor/SpringOnCompletionOnCompleteOnlyTest.java    | 3 ---
 .../spring/processor/SpringOnCompletionOnFailureOnlyTest.java     | 3 ---
 .../SpringOnCompletionRouteScopeOverrideGlobalScopeTest.java      | 3 ---
 .../org/apache/camel/spring/processor/SpringOnCompletionTest.java | 3 ---
 .../spring/processor/SpringOnCompletionUseOriginalBodyTest.java   | 3 ---
 .../apache/camel/spring/processor/SpringOnCompletionWhenTest.java | 3 ---
 .../spring/processor/SpringOnExceptionContinueToRouteTest.java    | 3 ---
 .../camel/spring/processor/SpringPolicyPerProcessorTest.java      | 3 ---
 .../apache/camel/spring/processor/SpringPolicyPerRouteTest.java   | 3 ---
 .../camel/spring/processor/SpringRecipientListOnPrepareTest.java  | 3 ---
 .../spring/processor/SpringRecipientListSubUnitOfWorkTest.java    | 3 ---
 .../camel/spring/processor/SpringRedeliverToSubRouteTest.java     | 3 ---
 .../SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java   | 3 ---
 .../processor/SpringResequenceStreamRejectOldExchangesTest.java   | 3 ---
 .../org/apache/camel/spring/processor/SpringResequencerTest.java  | 3 ---
 .../camel/spring/processor/SpringRouteNoAutoStartupTest.java      | 3 ---
 .../apache/camel/spring/processor/SpringRoutePoliciesTest.java    | 3 ---
 .../camel/spring/processor/SpringRouteStartupOrderSimpleTest.java | 3 ---
 .../camel/spring/processor/SpringRouteStartupOrderTest.java       | 3 ---
 .../spring/processor/SpringRouteStartupOrderWithDefaultTest.java  | 3 ---
 .../SpringRouteWithConstantFieldFromExchangeFailTest.java         | 3 ---
 .../processor/SpringRouteWithConstantFieldFromExchangeTest.java   | 3 ---
 .../apache/camel/spring/processor/SpringScriptExternalTest.java   | 3 ---
 .../java/org/apache/camel/spring/processor/SpringScriptTest.java  | 3 ---
 .../org/apache/camel/spring/processor/SpringSetFaultBodyTest.java | 3 ---
 .../spring/processor/SpringShutdownCompleteAllTasksTest.java      | 3 ---
 .../processor/SpringShutdownCompleteCurrentTaskOnlyTest.java      | 3 ---
 .../camel/spring/processor/SpringSplitCustomExpressionTest.java   | 3 ---
 .../camel/spring/processor/SpringSplitGroupMultiLinesTest.java    | 3 ---
 .../camel/spring/processor/SpringSplitGroupSkipFirstTest.java     | 3 ---
 .../camel/spring/processor/SpringSplitSubUnitOfWorkTest.java      | 3 ---
 .../spring/processor/SpringSplitTokenizerGroupDynamicTest.java    | 3 ---
 .../org/apache/camel/spring/processor/SpringSplitterBodyTest.java | 3 ---
 .../camel/spring/processor/SpringSplitterMethodCallTest.java      | 3 ---
 .../spring/processor/SpringSplitterNoStopOnExceptionTest.java     | 3 ---
 .../camel/spring/processor/SpringSplitterOnPrepareTest.java       | 3 ---
 .../camel/spring/processor/SpringSplitterStopOnExceptionTest.java | 3 ---
 .../camel/spring/processor/SpringStreamCachingPerRouteTest.java   | 3 ---
 .../camel/spring/processor/SpringStreamCachingStrategyTest.java   | 3 ---
 .../java/org/apache/camel/spring/processor/SpringTestHelper.java  | 3 ---
 .../spring/processor/SpringThrottlingInflightRoutePolicyTest.java | 3 ---
 .../camel/spring/processor/SpringThrowExceptionMessageTest.java   | 3 ---
 .../apache/camel/spring/processor/SpringThrowExceptionTest.java   | 3 ---
 .../org/apache/camel/spring/processor/SpringTokenizerTest.java    | 3 ---
 .../java/org/apache/camel/spring/processor/SpringTraceTest.java   | 3 ---
 .../camel/spring/processor/SpringTraceUsingPropertyTest.java      | 3 ---
 .../org/apache/camel/spring/processor/SpringTransformTest.java    | 3 ---
 .../apache/camel/spring/processor/SpringValidateRegExpTest.java   | 3 ---
 .../camel/spring/processor/SpringWireTapExpressionTest.java       | 3 ---
 .../apache/camel/spring/processor/SpringWireTapOnPrepareTest.java | 3 ---
 .../org/apache/camel/spring/processor/SpringXPathFilterTest.java  | 3 ---
 .../spring/processor/SpringXPathFilterWithNamespaceTest.java      | 3 ---
 .../src/test/java/org/apache/camel/spring/processor/XsltTest.java | 3 ---
 .../aggregator/SpringAggregateCompleteAllOnStopTest.java          | 3 ---
 .../aggregator/SpringAggregateCompletionIntervalTest.java         | 3 ---
 .../processor/aggregator/SpringAggregateControllerTest.java       | 3 ---
 .../processor/aggregator/SpringAggregateDiscardOnTimeoutTest.java | 3 ---
 .../aggregator/SpringAggregateExpressionSizeFallbackTest.java     | 3 ---
 .../processor/aggregator/SpringAggregateExpressionSizeTest.java   | 3 ---
 .../aggregator/SpringAggregateExpressionTimeoutFallbackTest.java  | 3 ---
 .../aggregator/SpringAggregateExpressionTimeoutPerGroupTest.java  | 3 ---
 .../aggregator/SpringAggregateExpressionTimeoutTest.java          | 3 ---
 .../aggregator/SpringAggregateForceCompletionOnStopTest.java      | 3 ---
 ...pringAggregateGroupedExchangeCompletionExpressionSizeTest.java | 3 ---
 .../aggregator/SpringAggregateSimplePredicateEagerTest.java       | 3 ---
 .../processor/aggregator/SpringAggregateSimplePredicateTest.java  | 3 ---
 .../processor/aggregator/SpringAggregateSimpleSizeTest.java       | 3 ---
 .../processor/aggregator/SpringAggregateSimpleTimeoutTest.java    | 3 ---
 .../aggregator/SpringAggregateThreadPoolProfileTest.java          | 3 ---
 .../SpringAggregationStrategyBeanAdapterAllowNullTest.java        | 3 ---
 .../SpringAggregationStrategyBeanAdapterRefMethodNameTest.java    | 3 ---
 .../aggregator/SpringAggregationStrategyBeanAdapterRefTest.java   | 3 ---
 .../camel/spring/processor/aggregator/SpringAggregatorTest.java   | 3 ---
 .../onexception/SpringOnExceptionContinueSubRouteTest.java        | 3 ---
 .../onexception/SpringOnExceptionContinueSubSubRouteTest.java     | 3 ---
 .../processor/onexception/SpringOnExceptionContinueTest.java      | 3 ---
 .../SpringOnExceptionFromChoiceUseOriginalBodyTest.java           | 3 ---
 .../onexception/SpringOnExceptionLoadBalancerDoubleIssueTest.java | 3 ---
 .../SpringOnExceptionOccurredProcessorOnExceptionTest.java        | 3 ---
 .../onexception/SpringOnExceptionOccurredProcessorTest.java       | 3 ---
 .../onexception/SpringOnExceptionUseOriginalBodyTest.java         | 3 ---
 .../onexception/SpringOnExceptionUseOriginalMessageTest.java      | 3 ---
 .../onexception/SpringOnExceptionWithRouteAndContinueTest.java    | 3 ---
 .../src/test/java/org/apache/camel/spring/produce/MyCoolBean.java | 3 ---
 .../src/test/java/org/apache/camel/spring/produce/MyListener.java | 3 ---
 .../java/org/apache/camel/spring/produce/MyListenerService.java   | 3 ---
 .../test/java/org/apache/camel/spring/produce/ProduceTest.java    | 3 ---
 .../src/test/java/org/apache/camel/spring/remoting/Echo.java      | 3 ---
 .../src/test/java/org/apache/camel/spring/remoting/EchoPojo.java  | 3 ---
 .../java/org/apache/camel/spring/remoting/EchoPojoDirect.java     | 3 ---
 .../test/java/org/apache/camel/spring/remoting/EchoService.java   | 3 ---
 .../camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java   | 3 ---
 .../apache/camel/spring/remoting/EchoSpringRemotingPojoTest.java  | 3 ---
 .../remoting/EchoSpringRemotingThrowingRuntimeExceptionTest.java  | 3 ---
 ...tiArgumentsWithDefaultBindingSpringRemotingPojoDirectTest.java | 3 ---
 .../org/apache/camel/spring/remoting/MyEchoRuntimeException.java  | 3 ---
 .../remoting/MyMultiArgumentSpringRemotingPojoDirectTest.java     | 3 ---
 .../camel/spring/remoting/SpringRemotingBeanConverterTest.java    | 3 ---
 .../org/apache/camel/spring/remoting/SpringRemotingRouteTest.java | 3 ---
 .../camel/spring/remoting/SpringRemotingWithOneWayTest.java       | 3 ---
 .../SpringRemotingWithServiceExportAndNamespacesRouteTest.java    | 3 ---
 .../spring/remoting/SpringRemotingWithServiceExportRouteTest.java | 3 ---
 .../apache/camel/spring/routebuilder/CamelRouteBuilderTest.java   | 3 ---
 .../java/org/apache/camel/spring/routebuilder/MyOtherRoute.java   | 3 ---
 .../test/java/org/apache/camel/spring/routebuilder/MyRoute.java   | 3 ---
 .../java/org/apache/camel/spring/util/EndpointHelperTest.java     | 3 ---
 .../test/java/org/apache/camel/spring/util/MainRunnerTest.java    | 3 ---
 .../java/org/apache/camel/spring/xml/ConfiguredRouteBuilder.java  | 3 ---
 .../java/org/apache/camel/spring/xml/ConfiguredRouteBuilder2.java | 3 ---
 .../org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java    | 2 --
 .../main/java/org/apache/camel/component/sql/SqlComponent.java    | 1 -
 .../org/apache/camel/component/sql/SpringSqlEndpointLikeTest.java | 3 ---
 .../org/apache/camel/component/sql/SpringSqlMultilineTest.java    | 3 ---
 .../java/org/apache/camel/component/sql/SqlDataSourceRefTest.java | 3 ---
 .../java/org/apache/camel/component/sql/SqlEndpointLikeTest.java  | 3 ---
 .../test/java/org/apache/camel/component/sql/SqlEndpointTest.java | 3 ---
 .../org/apache/camel/component/sql/SqlPreserveHeaderTest.java     | 3 ---
 .../sql/SqlProducerAlwaysPopulateStatementFalseTest.java          | 3 ---
 .../component/sql/SqlProducerAlwaysPopulateStatementTest.java     | 3 ---
 .../org/apache/camel/component/sql/SqlProducerConcurrentTest.java | 3 ---
 .../camel/component/sql/SqlProducerExpressionParameterTest.java   | 3 ---
 .../org/apache/camel/component/sql/SqlProducerInsertNullTest.java | 3 ---
 .../java/org/apache/camel/component/sql/SqlProducerJSONTest.java  | 3 ---
 .../component/sql/SqlProducerNamedParameterNotExistTest.java      | 3 ---
 .../apache/camel/component/sql/SqlProducerNamedParameterTest.java | 3 ---
 .../camel/component/sql/SqlProducerNamedParametersTest.java       | 3 ---
 .../apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java | 3 ---
 .../org/apache/camel/component/sql/SqlProducerNullBodyTest.java   | 3 ---
 .../camel/component/sql/SqlProducerOutputTypeSelectListTest.java  | 3 ---
 .../sql/SqlProducerOutputTypeSelectListWithClassTest.java         | 3 ---
 .../camel/component/sql/SqlProducerOutputTypeSelectOneTest.java   | 3 ---
 .../camel/component/sql/SqlProducerParametersCountTest.java       | 3 ---
 .../apache/camel/component/sql/SqlProducerReuseParameterTest.java | 3 ---
 .../org/apache/camel/component/sql/SqlProducerSeparatorTest.java  | 3 ---
 .../test/java/org/apache/camel/component/sql/SqlRouteTest.java    | 3 ---
 .../org/apache/camel/component/sql/SqlTransactedRouteTest.java    | 3 ---
 .../org/apache/camel/component/stream/StreamGroupLinesTest.java   | 3 ---
 .../camel/component/stringtemplate/StringTemplateComponent.java   | 3 ---
 .../component/stringtemplate/StringTemplateConcurrentTest.java    | 3 ---
 .../org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java | 1 -
 .../dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java     | 3 ---
 .../dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java      | 3 ---
 .../java/org/apache/camel/test/junit4/ExchangeTestSupport.java    | 2 --
 .../src/main/java/org/apache/camel/test/junit4/TestSupport.java   | 2 --
 .../test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java | 3 ---
 .../apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java  | 3 ---
 .../src/test/java/org/apache/camel/test/patterns/DebugTest.java   | 3 ---
 .../camel/test/patterns/FilterCreateCamelContextPerClassTest.java | 2 --
 .../org/apache/camel/test/patterns/FilterFluentTemplateTest.java  | 2 --
 .../java/org/apache/camel/test/patterns/FilterJUnit4Test.java     | 2 --
 .../src/test/java/org/apache/camel/test/patterns/FilterTest.java  | 2 --
 .../camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java     | 3 ---
 .../org/apache/camel/test/patterns/IsMockEndpointsFileTest.java   | 3 ---
 .../org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java | 3 ---
 .../java/org/apache/camel/test/patterns/IsMockEndpointsTest.java  | 3 ---
 .../org/apache/camel/component/velocity/VelocityComponent.java    | 3 ---
 .../camel/component/velocity/VelocityBodyAsDomainObjectTest.java  | 2 --
 .../apache/camel/component/velocity/VelocityConcurrentTest.java   | 3 ---
 .../org/apache/camel/component/velocity/VelocityEndpointTest.java | 3 ---
 .../apache/camel/component/velocity/VelocitySetHeaderTest.java    | 3 ---
 .../camel/component/velocity/VelocityTemplateInHeaderTest.java    | 3 ---
 .../org/apache/camel/component/vertx/VertxRequestReplyTest.java   | 3 ---
 .../org/apache/camel/component/vertx/VertxRoutePubSubTest.java    | 3 ---
 .../java/org/apache/camel/component/vertx/VertxRouteTest.java     | 3 ---
 .../apache/camel/component/weather/http/AuthenticationMethod.java | 2 --
 .../apache/camel/component/weather/http/HttpClientConfigurer.java | 2 --
 .../xmlsecurity/api/DefaultXAdESSignatureProperties.java          | 1 -
 .../camel/component/xmlsecurity/api/XAdESEncapsulatedPKIData.java | 1 -
 .../camel/component/xmlsecurity/api/XmlSignatureChecker.java      | 1 -
 .../camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java  | 3 ---
 .../main/java/org/apache/camel/component/xmpp/XmppComponent.java  | 3 ---
 .../org/apache/camel/component/xmpp/XmppGroupChatProducer.java    | 3 ---
 .../org/apache/camel/component/xmpp/XmppPrivateChatProducer.java  | 3 ---
 .../org/apache/camel/component/xmpp/UriConfigurationTest.java     | 3 ---
 .../org/apache/camel/component/xmpp/XmppMultiUserChatTest.java    | 3 ---
 .../apache/camel/component/xmpp/XmppProducerConcurrentTest.java   | 3 ---
 .../java/org/apache/camel/component/xmpp/XmppRouteChatTest.java   | 3 ---
 .../xmpp/XmppRouteMultipleProducersSingleConsumerTest.java        | 3 ---
 .../java/org/apache/camel/dataformat/xstream/JsonDataFormat.java  | 2 --
 .../org/apache/camel/dataformat/xstream/XStreamDataFormat.java    | 2 --
 .../java/org/apache/camel/dataformat/xstream/PurchaseOrder.java   | 3 ---
 .../dataformat/xstream/SpringMarshalDomainObjectJSONTest.java     | 3 ---
 .../camel/dataformat/xstream/SpringMarshalOmitFieldsTest.java     | 3 ---
 .../apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java | 3 ---
 .../apache/camel/dataformat/xstream/XStreamConcurrencyTest.java   | 3 ---
 .../camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java | 3 ---
 .../org/apache/camel/dataformat/xstream/XStreamTestUtils.java     | 3 ---
 .../zookeepermaster/group/internal/ZooKeeperGroupFactory.java     | 2 --
 .../java/org/apache/camel/example/NumberAggregationStrategy.java  | 2 --
 .../main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java | 2 --
 .../java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java  | 3 ---
 .../main/java/org/apache/camel/example/cxf/proxy/EnrichBean.java  | 2 --
 .../src/main/java/org/apache/camel/example/cxf/proxy/MyMain.java  | 2 --
 .../org/apache/camel/example/cxf/proxy/RealWebServiceBean.java    | 2 --
 .../camel/example/cxf/proxy/ReportIncidentEndpointService.java    | 2 --
 .../src/main/java/org/apache/camel/example/cxf/CamelRoute.java    | 2 --
 .../org/apache/camel/example/cxf/incident/IncidentService.java    | 2 --
 .../apache/camel/example/cxf/incident/InputReportIncident.java    | 3 ---
 .../apache/camel/example/cxf/incident/InputStatusIncident.java    | 3 ---
 .../apache/camel/example/cxf/incident/OutputReportIncident.java   | 3 ---
 .../apache/camel/example/cxf/incident/OutputStatusIncident.java   | 3 ---
 .../java/org/apache/camel/example/management/StockService.java    | 3 ---
 .../apache/camel/example/management/ManagementExampleTest.java    | 3 ---
 .../java/org/apache/camel/example/micrometer/IntegrationTest.java | 3 ---
 .../java/org/apache/camel/example/springboot/UserService.java     | 1 -
 .../apache/camel/example/spring/javaconfig/IntegrationTest.java   | 3 ---
 .../main/java/org/apache/camel/example/spring/MyRouteBuilder.java | 2 --
 .../java/org/apache/camel/example/spring/IntegrationTest.java     | 3 ---
 .../org/apache/camel/component/cxf/jaxrs/testbean/Customer.java   | 4 ----
 .../camel/component/cxf/jaxrs/testbean/CustomerService.java       | 4 ----
 .../java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java | 4 ----
 .../org/apache/camel/component/cxf/jaxrs/testbean/Product.java    | 4 ----
 .../apache/camel/itest/standalone/CamelContextStandaloneTest.java | 3 ---
 .../src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java  | 2 --
 .../java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java  | 3 ---
 .../test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java  | 3 ---
 .../src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java | 3 ---
 .../src/test/java/org/apache/camel/itest/async/HttpSyncTest.java  | 3 ---
 .../test/java/org/apache/camel/itest/async/MyAsyncComponent.java  | 3 ---
 .../test/java/org/apache/camel/itest/async/MyAsyncEndpoint.java   | 3 ---
 .../test/java/org/apache/camel/itest/async/MyAsyncProducer.java   | 3 ---
 .../org/apache/camel/itest/idempotent/IdempotentConsumerTest.java | 3 ---
 .../apache/camel/itest/idempotent/JdbcIdempotentRepository.java   | 3 ---
 .../src/test/java/org/apache/camel/itest/issues/BaseClass.java    | 3 ---
 .../org/apache/camel/itest/issues/BeanCallDerivedClassTest.java   | 3 ---
 .../src/test/java/org/apache/camel/itest/issues/DerivedClass.java | 3 ---
 .../java/org/apache/camel/itest/issues/RemoveEndpointsTest.java   | 3 ---
 .../java/org/apache/camel/itest/issues/RssToHttpIssueTest.java    | 3 ---
 .../org/apache/camel/itest/jaxb/SpringLoadRouteFromXmlTest.java   | 3 ---
 .../org/apache/camel/itest/jetty/JettyConstantSetHeaderTest.java  | 3 ---
 .../org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java | 3 ---
 .../org/apache/camel/itest/jetty/JettyGroovySetHeaderTest.java    | 3 ---
 .../org/apache/camel/itest/jetty/JettySimpleSetHeaderTest.java    | 3 ---
 .../camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java    | 3 ---
 .../camel/itest/jetty/JettySpringFailoverRoundRobinTest.java      | 3 ---
 .../org/apache/camel/itest/jetty/JettyValidatorStreamTest.java    | 3 ---
 .../jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java   | 3 ---
 .../java/org/apache/camel/itest/jms/InvalidOrderException.java    | 3 ---
 .../src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java  | 2 --
 .../java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java     | 2 --
 .../org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java  | 2 --
 .../test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java  | 3 ---
 .../src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java     | 3 ---
 .../org/apache/camel/itest/jms/JmsMediumQueuePerformanceTest.java | 3 ---
 .../test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java  | 3 ---
 .../test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java   | 3 ---
 .../java/org/apache/camel/itest/jms/JmsPollingConsumerTest.java   | 3 ---
 .../test/java/org/apache/camel/itest/jms/JmsValidatorTest.java    | 3 ---
 .../src/test/java/org/apache/camel/itest/jms/PurchaseOrder.java   | 3 ---
 .../java/org/apache/camel/itest/jms/SpringJmsValidatorTest.java   | 3 ---
 .../test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java  | 2 --
 .../src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java   | 2 --
 .../src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java  | 2 --
 ...WithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java | 2 --
 .../org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java | 2 --
 .../org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java    | 2 --
 ...ithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java | 2 --
 .../org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java  | 2 --
 .../org/apache/camel/itest/tx/JmsToHttpWithRollbackRoute.java     | 2 --
 .../test/java/org/apache/camel/tests/partialclasspath/MyBean.java | 3 ---
 .../java/org/apache/camel/tests/partialclasspath/MyConverter.java | 3 ---
 .../java/org/apache/camel/tests/partialclasspath/RouteTest.java   | 3 ---
 .../java/org/apache/camel/tests/typeconverterscan/MyBean.java     | 3 ---
 .../org/apache/camel/tests/typeconverterscan/MyConverter.java     | 3 ---
 .../java/org/apache/camel/tests/typeconverterscan/RouteTest.java  | 3 ---
 3764 files changed, 11 insertions(+), 10176 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java b/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java
index 285348d..bb03615 100644
--- a/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java
+++ b/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Exception thrown in situations when a {@link Service} has already been stopped.
- *
- * @version 
  */
 public class AlreadyStoppedException extends CamelException {
     private static final long serialVersionUID = -8721487434390572639L;
diff --git a/camel-core/src/main/java/org/apache/camel/AsyncCallback.java b/camel-core/src/main/java/org/apache/camel/AsyncCallback.java
index e6e6a51..a3b12b3 100644
--- a/camel-core/src/main/java/org/apache/camel/AsyncCallback.java
+++ b/camel-core/src/main/java/org/apache/camel/AsyncCallback.java
@@ -24,8 +24,6 @@ package org.apache.camel;
  * to be continued routed. This allows to implement asynchronous {@link Producer} which can continue
  * routing {@link Exchange} when all the data has been gathered. This allows to build non blocking
  * request/reply communication.
- *
- * @version 
  */
 public interface AsyncCallback {
 
diff --git a/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java b/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java
index bf967b7..e83130e 100644
--- a/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java
@@ -23,8 +23,6 @@ package org.apache.camel;
  * Any processor can be coerced to have an {@link AsyncProcessor} interface by using the
  * {@link org.apache.camel.util.AsyncProcessorConverterHelper#convert AsyncProcessorConverterHelper.convert}
  * method.
- *
- * @version 
  */
 public interface AsyncProcessor extends Processor {
 
diff --git a/camel-core/src/main/java/org/apache/camel/AttachmentObjects.java b/camel-core/src/main/java/org/apache/camel/AttachmentObjects.java
index 58d376f..fb18a4d 100644
--- a/camel-core/src/main/java/org/apache/camel/AttachmentObjects.java
+++ b/camel-core/src/main/java/org/apache/camel/AttachmentObjects.java
@@ -25,8 +25,6 @@ import java.lang.annotation.Target;
 /**
  * Marks a parameter as being Map of attachments as {@link Attachment} objects
  * of an inbound {@link Message}
- * 
- * @version
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/Attachments.java b/camel-core/src/main/java/org/apache/camel/Attachments.java
index d400534..773610f 100644
--- a/camel-core/src/main/java/org/apache/camel/Attachments.java
+++ b/camel-core/src/main/java/org/apache/camel/Attachments.java
@@ -25,8 +25,6 @@ import java.lang.annotation.Target;
 /**
  * Marks a parameter as being Map of attachments as
  * {@link javax.activation.DataHandler} objects of an inbound {@link Message}
- * 
- * @version
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/BatchConsumer.java b/camel-core/src/main/java/org/apache/camel/BatchConsumer.java
index 6c385b8..933d78a 100644
--- a/camel-core/src/main/java/org/apache/camel/BatchConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/BatchConsumer.java
@@ -20,8 +20,6 @@ import java.util.Queue;
 
 /**
  * A consumer of a batch of message exchanges from an {@link Endpoint}
- *
- * @version 
  */
 public interface BatchConsumer extends Consumer {
 
diff --git a/camel-core/src/main/java/org/apache/camel/BeanInject.java b/camel-core/src/main/java/org/apache/camel/BeanInject.java
index 09e70d0..90fa5ab 100644
--- a/camel-core/src/main/java/org/apache/camel/BeanInject.java
+++ b/camel-core/src/main/java/org/apache/camel/BeanInject.java
@@ -26,8 +26,6 @@ import java.lang.annotation.Target;
  * Used to indicate an injection point of a bean obtained from the {@link org.apache.camel.spi.Registry}, into a POJO.
  *
  * If no name is specified then the lookup is anonymous and based on lookup up by the type.
- *
- * @version
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/BinaryPredicate.java b/camel-core/src/main/java/org/apache/camel/BinaryPredicate.java
index aa57323..89e087d 100644
--- a/camel-core/src/main/java/org/apache/camel/BinaryPredicate.java
+++ b/camel-core/src/main/java/org/apache/camel/BinaryPredicate.java
@@ -24,8 +24,6 @@ package org.apache.camel;
  * <p/>
  * This predicate offers the {@link #matchesReturningFailureMessage} method
  * which evaluates and returns a detailed failure message if the predicate did not match.
- *
- * @version 
  */
 public interface BinaryPredicate extends Predicate {
 
diff --git a/camel-core/src/main/java/org/apache/camel/Body.java b/camel-core/src/main/java/org/apache/camel/Body.java
index 4a87a4d..69be06b 100644
--- a/camel-core/src/main/java/org/apache/camel/Body.java
+++ b/camel-core/src/main/java/org/apache/camel/Body.java
@@ -24,8 +24,6 @@ import java.lang.annotation.Target;
 
 /**
  * Marks a parameter as being the body of an inbound {@link Message}
- * 
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/BytesSource.java b/camel-core/src/main/java/org/apache/camel/BytesSource.java
index 1d8e652..d278663 100644
--- a/camel-core/src/main/java/org/apache/camel/BytesSource.java
+++ b/camel-core/src/main/java/org/apache/camel/BytesSource.java
@@ -27,8 +27,6 @@ import javax.xml.transform.stream.StreamSource;
 /**
  * A helper class which provides a JAXP {@link javax.xml.transform.Source
  * Source} from a byte[] which can be read as many times as required.
- * 
- * @version
  */
 public class BytesSource extends StreamSource implements Serializable {
     private static final long serialVersionUID = 124123201106542082L;
diff --git a/camel-core/src/main/java/org/apache/camel/CamelAuthorizationException.java b/camel-core/src/main/java/org/apache/camel/CamelAuthorizationException.java
index c747a18..67cce3a 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelAuthorizationException.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelAuthorizationException.java
@@ -21,8 +21,6 @@ package org.apache.camel;
  * An exception thrown for either authentication or authorization errors occurring
  * in a Camel exchange.  Intended to be used when a user is denied an action and
  * Camel should not process the message as a result.
- *
- * @version 
  */
 public class CamelAuthorizationException extends CamelExchangeException {
     private static final long serialVersionUID = 1L;
diff --git a/camel-core/src/main/java/org/apache/camel/CamelContext.java b/camel-core/src/main/java/org/apache/camel/CamelContext.java
index 2ebcb1e..3b32433 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelContext.java
@@ -96,8 +96,6 @@ import org.apache.camel.util.jsse.SSLContextParameters;
  * <p/>
  * End users are advised to use suspend/resume. Using stop is for shutting down Camel and it's not guaranteed that
  * when it's being started again using the start method that Camel will operate consistently.
- *
- * @version 
  */
 public interface CamelContext extends SuspendableService, RuntimeConfiguration {
 
diff --git a/camel-core/src/main/java/org/apache/camel/CamelContextAware.java b/camel-core/src/main/java/org/apache/camel/CamelContextAware.java
index 6118e7f..504b8d2 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelContextAware.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelContextAware.java
@@ -19,8 +19,6 @@ package org.apache.camel;
 /**
  * An interface to represent an object which wishes to be injected with
  * a {@link CamelContext} such as when working with Spring or Guice
- *
- * @version 
  */
 public interface CamelContextAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/CamelException.java b/camel-core/src/main/java/org/apache/camel/CamelException.java
index 971e059..32c39e9 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelException.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Base class for all Camel checked exceptions typically thrown by a {@link Processor}
- *
- * @version 
  */
 public class CamelException extends Exception {
     private static final long serialVersionUID = -8721487434390572630L;
diff --git a/camel-core/src/main/java/org/apache/camel/CamelExchangeException.java b/camel-core/src/main/java/org/apache/camel/CamelExchangeException.java
index f85be7e..0210bfb 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelExchangeException.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelExchangeException.java
@@ -19,8 +19,6 @@ package org.apache.camel;
 
 /**
  * An exception caused by a specific message {@link Exchange}
- *
- * @version 
  */
 public class CamelExchangeException extends CamelException {
     private static final long serialVersionUID = -8721487431101572630L;
diff --git a/camel-core/src/main/java/org/apache/camel/CamelExecutionException.java b/camel-core/src/main/java/org/apache/camel/CamelExecutionException.java
index 5d8c66a..560d352 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelExecutionException.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelExecutionException.java
@@ -21,8 +21,6 @@ package org.apache.camel;
  * <p/>
  * Is usually thrown to the caller when using the {@link org.apache.camel.ProducerTemplate}
  * to send messages to Camel.
- *
- * @version 
  */
 public class CamelExecutionException extends RuntimeExchangeException {
     private static final long serialVersionUID = -5821095325248904305L;
diff --git a/camel-core/src/main/java/org/apache/camel/Channel.java b/camel-core/src/main/java/org/apache/camel/Channel.java
index 829e46c..583b672 100644
--- a/camel-core/src/main/java/org/apache/camel/Channel.java
+++ b/camel-core/src/main/java/org/apache/camel/Channel.java
@@ -25,8 +25,6 @@ import org.apache.camel.spi.RouteContext;
  * Channel acts as a channel between {@link Processor}s in the route graph.
  * <p/>
  * The channel is responsible for routing the {@link Exchange} to the next {@link Processor} in the route graph.
- *
- * @version 
  */
 public interface Channel extends AsyncProcessor, Navigate<Processor> {
 
diff --git a/camel-core/src/main/java/org/apache/camel/Component.java b/camel-core/src/main/java/org/apache/camel/Component.java
index eae7d4d..26280a9 100644
--- a/camel-core/src/main/java/org/apache/camel/Component.java
+++ b/camel-core/src/main/java/org/apache/camel/Component.java
@@ -25,8 +25,6 @@ import org.apache.camel.component.extension.ComponentExtension;
 /**
  * A <a href="http://camel.apache.org/component.html">component</a> is
  * a factory of {@link Endpoint} objects.
- * 
- * @version 
  */
 public interface Component extends CamelContextAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/Consume.java b/camel-core/src/main/java/org/apache/camel/Consume.java
index 175e293..6debe24 100644
--- a/camel-core/src/main/java/org/apache/camel/Consume.java
+++ b/camel-core/src/main/java/org/apache/camel/Consume.java
@@ -30,8 +30,6 @@ import java.lang.annotation.Target;
  * When a message {@link Exchange} is received from the {@link Endpoint} then the
  * <a href="http://camel.apache.org/bean-integration.html">Bean Integration</a>
  * mechanism is used to map the incoming {@link Message} to the method parameters.
- * 
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/Consumer.java b/camel-core/src/main/java/org/apache/camel/Consumer.java
index 3c4719b..89def42 100644
--- a/camel-core/src/main/java/org/apache/camel/Consumer.java
+++ b/camel-core/src/main/java/org/apache/camel/Consumer.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * A consumer of message exchanges from an {@link Endpoint}
- *
- * @version 
  */
 public interface Consumer extends Service, EndpointAware {
 }
diff --git a/camel-core/src/main/java/org/apache/camel/Converter.java b/camel-core/src/main/java/org/apache/camel/Converter.java
index 5c83841..79b2234 100644
--- a/camel-core/src/main/java/org/apache/camel/Converter.java
+++ b/camel-core/src/main/java/org/apache/camel/Converter.java
@@ -27,8 +27,6 @@ import java.lang.annotation.Target;
  * converting from a type to another type which are then auto-discovered using
  * the <a href="http://camel.apache.org/type-converter.html">Type
  * Conversion Support</a>
- * 
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/DynamicRouter.java b/camel-core/src/main/java/org/apache/camel/DynamicRouter.java
index 3b0d357..1e94c4f 100644
--- a/camel-core/src/main/java/org/apache/camel/DynamicRouter.java
+++ b/camel-core/src/main/java/org/apache/camel/DynamicRouter.java
@@ -38,7 +38,6 @@ import java.lang.annotation.Target;
  * Then for each endpoint or URI the message is routed in a pipes and filter fashion.
  *
  * @see org.apache.camel.RoutingSlip
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/Endpoint.java b/camel-core/src/main/java/org/apache/camel/Endpoint.java
index 027a553..27ceceb 100644
--- a/camel-core/src/main/java/org/apache/camel/Endpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/Endpoint.java
@@ -27,7 +27,6 @@ import java.util.Map;
  *
  * @see Exchange
  * @see Message
- * @version 
  */
 public interface Endpoint extends IsSingleton, Service {
 
diff --git a/camel-core/src/main/java/org/apache/camel/EndpointInject.java b/camel-core/src/main/java/org/apache/camel/EndpointInject.java
index 0095601..a7a828e 100644
--- a/camel-core/src/main/java/org/apache/camel/EndpointInject.java
+++ b/camel-core/src/main/java/org/apache/camel/EndpointInject.java
@@ -31,8 +31,6 @@ import java.lang.annotation.Target;
  * {@link org.apache.camel.spi.Registry} such as in your Spring ApplicationContext.
  *
  * If no ref or uri is specified then the ref is defaulted from the field, property or method name.
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/Exchange.java b/camel-core/src/main/java/org/apache/camel/Exchange.java
index 55e14b9..2382e85 100644
--- a/camel-core/src/main/java/org/apache/camel/Exchange.java
+++ b/camel-core/src/main/java/org/apache/camel/Exchange.java
@@ -67,7 +67,6 @@ import org.apache.camel.spi.UnitOfWork;
  * <p/>
  * See this <a href="http://camel.apache.org/using-getin-or-getout-methods-on-exchange.html">FAQ entry</a> 
  * for more details.
- * 
  */
 public interface Exchange {
 
diff --git a/camel-core/src/main/java/org/apache/camel/ExchangePattern.java b/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
index 0a04900..341da64 100644
--- a/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
+++ b/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
@@ -24,8 +24,6 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * Represents the kind of message exchange pattern
- *
- * @version 
  */
 @XmlType
 @XmlEnum
diff --git a/camel-core/src/main/java/org/apache/camel/ExchangeProperties.java b/camel-core/src/main/java/org/apache/camel/ExchangeProperties.java
index f71b809..328eb8c 100644
--- a/camel-core/src/main/java/org/apache/camel/ExchangeProperties.java
+++ b/camel-core/src/main/java/org/apache/camel/ExchangeProperties.java
@@ -26,7 +26,6 @@ import java.lang.annotation.Target;
  * Marks a parameter as being an injection point of the exchange properties of an {@link Exchange}
  *
  * @see Exchange#getProperties()  
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/ExchangeProperty.java b/camel-core/src/main/java/org/apache/camel/ExchangeProperty.java
index d0731ac..2d2419c 100644
--- a/camel-core/src/main/java/org/apache/camel/ExchangeProperty.java
+++ b/camel-core/src/main/java/org/apache/camel/ExchangeProperty.java
@@ -26,7 +26,6 @@ import java.lang.annotation.Target;
  * Marks a parameter as being an injection point of a property of an {@link org.apache.camel.Exchange}
  *
  * @see org.apache.camel.Exchange#getProperty(String)
- * @version
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/ExchangeTimedOutException.java b/camel-core/src/main/java/org/apache/camel/ExchangeTimedOutException.java
index 3231703..f22a546 100644
--- a/camel-core/src/main/java/org/apache/camel/ExchangeTimedOutException.java
+++ b/camel-core/src/main/java/org/apache/camel/ExchangeTimedOutException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * An exception thrown if an InOut exchange times out receiving the OUT message
- *
- * @version 
  */
 public class ExchangeTimedOutException extends CamelExchangeException {
     private static final long serialVersionUID = -7899162905421788853L;
diff --git a/camel-core/src/main/java/org/apache/camel/ExecutorServiceAware.java b/camel-core/src/main/java/org/apache/camel/ExecutorServiceAware.java
index e7d9f8a..4a91379 100644
--- a/camel-core/src/main/java/org/apache/camel/ExecutorServiceAware.java
+++ b/camel-core/src/main/java/org/apache/camel/ExecutorServiceAware.java
@@ -20,8 +20,6 @@ import java.util.concurrent.ExecutorService;
 
 /**
  * Is used for easy configuration of {@link ExecutorService}.
- *
- * @version 
  */
 public interface ExecutorServiceAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java b/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
index 9c30660..982fee8 100644
--- a/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
+++ b/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Thrown if the body could not be converted to the required type
- * 
- * @version 
  */
 public class ExpectedBodyTypeException extends RuntimeCamelException {
     private static final long serialVersionUID = -7121445152234363768L;
diff --git a/camel-core/src/main/java/org/apache/camel/Expression.java b/camel-core/src/main/java/org/apache/camel/Expression.java
index 950e07a8..9c229d6 100644
--- a/camel-core/src/main/java/org/apache/camel/Expression.java
+++ b/camel-core/src/main/java/org/apache/camel/Expression.java
@@ -23,8 +23,6 @@ package org.apache.camel;
  * <a href="http://camel.apache.org/xquery.html">XQuery</a>
  * or <a href="http://camel.apache.org/sql.html">SQL</a> as well
  * as any arbitrary Java expression.
- *
- * @version 
  */
 public interface Expression {
 
diff --git a/camel-core/src/main/java/org/apache/camel/ExpressionEvaluationException.java b/camel-core/src/main/java/org/apache/camel/ExpressionEvaluationException.java
index 023b060..013fa48 100644
--- a/camel-core/src/main/java/org/apache/camel/ExpressionEvaluationException.java
+++ b/camel-core/src/main/java/org/apache/camel/ExpressionEvaluationException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * An exception thrown if evaluation of the expression failed.
- *
- * @version 
  */
 public class ExpressionEvaluationException extends RuntimeCamelException {
 
diff --git a/camel-core/src/main/java/org/apache/camel/ExpressionIllegalSyntaxException.java b/camel-core/src/main/java/org/apache/camel/ExpressionIllegalSyntaxException.java
index d88def5..7cd0693 100644
--- a/camel-core/src/main/java/org/apache/camel/ExpressionIllegalSyntaxException.java
+++ b/camel-core/src/main/java/org/apache/camel/ExpressionIllegalSyntaxException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * An exception thrown if the expression contains illegal syntax.
- *
- * @version 
  */
 public class ExpressionIllegalSyntaxException extends RuntimeCamelException {
     private static final long serialVersionUID = 6545652894842621836L;
diff --git a/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java b/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
index b89ec82..cf2a3ea 100644
--- a/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
+++ b/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Thrown if Camel failed to create a consumer for a given endpoint.
- *
- * @version 
  */
 public class FailedToCreateConsumerException extends RuntimeCamelException {
     private static final long serialVersionUID = 1916718168052020246L;
diff --git a/camel-core/src/main/java/org/apache/camel/FailedToCreateProducerException.java b/camel-core/src/main/java/org/apache/camel/FailedToCreateProducerException.java
index 56f0328..fa31d0c 100644
--- a/camel-core/src/main/java/org/apache/camel/FailedToCreateProducerException.java
+++ b/camel-core/src/main/java/org/apache/camel/FailedToCreateProducerException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Thrown if Camel failed to create a producer for a given endpoint.
- *
- * @version 
  */
 public class FailedToCreateProducerException extends RuntimeCamelException {
     private static final long serialVersionUID = 1341435621084082033L;
diff --git a/camel-core/src/main/java/org/apache/camel/FailedToCreateRouteException.java b/camel-core/src/main/java/org/apache/camel/FailedToCreateRouteException.java
index 00599b3..d6f9388 100644
--- a/camel-core/src/main/java/org/apache/camel/FailedToCreateRouteException.java
+++ b/camel-core/src/main/java/org/apache/camel/FailedToCreateRouteException.java
@@ -20,8 +20,6 @@ import org.apache.camel.util.URISupport;
 
 /**
  * Exception when failing to create a {@link org.apache.camel.Route}.
- *
- * @version 
  */
 public class FailedToCreateRouteException extends CamelException {
     private static final long serialVersionUID = 1L;
diff --git a/camel-core/src/main/java/org/apache/camel/FailedToStartRouteException.java b/camel-core/src/main/java/org/apache/camel/FailedToStartRouteException.java
index 729180a..6af6704 100644
--- a/camel-core/src/main/java/org/apache/camel/FailedToStartRouteException.java
+++ b/camel-core/src/main/java/org/apache/camel/FailedToStartRouteException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Exception when failing to start a {@link Route}.
- *
- * @version 
  */
 public class FailedToStartRouteException extends CamelException {
     private static final long serialVersionUID = -6118520819865759888L;
diff --git a/camel-core/src/main/java/org/apache/camel/FallbackConverter.java b/camel-core/src/main/java/org/apache/camel/FallbackConverter.java
index 6ca5256..f3e4dae 100644
--- a/camel-core/src/main/java/org/apache/camel/FallbackConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/FallbackConverter.java
@@ -35,8 +35,6 @@ import java.lang.annotation.Target;
  * if it can not handle the types to convert from/to.
  *
  * @see org.apache.camel.component.file.GenericFileConverter GenericFileConverter for an example.
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/Handler.java b/camel-core/src/main/java/org/apache/camel/Handler.java
index 8b0ef8c..fa7805e 100644
--- a/camel-core/src/main/java/org/apache/camel/Handler.java
+++ b/camel-core/src/main/java/org/apache/camel/Handler.java
@@ -25,8 +25,6 @@ import java.lang.annotation.Target;
 /**
  * Marks a method on a POJO as being the preferred method to invoke when Camel looks
  * for methods to invoke using the {@link org.apache.camel.component.bean.BeanEndpoint BeanEndpoint}.
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/Header.java b/camel-core/src/main/java/org/apache/camel/Header.java
index b318d8d..6cf9db3 100644
--- a/camel-core/src/main/java/org/apache/camel/Header.java
+++ b/camel-core/src/main/java/org/apache/camel/Header.java
@@ -26,7 +26,6 @@ import java.lang.annotation.Target;
  * Marks a parameter as being a header on an inbound {@link Message}
  *
  * @see Message#getHeader(String) 
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/Headers.java b/camel-core/src/main/java/org/apache/camel/Headers.java
index 36092f1..fbc87f0 100644
--- a/camel-core/src/main/java/org/apache/camel/Headers.java
+++ b/camel-core/src/main/java/org/apache/camel/Headers.java
@@ -26,7 +26,6 @@ import java.lang.annotation.Target;
  * Marks a parameter as being an injection point of the headers of an inbound {@link Message}
  *
  * @see Message#getHeaders()
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/InOnly.java b/camel-core/src/main/java/org/apache/camel/InOnly.java
index fa5050d..e504494 100644
--- a/camel-core/src/main/java/org/apache/camel/InOnly.java
+++ b/camel-core/src/main/java/org/apache/camel/InOnly.java
@@ -39,8 +39,6 @@ import java.lang.annotation.Target;
  * @see org.apache.camel.Exchange#getPattern()
  * @see InOut
  * @see Pattern
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/InOut.java b/camel-core/src/main/java/org/apache/camel/InOut.java
index 9132d19..bcc71ad 100644
--- a/camel-core/src/main/java/org/apache/camel/InOut.java
+++ b/camel-core/src/main/java/org/apache/camel/InOut.java
@@ -38,8 +38,6 @@ import java.lang.annotation.Target;
  * @see org.apache.camel.Exchange#getPattern()
  * @see InOnly
  * @see Pattern
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java b/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java
index 37e6c3a..b29b7d5 100644
--- a/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java
+++ b/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Is thrown if the payload from the exchange could not be retrieved because of being null, wrong class type etc.
- *
- * @version
  */
 public class InvalidPayloadException extends CamelExchangeException {
 
diff --git a/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java b/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java
index 2b433bb..cb56b06 100644
--- a/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java
+++ b/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Runtime version of the {@link InvalidPayloadException}.
- *
- * @version
  */
 public class InvalidPayloadRuntimeException extends RuntimeExchangeException {
 
diff --git a/camel-core/src/main/java/org/apache/camel/InvokeOnHeader.java b/camel-core/src/main/java/org/apache/camel/InvokeOnHeader.java
index 803c096..abef059 100644
--- a/camel-core/src/main/java/org/apache/camel/InvokeOnHeader.java
+++ b/camel-core/src/main/java/org/apache/camel/InvokeOnHeader.java
@@ -26,7 +26,6 @@ import java.lang.annotation.Target;
  * Marks a method as being invoked for a specific header value.
  *
  * @see Message#getHeader(String)
- * @version
  */
 @Repeatable(InvokeOnHeaders.class)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/camel-core/src/main/java/org/apache/camel/InvokeOnHeaders.java b/camel-core/src/main/java/org/apache/camel/InvokeOnHeaders.java
index 183dc04..c810262 100644
--- a/camel-core/src/main/java/org/apache/camel/InvokeOnHeaders.java
+++ b/camel-core/src/main/java/org/apache/camel/InvokeOnHeaders.java
@@ -25,7 +25,6 @@ import java.lang.annotation.Target;
  * Marks a method as being invoked for a specific header value.
  *
  * @see Message#getHeader(String)
- * @version
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
diff --git a/camel-core/src/main/java/org/apache/camel/IsSingleton.java b/camel-core/src/main/java/org/apache/camel/IsSingleton.java
index 43c3b72..dd57d72 100644
--- a/camel-core/src/main/java/org/apache/camel/IsSingleton.java
+++ b/camel-core/src/main/java/org/apache/camel/IsSingleton.java
@@ -27,8 +27,6 @@ package org.apache.camel;
  * for objects to have this value dynamically changed.
  * <p/>
  * Camel component are very often singleton based, only a few components are not.
- *
- * @version 
  */
 public interface IsSingleton {
 
diff --git a/camel-core/src/main/java/org/apache/camel/LoggingLevel.java b/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
index b3c8e88..f3d8883 100644
--- a/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
+++ b/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
@@ -20,8 +20,6 @@ import javax.xml.bind.annotation.XmlEnum;
 
 /**
  * Used to configure the logging levels
- *
- * @version 
  */
 @XmlEnum
 public enum LoggingLevel {
diff --git a/camel-core/src/main/java/org/apache/camel/ManagementStatisticsLevel.java b/camel-core/src/main/java/org/apache/camel/ManagementStatisticsLevel.java
index cc02bbe..e1bbfb0 100644
--- a/camel-core/src/main/java/org/apache/camel/ManagementStatisticsLevel.java
+++ b/camel-core/src/main/java/org/apache/camel/ManagementStatisticsLevel.java
@@ -20,8 +20,6 @@ import javax.xml.bind.annotation.XmlEnum;
 
 /**
  * Level of granularity for performance statistics enabled
- *
- * @version 
  */
 @XmlEnum
 public enum ManagementStatisticsLevel {
diff --git a/camel-core/src/main/java/org/apache/camel/Message.java b/camel-core/src/main/java/org/apache/camel/Message.java
index a0e1d0b..eb00b85 100644
--- a/camel-core/src/main/java/org/apache/camel/Message.java
+++ b/camel-core/src/main/java/org/apache/camel/Message.java
@@ -33,8 +33,6 @@ import org.apache.camel.spi.HeadersMapFactory;
  * is represented in Camel using a {@link org.apache.camel.util.CaseInsensitiveMap CaseInsensitiveMap}.
  * The implementation of the map can be configured by the {@link HeadersMapFactory} which can be set
  * on the {@link CamelContext}. The default implementation uses the {@link org.apache.camel.util.CaseInsensitiveMap CaseInsensitiveMap}.
- *
- * @version 
  */
 public interface Message {
 
diff --git a/camel-core/src/main/java/org/apache/camel/MultipleConsumersSupport.java b/camel-core/src/main/java/org/apache/camel/MultipleConsumersSupport.java
index f552706..76f0c22 100644
--- a/camel-core/src/main/java/org/apache/camel/MultipleConsumersSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/MultipleConsumersSupport.java
@@ -27,8 +27,6 @@ package org.apache.camel;
  * <p/>
  * The purpose of this is to check on startup that we do not have multiple consumers
  * for the <b>same</b> endpoints. This prevents starting up with copy/paste mistakes in the Camel routes.
- *
- * @version 
  */
 public interface MultipleConsumersSupport {
 
diff --git a/camel-core/src/main/java/org/apache/camel/Navigate.java b/camel-core/src/main/java/org/apache/camel/Navigate.java
index 62568f1..20dc503 100644
--- a/camel-core/src/main/java/org/apache/camel/Navigate.java
+++ b/camel-core/src/main/java/org/apache/camel/Navigate.java
@@ -21,8 +21,6 @@ import java.util.List;
 /**
  * Implementations support navigating a graph where you can traverse forward and each next
  * returns a {@link List} of outputs of type <tt>T</tt> that can contain <tt>0..n</tt> nodes.
- *
- * @version 
  */
 public interface Navigate<T> {
 
diff --git a/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java b/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java
index e2f3fd5..46e537f 100644
--- a/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java
+++ b/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java
@@ -20,8 +20,6 @@ import java.io.IOException;
 
 /**
  * Thrown if no factory resource is available for the given URI
- *
- * @version 
  */
 public class NoFactoryAvailableException extends IOException {
     private static final long serialVersionUID = -425141860196708627L;
diff --git a/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java b/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java
index 1b5d1b2..c421441 100644
--- a/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java
+++ b/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * A runtime exception if a given bean could not be found in the {@link org.apache.camel.spi.Registry}
- *
- * @version 
  */
 public class NoSuchBeanException extends RuntimeCamelException {
     private static final long serialVersionUID = -8721487431101572630L;
diff --git a/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java b/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java
index 83c6695..6858005 100644
--- a/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java
+++ b/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java
@@ -20,8 +20,6 @@ package org.apache.camel;
  * A runtime exception thrown if a routing processor such as a
  * {@link org.apache.camel.processor.RecipientList RecipientList} is unable to resolve an
  * {@link Endpoint} from a URI.
- *
- * @version 
  */
 public class NoSuchEndpointException extends RuntimeCamelException {
     private static final long serialVersionUID = -8721487431101572630L;
diff --git a/camel-core/src/main/java/org/apache/camel/NoSuchHeaderException.java b/camel-core/src/main/java/org/apache/camel/NoSuchHeaderException.java
index f6c2bc0..d12f052 100644
--- a/camel-core/src/main/java/org/apache/camel/NoSuchHeaderException.java
+++ b/camel-core/src/main/java/org/apache/camel/NoSuchHeaderException.java
@@ -21,8 +21,6 @@ package org.apache.camel;
  * {@link Exchange}
  *
  * @see org.apache.camel.util.ExchangeHelper#getMandatoryHeader(Exchange, String, Class)
- *
- * @version 
  */
 public class NoSuchHeaderException extends CamelExchangeException {
     private static final long serialVersionUID = -8721487431101572630L;
diff --git a/camel-core/src/main/java/org/apache/camel/NoSuchLanguageException.java b/camel-core/src/main/java/org/apache/camel/NoSuchLanguageException.java
index d668e6e..10ceccd 100644
--- a/camel-core/src/main/java/org/apache/camel/NoSuchLanguageException.java
+++ b/camel-core/src/main/java/org/apache/camel/NoSuchLanguageException.java
@@ -21,8 +21,6 @@ package org.apache.camel;
  * language definition.
  * 
  * @see org.apache.camel.CamelContext#resolveLanguage(String)
- * 
- * @version 
  */
 public class NoSuchLanguageException extends RuntimeCamelException {
     private static final long serialVersionUID = -8721487431101572630L;
diff --git a/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java b/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java
index 3fe17b4..0de94e1 100644
--- a/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java
+++ b/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java
@@ -21,8 +21,6 @@ package org.apache.camel;
  * {@link Exchange}
  * 
  * @see org.apache.camel.util.ExchangeHelper#getMandatoryProperty(Exchange, String, Class)
- * 
- * @version 
  */
 public class NoSuchPropertyException extends CamelExchangeException {
     private static final long serialVersionUID = -8721487431101572630L;
diff --git a/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java b/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
index c630050..b0fe29c 100644
--- a/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
+++ b/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * An exception thrown if a value could not be converted to the required type
- *
- * @version 
  */
 public class NoTypeConversionAvailableException extends CamelException {
     private static final long serialVersionUID = -8721487434390572636L;
diff --git a/camel-core/src/main/java/org/apache/camel/Ordered.java b/camel-core/src/main/java/org/apache/camel/Ordered.java
index dbe5f72..955615b 100644
--- a/camel-core/src/main/java/org/apache/camel/Ordered.java
+++ b/camel-core/src/main/java/org/apache/camel/Ordered.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Interface to be implemented by objects that should be orderable, such as with a {@link java.util.Collection}.
- *
- * @version 
  */
 public interface Ordered {
 
diff --git a/camel-core/src/main/java/org/apache/camel/OutHeaders.java b/camel-core/src/main/java/org/apache/camel/OutHeaders.java
index fa4cd6b..9087fae 100644
--- a/camel-core/src/main/java/org/apache/camel/OutHeaders.java
+++ b/camel-core/src/main/java/org/apache/camel/OutHeaders.java
@@ -26,7 +26,6 @@ import java.lang.annotation.Target;
  * Marks a parameter as being an injection point of the headers of an outbound {@link Message}
  *
  * @see Message#getHeaders()
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/Pattern.java b/camel-core/src/main/java/org/apache/camel/Pattern.java
index 444a001..8cbd6e5 100644
--- a/camel-core/src/main/java/org/apache/camel/Pattern.java
+++ b/camel-core/src/main/java/org/apache/camel/Pattern.java
@@ -43,8 +43,6 @@ import java.lang.annotation.Target;
  * @see InOnly
  * @see ExchangePattern
  * @see Exchange#getPattern()
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/PollingConsumer.java b/camel-core/src/main/java/org/apache/camel/PollingConsumer.java
index 45a4f98..9103490 100644
--- a/camel-core/src/main/java/org/apache/camel/PollingConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/PollingConsumer.java
@@ -27,8 +27,6 @@ package org.apache.camel;
  * This is needed to ensure any {@link org.apache.camel.spi.Synchronization} works is being executed.
  * For example if you consumed from a file endpoint, then the consumed file is only moved/delete when
  * you done the {@link Exchange}.
- *
- * @version 
  */
 public interface PollingConsumer extends Consumer {
 
diff --git a/camel-core/src/main/java/org/apache/camel/Predicate.java b/camel-core/src/main/java/org/apache/camel/Predicate.java
index 331cb64..2031036 100644
--- a/camel-core/src/main/java/org/apache/camel/Predicate.java
+++ b/camel-core/src/main/java/org/apache/camel/Predicate.java
@@ -24,8 +24,6 @@ package org.apache.camel;
  * languages</a>, <a href="http://camel.apache.org/xquery.html">XQuery</a>
  * or <a href="http://camel.apache.org/sql.html">SQL</a> as well as
  * any arbitrary Java expression.
- * 
- * @version 
  */
 public interface Predicate {
 
diff --git a/camel-core/src/main/java/org/apache/camel/Processor.java b/camel-core/src/main/java/org/apache/camel/Processor.java
index 9a6be96..137955c 100644
--- a/camel-core/src/main/java/org/apache/camel/Processor.java
+++ b/camel-core/src/main/java/org/apache/camel/Processor.java
@@ -25,8 +25,6 @@ package org.apache.camel;
  * Notice if you use a {@link Processor} in a Camel route, then make sure to write the {@link Processor}
  * in a thread-safe way, as the Camel routes can potentially be executed by concurrent threads, and therefore
  * multiple threads can call the same {@link Processor} instance.
- * 
- * @version 
  */
 public interface Processor {
 
diff --git a/camel-core/src/main/java/org/apache/camel/Produce.java b/camel-core/src/main/java/org/apache/camel/Produce.java
index e1dec57..d113d8a 100644
--- a/camel-core/src/main/java/org/apache/camel/Produce.java
+++ b/camel-core/src/main/java/org/apache/camel/Produce.java
@@ -32,8 +32,6 @@ import java.lang.annotation.Target;
  * mechanism.
  *
  * @see InOnly
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/Producer.java b/camel-core/src/main/java/org/apache/camel/Producer.java
index 89bdaa3..87b138f 100644
--- a/camel-core/src/main/java/org/apache/camel/Producer.java
+++ b/camel-core/src/main/java/org/apache/camel/Producer.java
@@ -19,8 +19,6 @@ package org.apache.camel;
 /**
  * Provides a channel on which clients can create and invoke message exchanges
  * on an {@link Endpoint}
- * 
- * @version 
  */
 public interface Producer extends Processor, Service, IsSingleton, EndpointAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/ProxyInstantiationException.java b/camel-core/src/main/java/org/apache/camel/ProxyInstantiationException.java
index 8b96a55..769e5b2 100644
--- a/camel-core/src/main/java/org/apache/camel/ProxyInstantiationException.java
+++ b/camel-core/src/main/java/org/apache/camel/ProxyInstantiationException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Exception indicating a failure while trying to create a proxy of a given type and on a given endpoint
- *
- * @version 
  */
 public class ProxyInstantiationException extends RuntimeCamelException {
     private static final long serialVersionUID = -2050115486047385506L;
diff --git a/camel-core/src/main/java/org/apache/camel/RecipientList.java b/camel-core/src/main/java/org/apache/camel/RecipientList.java
index a239520..31c13a7 100644
--- a/camel-core/src/main/java/org/apache/camel/RecipientList.java
+++ b/camel-core/src/main/java/org/apache/camel/RecipientList.java
@@ -36,8 +36,6 @@ import java.lang.annotation.Target;
  * to an {@link Endpoint} or {@link String}.
  *
  * Then for each endpoint or URI the message is forwarded a separate copy.
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/ResolveEndpointFailedException.java b/camel-core/src/main/java/org/apache/camel/ResolveEndpointFailedException.java
index be1e583..7f9385f 100644
--- a/camel-core/src/main/java/org/apache/camel/ResolveEndpointFailedException.java
+++ b/camel-core/src/main/java/org/apache/camel/ResolveEndpointFailedException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * A runtime exception thrown if an {@link Endpoint} cannot be resolved via URI
- * 
- * @version 
  */
 public class ResolveEndpointFailedException extends RuntimeCamelException {
     private static final long serialVersionUID = -9121465713858552263L;
diff --git a/camel-core/src/main/java/org/apache/camel/RollbackExchangeException.java b/camel-core/src/main/java/org/apache/camel/RollbackExchangeException.java
index 952f62d..e80aca0 100644
--- a/camel-core/src/main/java/org/apache/camel/RollbackExchangeException.java
+++ b/camel-core/src/main/java/org/apache/camel/RollbackExchangeException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Exception used for forcing an Exchange to be rolled back.
- *
- * @version 
  */
 public class RollbackExchangeException extends CamelExchangeException {
     private static final long serialVersionUID = -7837446508365767066L;
diff --git a/camel-core/src/main/java/org/apache/camel/RoutingSlip.java b/camel-core/src/main/java/org/apache/camel/RoutingSlip.java
index e93901c..2c1dca4 100644
--- a/camel-core/src/main/java/org/apache/camel/RoutingSlip.java
+++ b/camel-core/src/main/java/org/apache/camel/RoutingSlip.java
@@ -38,7 +38,6 @@ import java.lang.annotation.Target;
  * Then for each endpoint or URI the message is routed in a pipes and filter fashion.
  *
  * @see org.apache.camel.DynamicRouter
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/RuntimeCamelException.java b/camel-core/src/main/java/org/apache/camel/RuntimeCamelException.java
index d74f633..7f3c4b7 100644
--- a/camel-core/src/main/java/org/apache/camel/RuntimeCamelException.java
+++ b/camel-core/src/main/java/org/apache/camel/RuntimeCamelException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Base class for all Camel unchecked exceptions.
- *
- * @version 
  */
 public class RuntimeCamelException extends RuntimeException {
     private static final long serialVersionUID = 8046489554418284257L;
diff --git a/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java b/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
index 6124007..d23cef8 100644
--- a/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
@@ -19,8 +19,6 @@ package org.apache.camel;
 /**
  * Various runtime configuration options used by {@link org.apache.camel.CamelContext} and {@link org.apache.camel.spi.RouteContext}
  * for cross cutting functions such as tracing, delayer, stream cache and the like.
- *
- * @version 
  */
 public interface RuntimeConfiguration {
 
diff --git a/camel-core/src/main/java/org/apache/camel/RuntimeExchangeException.java b/camel-core/src/main/java/org/apache/camel/RuntimeExchangeException.java
index b8116e8..a39497f 100644
--- a/camel-core/src/main/java/org/apache/camel/RuntimeExchangeException.java
+++ b/camel-core/src/main/java/org/apache/camel/RuntimeExchangeException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * A runtime exception caused by a specific message {@link Exchange}
- *
- * @version 
  */
 public class RuntimeExchangeException extends RuntimeCamelException {
     private static final long serialVersionUID = -8721487431101572630L;
diff --git a/camel-core/src/main/java/org/apache/camel/RuntimeExpressionException.java b/camel-core/src/main/java/org/apache/camel/RuntimeExpressionException.java
index f7beb22..65db011 100644
--- a/camel-core/src/main/java/org/apache/camel/RuntimeExpressionException.java
+++ b/camel-core/src/main/java/org/apache/camel/RuntimeExpressionException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Thrown if an expression evaluation fails
- * 
- * @version 
  */
 public class RuntimeExpressionException extends RuntimeCamelException {
 
diff --git a/camel-core/src/main/java/org/apache/camel/RuntimeTransformException.java b/camel-core/src/main/java/org/apache/camel/RuntimeTransformException.java
index 11e4706..0232f90 100644
--- a/camel-core/src/main/java/org/apache/camel/RuntimeTransformException.java
+++ b/camel-core/src/main/java/org/apache/camel/RuntimeTransformException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Thrown if a message transformation fails
- * 
- * @version 
  */
 public class RuntimeTransformException extends RuntimeCamelException {
 
diff --git a/camel-core/src/main/java/org/apache/camel/Service.java b/camel-core/src/main/java/org/apache/camel/Service.java
index 7ad90ba..fd198e7 100644
--- a/camel-core/src/main/java/org/apache/camel/Service.java
+++ b/camel-core/src/main/java/org/apache/camel/Service.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Represents the core lifecycle API for POJOs which can be started and stopped
- * 
- * @version 
  */
 public interface Service {
 
diff --git a/camel-core/src/main/java/org/apache/camel/ServiceStatus.java b/camel-core/src/main/java/org/apache/camel/ServiceStatus.java
index 8a1115f..d481681 100644
--- a/camel-core/src/main/java/org/apache/camel/ServiceStatus.java
+++ b/camel-core/src/main/java/org/apache/camel/ServiceStatus.java
@@ -20,8 +20,6 @@ import java.io.Serializable;
 
 /**
  * Represents the status of a {@link Service} instance
- *
- * @version 
  */
 public enum ServiceStatus implements Serializable {
     Starting, Started, Stopping, Stopped, Suspending, Suspended;
diff --git a/camel-core/src/main/java/org/apache/camel/ShutdownableService.java b/camel-core/src/main/java/org/apache/camel/ShutdownableService.java
index 9e37d06..c95bdc7 100644
--- a/camel-core/src/main/java/org/apache/camel/ShutdownableService.java
+++ b/camel-core/src/main/java/org/apache/camel/ShutdownableService.java
@@ -23,8 +23,6 @@ package org.apache.camel;
  * This allows customization of behavior when stopping or shutting down.
  * <p/>
  * For example to shutdown thread pools during shutdown and <b>not</b> at CamelContext termination.
- *
- * @version 
  */
 public interface ShutdownableService extends Service {
 
diff --git a/camel-core/src/main/java/org/apache/camel/StartupListener.java b/camel-core/src/main/java/org/apache/camel/StartupListener.java
index d6da3a8..187828a 100644
--- a/camel-core/src/main/java/org/apache/camel/StartupListener.java
+++ b/camel-core/src/main/java/org/apache/camel/StartupListener.java
@@ -35,7 +35,6 @@ package org.apache.camel;
  * Instead use the {@link ExtendedStartupListener} if you wish to add new routes.
  *
  * @see ExtendedStartupListener
- * @version
  */
 public interface StartupListener {
 
diff --git a/camel-core/src/main/java/org/apache/camel/StreamCache.java b/camel-core/src/main/java/org/apache/camel/StreamCache.java
index 29f4284..040afae 100644
--- a/camel-core/src/main/java/org/apache/camel/StreamCache.java
+++ b/camel-core/src/main/java/org/apache/camel/StreamCache.java
@@ -31,8 +31,6 @@ import java.io.OutputStream;
  * <p/>
  * It is recommended in the {@link #copy(Exchange)} method to let the copied stream start from the start. If the implementation
  * does not support copy, then return <tt>null</tt>.
- *
- * @version 
  */
 public interface StreamCache {
 
diff --git a/camel-core/src/main/java/org/apache/camel/StringSource.java b/camel-core/src/main/java/org/apache/camel/StringSource.java
index 98708c9..c6464de 100644
--- a/camel-core/src/main/java/org/apache/camel/StringSource.java
+++ b/camel-core/src/main/java/org/apache/camel/StringSource.java
@@ -32,8 +32,6 @@ import javax.xml.transform.stream.StreamSource;
  * A helper class which provides a JAXP {@link javax.xml.transform.Source
  * Source} from a String which can be read as many times as required. Encoding
  * is default UTF-8.
- * 
- * @version
  */
 public class StringSource extends StreamSource implements Externalizable {
     private String text;
diff --git a/camel-core/src/main/java/org/apache/camel/TimeoutMap.java b/camel-core/src/main/java/org/apache/camel/TimeoutMap.java
index 366f5c7..99375f4 100644
--- a/camel-core/src/main/java/org/apache/camel/TimeoutMap.java
+++ b/camel-core/src/main/java/org/apache/camel/TimeoutMap.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Represents a map of values which timeout after a period of inactivity.
- *
- * @version 
  */
 public interface TimeoutMap<K, V> extends Runnable {
 
diff --git a/camel-core/src/main/java/org/apache/camel/Traceable.java b/camel-core/src/main/java/org/apache/camel/Traceable.java
index 8b63806..a32e02d 100644
--- a/camel-core/src/main/java/org/apache/camel/Traceable.java
+++ b/camel-core/src/main/java/org/apache/camel/Traceable.java
@@ -19,8 +19,6 @@ package org.apache.camel;
 /**
  * Traceable processors allowing easier tracing using constructed labels to help identify the processor
  * and where it's defined in the route model.
- *
- * @version 
  */
 public interface Traceable {
 
diff --git a/camel-core/src/main/java/org/apache/camel/TypeConversionException.java b/camel-core/src/main/java/org/apache/camel/TypeConversionException.java
index 075ff07..4632318 100644
--- a/camel-core/src/main/java/org/apache/camel/TypeConversionException.java
+++ b/camel-core/src/main/java/org/apache/camel/TypeConversionException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Exception when failing during type conversion.
- *
- * @version 
  */
 public class TypeConversionException extends RuntimeCamelException {
     private static final long serialVersionUID = -6118520819865759886L;
diff --git a/camel-core/src/main/java/org/apache/camel/TypeConverter.java b/camel-core/src/main/java/org/apache/camel/TypeConverter.java
index 08c83f6..1f1fe5b 100644
--- a/camel-core/src/main/java/org/apache/camel/TypeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/TypeConverter.java
@@ -22,8 +22,6 @@ package org.apache.camel;
  * href="http://camel.apache.org/type-converter.html">to different
  * types</a> such as to and from String, InputStream/OutputStream,
  * Reader/Writer, Document, byte[], ByteBuffer etc
- * 
- * @version 
  */
 public interface TypeConverter {
 
diff --git a/camel-core/src/main/java/org/apache/camel/TypeConverterExists.java b/camel-core/src/main/java/org/apache/camel/TypeConverterExists.java
index ba2bb19..0e0ef47 100644
--- a/camel-core/src/main/java/org/apache/camel/TypeConverterExists.java
+++ b/camel-core/src/main/java/org/apache/camel/TypeConverterExists.java
@@ -20,8 +20,6 @@ import javax.xml.bind.annotation.XmlEnum;
 
 /**
  * What to do if attempting to add a duplicate type converter
- *
- * @version 
  */
 @XmlEnum
 public enum TypeConverterExists {
diff --git a/camel-core/src/main/java/org/apache/camel/TypeConverterLoaderException.java b/camel-core/src/main/java/org/apache/camel/TypeConverterLoaderException.java
index f0d85ec..9f800c7 100644
--- a/camel-core/src/main/java/org/apache/camel/TypeConverterLoaderException.java
+++ b/camel-core/src/main/java/org/apache/camel/TypeConverterLoaderException.java
@@ -18,8 +18,6 @@ package org.apache.camel;
 
 /**
  * Exception when failing to load type converters.
- *
- * @version 
  */
 public class TypeConverterLoaderException extends CamelException {
     private static final long serialVersionUID = -6118520819865759887L;
diff --git a/camel-core/src/main/java/org/apache/camel/ValidationException.java b/camel-core/src/main/java/org/apache/camel/ValidationException.java
index 0d1a2dc..e3648f6 100644
--- a/camel-core/src/main/java/org/apache/camel/ValidationException.java
+++ b/camel-core/src/main/java/org/apache/camel/ValidationException.java
@@ -21,8 +21,6 @@ package org.apache.camel;
  * {@link org.apache.camel.processor.validation.SchemaValidationException} so
  * that it is easy to treat all validation errors in a similar way irrespective
  * of the particular validation technology used.
- * 
- * @version 
  */
 public class ValidationException extends CamelExchangeException {
     private static final long serialVersionUID = -7485357452450907415L;
diff --git a/camel-core/src/main/java/org/apache/camel/WaitForTaskToComplete.java b/camel-core/src/main/java/org/apache/camel/WaitForTaskToComplete.java
index 159ce57..9ab48b8 100644
--- a/camel-core/src/main/java/org/apache/camel/WaitForTaskToComplete.java
+++ b/camel-core/src/main/java/org/apache/camel/WaitForTaskToComplete.java
@@ -25,8 +25,6 @@ import javax.xml.bind.annotation.XmlType;
  * The tasks is usually async tasks executed by the JDK concurrency library.
  * With these options the caller can choose whether to wait for the task to complete
  * or not before the caller thread continues.
- *
- * @version 
  */
 @XmlType
 @XmlEnum
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/ManagedInstance.java b/camel-core/src/main/java/org/apache/camel/api/management/ManagedInstance.java
index 821741e..d6e09d3 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/ManagedInstance.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/ManagedInstance.java
@@ -18,8 +18,6 @@ package org.apache.camel.api.management;
 
 /**
  * Holds the instance being managed.
- *
- * @version 
  */
 public interface ManagedInstance {
 
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/PerformanceCounter.java b/camel-core/src/main/java/org/apache/camel/api/management/PerformanceCounter.java
index 91d25e1..cd61df9 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/PerformanceCounter.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/PerformanceCounter.java
@@ -20,8 +20,6 @@ import org.apache.camel.Exchange;
 
 /**
  * A counter that gathers performance metrics when an {@link org.apache.camel.Exchange} is routed in Camel.
- *
- * @version 
  */
 public interface PerformanceCounter {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java b/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
index 08dfe6f..72c89bc 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
@@ -25,8 +25,6 @@ import static org.apache.camel.util.ObjectHelper.notNull;
 
 /**
  * A useful base class for {@link Predicate} implementations
- *
- * @version 
  */
 public abstract class BinaryPredicateSupport implements BinaryPredicate {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/Builder.java b/camel-core/src/main/java/org/apache/camel/builder/Builder.java
index d0d63e5..d1e66e7 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/Builder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/Builder.java
@@ -34,8 +34,6 @@ import org.apache.camel.util.ObjectHelper;
  * Implementation of this builder should favor build expressions using the definition classes
  * from the <tt>org.apache.camel.model.language</tt> package, to build the routes using the same
  * types as it would happen when using XML DSL.
- *
- * @version 
  */
 public final class Builder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java b/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
index 51d999e..05b916d 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
@@ -34,8 +34,6 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Base class for implementation inheritance for different clauses in the <a
  * href="http://camel.apache.org/dsl.html">Java DSL</a>
- *
- * @version
  */
 public abstract class BuilderSupport {
     private ModelCamelContext context;
diff --git a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index 451c4d0..95b62e9 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -67,8 +67,6 @@ import org.apache.camel.util.jsse.KeyStoreParameters;
 /**
  * An expression for constructing the different possible {@link org.apache.camel.spi.DataFormat}
  * options.
- *
- * @version 
  */
 public class DataFormatClause<T extends ProcessorDefinition<?>> {
     private final T processorType;
diff --git a/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
index 594aada..d6e5ca1 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
@@ -33,8 +33,6 @@ import org.slf4j.LoggerFactory;
  * A builder of a <a
  * href="http://camel.apache.org/dead-letter-channel.html">Dead Letter
  * Channel</a>
- *
- * @version 
  */
 public class DeadLetterChannelBuilder extends DefaultErrorHandlerBuilder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
index 48bff89..b229332 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
@@ -36,8 +36,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * The default error handler builder.
- *
- * @version 
  */
 public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
index 3c5a3f1..835fc4e 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
@@ -26,8 +26,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * A builder of a <a href="http://camel.apache.org/error-handler.html">Error Handler</a>
- *
- * @version 
  */
 public interface ErrorHandlerBuilder extends ErrorHandlerFactory {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
index fa997f3..cd08529 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
@@ -30,8 +30,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Represents a proxy to an error handler builder which is resolved by named reference
- *
- * @version 
  */
 public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport {
     public static final String DEFAULT_ERROR_HANDLER_BUILDER = "CamelDefaultErrorHandlerBuilder";
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
index fbc41b3..7d1d2ed 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
@@ -33,8 +33,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Base class for builders of error handling.
- *
- * @version 
  */
 public abstract class ErrorHandlerBuilderSupport implements ErrorHandlerBuilder {
     private Map<RouteContext, List<OnExceptionDefinition>> onExceptions = new HashMap<>();
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
index 5c9a34e..5c03bbf 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
@@ -76,8 +76,6 @@ import org.apache.camel.util.StringHelper;
 
 /**
  * A helper class for working with <a href="http://camel.apache.org/expression.html">expressions</a>.
- *
- * @version
  */
 public final class ExpressionBuilder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 7319bbe..ae81c7b 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -32,8 +32,6 @@ import org.apache.camel.support.ExpressionAdapter;
 /**
  * Represents an expression clause within the DSL which when the expression is
  * complete the clause continues to another part of the DSL
- * 
- * @version 
  */
 public class ExpressionClause<T> extends ExpressionDefinition {
     private ExpressionClauseSupport<T> delegate;
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index b448e4f..f972764 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -43,8 +43,6 @@ import org.apache.camel.model.language.XQueryExpression;
 
 /**
  * A support class for building expression clauses.
- *
- * @version 
  */
 public class ExpressionClauseSupport<T> {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
index 1c3ad0e..45f493a 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
@@ -28,8 +28,6 @@ import org.apache.camel.spi.RouteContext;
  * <a href="http://camel.apache.org/dead-letter-channel.html">Dead Letter Channel</a> should be used
  * if you are unsure; however it can be useful sometimes to disable an error handler inside a complex route
  * so that exceptions bubble up to the parent {@link Processor}
- *
- * @version 
  */
 public class NoErrorHandlerBuilder extends ErrorHandlerBuilderSupport {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
index 41d190a..b54724b 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
@@ -54,8 +54,6 @@ import org.slf4j.LoggerFactory;
  * This builder can be used for testing purposes where you want to know when a test is supposed to be done.
  * The idea is that you can build an expression that explains when the test is done. For example when Camel
  * have finished routing 5 messages. You can then in your test await for this condition to occur.
- *
- * @version 
  */
 public class NotifyBuilder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
index b0511f8..c7427a2 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
@@ -31,8 +31,6 @@ import static org.apache.camel.util.ObjectHelper.notNull;
 
 /**
  * A helper class for working with predicates
- *
- * @version 
  */
 public final class PredicateBuilder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java
index 90b9043..6e36f68 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java
@@ -24,8 +24,6 @@ import org.apache.camel.Processor;
 
 /**
  * A builder of a number of different {@link Processor} implementations
- *
- * @version 
  */
 public final class ProcessorBuilder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
index 6bee379..cabad50 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
@@ -23,8 +23,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * A build to create Camel proxies.
- *
- * @version 
  */
 public final class ProxyBuilder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
index 94f6ce9..b25adfc 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -49,8 +49,6 @@ import org.slf4j.LoggerFactory;
 /**
  * A <a href="http://camel.apache.org/dsl.html">Java DSL</a> which is
  * used to build {@link org.apache.camel.impl.DefaultRoute} instances in a {@link CamelContext} for smart routing.
- *
- * @version 
  */
 public abstract class RouteBuilder extends BuilderSupport implements RoutesBuilder {
     protected Logger log = LoggerFactory.getLogger(getClass());
diff --git a/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java
index 96004f5..53a7c18 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java
@@ -28,8 +28,6 @@ import org.apache.camel.util.ResourceHelper;
  * <p/>
  * This builder is available in the Java DSL from the {@link RouteBuilder} which means that using
  * simple language for {@link Expression}s or {@link Predicate}s is very easy with the help of this builder.
- *
- * @version
  */
 public class SimpleBuilder implements Predicate, Expression {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
index 52acdb2..82f5b88 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
@@ -26,8 +26,6 @@ import org.apache.camel.spi.ThreadPoolProfile;
 
 /**
  * A builder to create thread pools.
- *
- * @version 
  */
 public final class ThreadPoolBuilder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
index d6d387f..791a382 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
@@ -31,8 +31,6 @@ import org.apache.camel.util.ExpressionToPredicateAdapter;
 
 /**
  * A builder of expressions or predicates based on values.
- * 
- * @version 
  */
 public class ValueBuilder implements Expression, Predicate {
     private Expression expression;
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandler.java b/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandler.java
index 8a3109e..9a1d854 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandler.java
@@ -23,8 +23,6 @@ import org.apache.camel.Message;
 
 /**
  * Uses DOM to handle results of the transformation
- *
- * @version 
  */
 public class DomResultHandler implements ResultHandler {
     private DOMResult result = new DOMResult();
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java b/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java
index a7a2b20..7acac8b 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java
@@ -20,8 +20,6 @@ import org.apache.camel.Exchange;
 
 /**
  * Factory for {@link DomResultHandler}
- *
- * @version 
  */
 public class DomResultHandlerFactory implements ResultHandlerFactory {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/FileResultHandler.java b/camel-core/src/main/java/org/apache/camel/builder/xml/FileResultHandler.java
index 51425da..bceaf0e 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/FileResultHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/FileResultHandler.java
@@ -28,8 +28,6 @@ import org.apache.camel.Message;
  * <p/>
  * For example when transforming big files you can stream directly to a file output
  * to avoid consuming to much memory.
- *
- * @version 
  */
 public class FileResultHandler implements ResultHandler {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/FileResultHandlerFactory.java b/camel-core/src/main/java/org/apache/camel/builder/xml/FileResultHandlerFactory.java
index 1349bee..bd6b902 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/FileResultHandlerFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/FileResultHandlerFactory.java
@@ -23,8 +23,6 @@ import org.apache.camel.util.ExchangeHelper;
 
 /**
  * Factory for {@link javax.xml.transform.stream.StreamResult} which is streamed to file.
- *
- * @version 
  */
 public class FileResultHandlerFactory implements ResultHandlerFactory {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/InvalidXPathExpression.java b/camel-core/src/main/java/org/apache/camel/builder/xml/InvalidXPathExpression.java
index 07efc8f..c7712a8 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/InvalidXPathExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/InvalidXPathExpression.java
@@ -22,8 +22,6 @@ import org.apache.camel.RuntimeExpressionException;
 
 /**
  * An exception thrown if am XPath expression could not be parsed or evaluated
- *
- * @version 
  */
 public class InvalidXPathExpression extends RuntimeExpressionException {
     private static final long serialVersionUID = 9171451033826915273L;
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java b/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
index 20ccc66..5b8a76db 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
@@ -39,8 +39,6 @@ import static org.apache.camel.builder.xml.Namespaces.SYSTEM_PROPERTIES_NAMESPAC
  * properties available.
  * <p/>
  * Implementations of this resolver must be thread safe
- *
- * @version 
  */
 public class MessageVariableResolver implements XPathVariableResolver {
     private static final Logger LOG = LoggerFactory.getLogger(MessageVariableResolver.class);
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java b/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
index 359c613..3367a08 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
@@ -31,8 +31,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * A helper class for working with namespaces or creating namespace based expressions
- *
- * @version 
  */
 public class Namespaces {
     public static final String DEFAULT_NAMESPACE = "http://camel.apache.org/schema/spring";
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandler.java b/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandler.java
index 4334d52..2bf111a 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandler.java
@@ -22,8 +22,6 @@ import org.apache.camel.Message;
 
 /**
  * A strategy for handling XSLT results
- *
- * @version 
  */
 public interface ResultHandler {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java b/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java
index f527d55..dc48774 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java
@@ -20,8 +20,6 @@ import org.apache.camel.Exchange;
 
 /**
  * Factory for {@link org.apache.camel.builder.xml.ResultHandler}
- *
- * @version 
  */
 public interface ResultHandlerFactory {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandler.java b/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandler.java
index 8d8b120..7dd5252 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandler.java
@@ -25,8 +25,6 @@ import org.apache.camel.Message;
 
 /**
  * Processes the XSLT result as a byte[]
- *
- * @version 
  */
 public class StreamResultHandler implements ResultHandler {
     private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java b/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java
index 3b9462e..933e47b 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java
@@ -20,8 +20,6 @@ import org.apache.camel.Exchange;
 
 /**
  * Factory for {@link StreamResultHandler}
- *
- * @version 
  */
 public class StreamResultHandlerFactory implements ResultHandlerFactory {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandler.java b/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandler.java
index cc6beb5..703829c 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandler.java
@@ -25,8 +25,6 @@ import org.apache.camel.Message;
 
 /**
  * Processes the XSLT result as a String
- *
- * @version 
  */
 public class StringResultHandler implements ResultHandler {
     private StringWriter buffer = new StringWriter();
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandlerFactory.java b/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandlerFactory.java
index 6a45623..d9b7a8b 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandlerFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandlerFactory.java
@@ -20,8 +20,6 @@ import org.apache.camel.Exchange;
 
 /**
  * Factory for {@link StringResultHandler}
- *
- * @version 
  */
 public class StringResultHandlerFactory implements ResultHandlerFactory {
 
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
index 1ba741e..f4b3cb5 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
@@ -68,8 +68,6 @@ import static org.apache.camel.util.ObjectHelper.notNull;
  * <p/>
  * Will by default output the result as a String. You can chose which kind of output
  * you want using the <tt>outputXXX</tt> methods.
- *
- * @version 
  */
 public class XsltBuilder implements Processor {
     private static final Logger LOG = LoggerFactory.getLogger(XsltBuilder.class);
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltUriResolver.java b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltUriResolver.java
index 912b75d..6361aee 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltUriResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltUriResolver.java
@@ -41,8 +41,6 @@ import org.slf4j.LoggerFactory;
  * ref will lookup the resource in the registry.
  * bean will call a method on a bean to be used as the resource.
  * For bean you can specify the method name after dot, eg bean:myBean.myMethod
- *
- * @version 
  */
 public class XsltUriResolver implements URIResolver {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java b/camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
index f437009..d6eb750 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
@@ -31,8 +31,6 @@ import org.slf4j.LoggerFactory;
 /**
  * A {@link Processor} which converts the inbound exchange to a method
  * invocation on a POJO
- *
- * @version 
  */
 public abstract class AbstractBeanProcessor implements AsyncProcessor {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractBeanProcessor.class);
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java b/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java
index 4c570f4..d7438ff 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java
@@ -24,8 +24,6 @@ import org.apache.camel.Exchange;
 /**
  * An exception thrown if an attempted method invocation resulted in an ambiguous method
  * such that multiple methods match the inbound message exchange
- *
- * @version 
  */
 public class AmbiguousMethodCallException extends CamelExchangeException {
     private static final long serialVersionUID = -8867010485101806951L;
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java b/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
index 574164b..3b26157 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
@@ -25,8 +25,6 @@ import org.apache.camel.language.LanguageAnnotation;
 /**
  * A factory which creates an {@link Expression} object from an annotation on a field, property or method parameter
  * of a specified type.
- *
- * @version 
  */
 public interface AnnotationExpressionFactory {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
index a02a1a1..38cf875 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
@@ -26,9 +26,6 @@ import org.apache.camel.language.bean.BeanExpression;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.StringHelper;
 
-/**
- * @version 
- */
 public class BeanAnnotationExpressionFactory extends DefaultAnnotationExpressionFactory {
 
     @Override
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanConstants.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanConstants.java
index ce3bcfa..dd06a1d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanConstants.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanConstants.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.bean;
 
-/**
- * @version 
- */
 public final class BeanConstants {
 
     public static final String BEAN_PARAMETER_MAPPING_STRATEGY = "CamelBeanParameterMappingStrategy";
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
index 5cb9dd4..119a2cb 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
@@ -21,8 +21,6 @@ import org.apache.camel.Processor;
 
 /**
  * Object holder for a bean.
- *
- * @version 
  */
 public interface BeanHolder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanTypeHolder.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanTypeHolder.java
index abe42e2..0a5b495 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanTypeHolder.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanTypeHolder.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.bean;
 
 /**
  * Object holder for a bean type.
- *
- * @version 
  */
 public interface BeanTypeHolder extends BeanHolder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java b/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
index e524b48..4129b1e 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
@@ -26,8 +26,6 @@ import org.apache.camel.Producer;
 /**
  * An {@link java.lang.reflect.InvocationHandler} which invokes a message
  * exchange on a camel {@link Endpoint}
- * 
- * @version
  */
 public class CamelInvocationHandler extends AbstractCamelInvocationHandler implements InvocationHandler {
     private final MethodInfoCache methodInfoCache;
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java b/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
index 1965d2b..23966e2 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
@@ -23,8 +23,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * A constant (singleton) bean implementation of {@link BeanHolder}
- *
- * @version 
  */
 public class ConstantBeanHolder implements BeanHolder {
     private final Object bean;
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ConstantStaticTypeBeanHolder.java b/camel-core/src/main/java/org/apache/camel/component/bean/ConstantStaticTypeBeanHolder.java
index 50a2b50..45446fe 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/ConstantStaticTypeBeanHolder.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/ConstantStaticTypeBeanHolder.java
@@ -21,8 +21,6 @@ import org.apache.camel.CamelContext;
 /**
  * A constant {@link org.apache.camel.component.bean.BeanHolder} for a class or static class
  * where the intention is to only invoke static methods, without the need for creating an instance of the type.
- *
- * @version
  */
 public class ConstantStaticTypeBeanHolder extends ConstantTypeBeanHolder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java b/camel-core/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java
index a40ed15..fee1c69 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java
@@ -22,8 +22,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * A constant (singleton) bean implementation of {@link org.apache.camel.component.bean.BeanTypeHolder}
- *
- * @version
  */
 public class ConstantTypeBeanHolder implements BeanTypeHolder {
     private final Class<?> type;
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java b/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
index cf961c3..41cf7b3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
@@ -29,8 +29,6 @@ import org.apache.camel.util.PredicateToExpressionAdapter;
 
 /**
  * Default implementation of the {@link AnnotationExpressionFactory}.
- *
- * @version 
  */
 public class DefaultAnnotationExpressionFactory implements AnnotationExpressionFactory {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java b/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
index 9ec7ba1..4e879c1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
@@ -29,8 +29,6 @@ import org.apache.camel.spi.Registry;
 
 /**
  * Represents the strategy used to figure out how to map a message exchange to a POJO method invocation
- *
- * @version 
  */
 public class DefaultParameterMappingStrategy implements ParameterMappingStrategy {
     private final Map<Class<?>, Expression> parameterTypeToExpressionMap = new ConcurrentHashMap<>();
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodBean.java b/camel-core/src/main/java/org/apache/camel/component/bean/MethodBean.java
index bb05c6b..f61cc95 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/MethodBean.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/MethodBean.java
@@ -21,8 +21,6 @@ import java.lang.reflect.Method;
 
 /**
  * Represents a {@link Serializable} version of a {@link Method}
- *
- * @version 
  */
 public class MethodBean implements Serializable {
     private static final long serialVersionUID = -789408217201706532L;
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
index 00e040d..c0aa7df 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
@@ -63,8 +63,6 @@ import static org.apache.camel.util.ObjectHelper.asString;
 
 /**
  * Information about a method to be used for invocation.
- *
- * @version 
  */
 public class MethodInfo {
     private static final Logger LOG = LoggerFactory.getLogger(MethodInfo.class);
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
index 0b7c6ab..78c5389 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
@@ -25,8 +25,6 @@ import org.apache.camel.util.LRUCacheFactory;
 /**
  * Represents a cache of {@link MethodInfo} objects to avoid the expense of introspection for each
  * invocation of a method via a proxy.
- *
- * @version 
  */
 public class MethodInfoCache {
     private final CamelContext camelContext;
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
index c385950..8777510 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
@@ -23,8 +23,6 @@ import org.apache.camel.AsyncCallback;
 
 /**
  * Information used by Camel to perform method invocation.
- *
- * @version 
  */
 public interface MethodInvocation {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java b/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java
index e31c729..6e75565 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java
@@ -20,9 +20,6 @@ import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.util.ObjectHelper;
 
-/**
- * @version 
- */
 public class MethodNotFoundException extends CamelExchangeException {
     private static final long serialVersionUID = -7411465307141051012L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java b/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java
index 810e032..38159fa 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java
@@ -23,8 +23,6 @@ import org.apache.camel.Expression;
 
 /**
  * Parameter information to be used for method invocation.
- *
- * @version 
  */
 public class ParameterInfo {
     private final int index;
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ParameterMappingStrategy.java b/camel-core/src/main/java/org/apache/camel/component/bean/ParameterMappingStrategy.java
index 5bcef72..3be5224 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/ParameterMappingStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/ParameterMappingStrategy.java
@@ -20,8 +20,6 @@ import org.apache.camel.Expression;
 
 /**
  * A strategy for creating a default parameter expression for a given type
- *
- * @version 
  */
 public interface ParameterMappingStrategy {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java b/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
index 5e761a03..9cf040c 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
@@ -24,8 +24,6 @@ import org.apache.camel.processor.DeferServiceFactory;
 
 /**
  * A helper class for creating proxies which delegate to Camel
- *
- * @version 
  */
 public final class ProxyHelper {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java b/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
index 742aaa4..1863bd7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
@@ -23,8 +23,6 @@ import org.apache.camel.spi.Registry;
 
 /**
  * An implementation of a {@link BeanHolder} which will look up a bean from the registry and act as a cache of its metadata
- *
- * @version 
  */
 public class RegistryBean implements BeanHolder {
     private final CamelContext context;
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java b/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java
index 2281302..f229480 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java
@@ -27,8 +27,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Factory for the XPath expression annotations.
- *
- * @version 
  */
 public class XPathAnnotationExpressionFactory extends DefaultAnnotationExpressionFactory {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java b/camel-core/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
index 91db6bc..12233eb 100644
--- a/camel-core/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
@@ -29,8 +29,6 @@ import org.apache.camel.util.IntrospectionSupport;
  * The <a href="http://camel.apache.org/class.html">Class Component</a> is for binding JavaBeans to Camel message exchanges based on class name.
  * <p/>
  * This component is an extension to the {@link org.apache.camel.component.bean.BeanComponent}.
- *
- * @version 
  */
 public class ClassComponent extends BeanComponent {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
index 767ebe6..b9f75b0 100644
--- a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
@@ -24,8 +24,6 @@ import org.apache.camel.impl.DefaultComponent;
 /**
  * The <a href="http://camel.apache.org/browse.html">Browse Component</a> provides a simple
  * <a href="http://camel.apache.org/browsableendpoint.html">BrowsableEndpoint</a> for testing visualization or debugging.
- *
- * @version 
  */
 public class BrowseComponent extends DefaultComponent {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
index ace1b2f..e615182b5 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
@@ -26,8 +26,6 @@ import org.apache.camel.util.StringHelper;
 
 /**
  * The <a href="http://camel.apache.org/dataformat-component.html">Data Format Component</a> enables using <a href="https://camel.apache.org/data-format.html">Data Format</a> as a component.
- *
- * @version
  */
 public class DataFormatComponent extends DefaultComponent {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
index 98b88a0..8f48390 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
@@ -20,8 +20,6 @@ import org.apache.camel.Exchange;
 
 /**
  * Represents a strategy for testing endpoints with canned data.
- *
- * @version 
  */
 public interface DataSet {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
index c7b4d4c..11410fc 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
@@ -24,8 +24,6 @@ import org.apache.camel.util.CamelContextHelper;
 
 /**
  * Component for <a href="http://camel.apache.org/dataset.html">DataSet</a>.
- *
- * @version 
  */
 public class DataSetComponent extends DefaultComponent {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
index 229ba87..f279036 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
@@ -28,8 +28,6 @@ import org.apache.camel.util.URISupport;
 
 /**
  * DataSet consumer.
- *
- * @version 
  */
 public class DataSetConsumer extends DefaultConsumer {
     private final CamelContext camelContext;
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
index 77c82b7..501f84d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
@@ -25,8 +25,6 @@ import org.apache.camel.Processor;
 
 /**
  * Base class for DataSet
- *
- * @version 
  */
 public abstract class DataSetSupport implements DataSet {
     private Map<String, Object> defaultHeaders;
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/FileDataSet.java b/camel-core/src/main/java/org/apache/camel/component/dataset/FileDataSet.java
index 3fe5c83..d04f902 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/FileDataSet.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/FileDataSet.java
@@ -27,8 +27,6 @@ import org.apache.camel.util.Scanner;
  * A DataSet that reads payloads from a file that are used to create each message exchange
  * along with using a pluggable transformer to customize the messages.  The file contents may optionally
  * be split using a supplied token.
- *
- * @version
  */
 public class FileDataSet extends ListDataSet {
     private File sourceFile;
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/ListDataSet.java b/camel-core/src/main/java/org/apache/camel/component/dataset/ListDataSet.java
index 5d42c9c..0407014 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/ListDataSet.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/ListDataSet.java
@@ -22,8 +22,6 @@ import java.util.List;
 /**
  * A DataSet that allows a list of static payloads to be used to create each message exchange
  * along with using a pluggable transformer to customize the messages.
- *
- * @version
  */
 public class ListDataSet extends DataSetSupport {
     private List<Object> defaultBodies;
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/SimpleDataSet.java b/camel-core/src/main/java/org/apache/camel/component/dataset/SimpleDataSet.java
index d4db969..aaf42ab 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/SimpleDataSet.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/SimpleDataSet.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.dataset;
 /**
  * A simple DataSet that allows a static payload to be used to create each message exchange
  * along with using a pluggable transformer to randomize the message.
- *
- * @version 
  */
 public class SimpleDataSet extends DataSetSupport {
     private Object defaultBody = "<hello>world!</hello>";
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java
index b667f7b..91e4361 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java
@@ -26,8 +26,6 @@ import org.apache.camel.util.ServiceHelper;
 
 /**
  * The <a href="http://camel.apache.org/direct.html">Direct Component</a> manages {@link DirectEndpoint} and holds the list of named direct endpoints.
- *
- * @version
  */
 public class DirectComponent extends DefaultComponent {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumer.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumer.java
index debed19..cc90cd7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumer.java
@@ -25,8 +25,6 @@ import org.apache.camel.spi.ShutdownAware;
 
 /**
  * The direct consumer.
- *
- * @version 
  */
 public class DirectConsumer extends DefaultConsumer implements ShutdownAware, Suspendable {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumerNotAvailableException.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumerNotAvailableException.java
index 95178c3..564cfdf 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumerNotAvailableException.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumerNotAvailableException.java
@@ -21,8 +21,6 @@ import org.apache.camel.Exchange;
 
 /**
  * Exception thrown when no consumers are available.
- *
- * @version
  */
 public class DirectConsumerNotAvailableException extends CamelExchangeException {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
index bd8b267..02dce63 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
@@ -24,8 +24,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * The direct producer.
- *
- * @version 
  */
 public class DirectProducer extends DefaultAsyncProducer {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerNotAvailableException.java b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerNotAvailableException.java
index 09fed78..519e09f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerNotAvailableException.java
+++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerNotAvailableException.java
@@ -21,8 +21,6 @@ import org.apache.camel.Exchange;
 
 /**
  * Exception thrown when no consumers are available.
- *
- * @version
  */
 public class DirectVmConsumerNotAvailableException extends CamelExchangeException {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExist.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExist.java
index 261f250..9e7ace5 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExist.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExist.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.file;
 
 /**
  * Represent the kinds of options when writing a file and what to do in case of an existing file exists.
- *
- * @version 
  */
 public enum GenericFileExist {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
index a7a460f..73e4d86 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
@@ -29,8 +29,6 @@ import org.slf4j.LoggerFactory;
  * <p/>
  * The work is for example to move the processed file into a backup folder, delete the file or
  * in case of processing failure do a rollback. 
- *
- * @version 
  */
 public class GenericFileOnCompletion<T> implements Synchronization {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperationFailedException.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperationFailedException.java
index c4b2a7b..0abdce7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperationFailedException.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperationFailedException.java
@@ -20,8 +20,6 @@ import org.apache.camel.RuntimeCamelException;
 
 /**
  * Exception thrown in case of last file operation failed.
- *
- * @version 
  */
 public class GenericFileOperationFailedException extends RuntimeCamelException {
     private static final long serialVersionUID = -64176625836814418L;
diff --git a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
index ee7806c..a166487 100644
--- a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
@@ -29,8 +29,6 @@ import org.apache.camel.util.StringHelper;
 /**
  * The <a href="http://camel.apache.org/language-component.html">Language component</a> enables sending
  * {@link org.apache.camel.Exchange}s to a given language in order to have a script executed.
- *
- * @version 
  */
 public class LanguageComponent extends DefaultComponent {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/language/LanguageProducer.java b/camel-core/src/main/java/org/apache/camel/component/language/LanguageProducer.java
index 40cdab2..8e9e9a3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/language/LanguageProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/language/LanguageProducer.java
@@ -28,8 +28,6 @@ import org.apache.camel.util.ServiceHelper;
 
 /**
  * Language producer.
- *
- * @version 
  */
 public class LanguageProducer extends DefaultProducer {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java b/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
index 160649f..c8cedc0 100644
--- a/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
@@ -32,8 +32,6 @@ import org.slf4j.LoggerFactory;
 /**
  * The <a href="http://camel.apache.org/log.html">Log Component</a>
  * is for logging message exchanges via the underlying logging mechanism.
- *
- * @version 
  */
 public class LogComponent extends DefaultComponent {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java b/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
index 81f01ee..9a2714b 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
@@ -32,8 +32,6 @@ import org.apache.camel.util.PredicateAssertHelper;
 
 /**
  * A builder of assertions on message exchanges
- *
- * @version 
  */
 public abstract class AssertionClause extends ExpressionClauseSupport<ValueBuilder> implements Runnable {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
index 27ed8d5..466ae3d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
@@ -27,8 +27,6 @@ import org.apache.camel.util.CamelLogger;
 
 /**
  * The <a href="http://camel.apache.org/mock.html">Mock Component</a> provides mock endpoints for testing.
- *
- * @version 
  */
 public class MockComponent extends DefaultComponent {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index fcdb07d..ad15812 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -89,8 +89,6 @@ import org.slf4j.LoggerFactory;
  * <b>Important:</b> If using {@link #expectedMessageCount(int)} and also {@link #expectedBodiesReceived(java.util.List)} or
  * {@link #expectedHeaderReceived(String, Object)} then the latter overrides the number of expected message based on the
  * number of values provided in the bodies/headers.
- *
- * @version 
  */
 @UriEndpoint(firstVersion = "1.0.0", scheme = "mock", title = "Mock", syntax = "mock:name", producerOnly = true, label = "core,testing", lenientProperties = true)
 public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java b/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java
index 288b302..a1314fb 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java
@@ -30,8 +30,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Represents time based clauses for setting expectations on the mocks.
  * Such as time constrains for the received messages.
- *
- * @version 
  */
 public class TimeClause extends BinaryPredicateSupport {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java b/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
index 4fef9dc..4628eaf 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
@@ -36,8 +36,6 @@ import org.apache.camel.util.IOHelper;
  * <p/>
  * You can denote <tt>classpath:</tt> or <tt>file:</tt> as prefix in the uri to select whether the file
  * is located in the classpath or on the file system.
- *
- * @version 
  */
 public class DefaultPropertiesResolver implements PropertiesResolver {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesResolver.java b/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesResolver.java
index f6923a5..25b7571 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesResolver.java
@@ -25,8 +25,6 @@ import org.apache.camel.CamelContext;
  * A resolver to load properties from a given source such as a file from a classpath.
  * <p/>
  * Implementations can also load properties from another source source as JNDI.
- *
- * @version 
  */
 public interface PropertiesResolver {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
index da51492..1fbd38f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
@@ -31,8 +31,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * The <a href="http://camel.apache.org/seda.html">SEDA Component</a> is for asynchronous SEDA exchanges on a {@link BlockingQueue} within a CamelContext
- *
- * @version 
  */
 public class SedaComponent extends DefaultComponent {
     protected final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
index 2bd21f3..50f02f1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
@@ -50,8 +50,6 @@ import org.slf4j.LoggerFactory;
  * <p/>
  * In this implementation there is a little <i>slack period</i> when you suspend/stop the consumer, by which
  * the consumer may pickup a newly arrived messages and process it. That period is up till 1 second.
- *
- * @version 
  */
 public class SedaConsumer extends ServiceSupport implements Consumer, Runnable, ShutdownAware, Suspendable {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
index 8e75292..28a5873 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
@@ -28,9 +28,6 @@ import org.apache.camel.impl.DefaultAsyncProducer;
 import org.apache.camel.support.SynchronizationAdapter;
 import org.apache.camel.util.ExchangeHelper;
 
-/**
- * @version 
- */
 public class SedaProducer extends DefaultAsyncProducer {
     
     private final SedaEndpoint endpoint;
diff --git a/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java b/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java
index 091da43..cee04c9 100644
--- a/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java
@@ -28,8 +28,6 @@ import org.apache.camel.util.URISupport;
  *
  * Component for testing by polling test messages from another endpoint on startup as the expected message bodies to
  * receive during testing.
- *
- * @version 
  */
 public class TestComponent extends DefaultComponent {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java b/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
index 44aeb8e..70106e8 100644
--- a/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
@@ -32,8 +32,6 @@ import org.apache.camel.impl.DefaultComponent;
  *
  * Represents the component that manages {@link TimerEndpoint}.  It holds the
  * list of {@link TimerConsumer} objects that are started.
- *
- * @version 
  */
 public class TimerComponent extends DefaultComponent {
     private final Map<String, Timer> timers = new HashMap<>();
diff --git a/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java b/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
index 0b99d79..dc2e150 100644
--- a/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
@@ -34,8 +34,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * The timer consumer.
- *
- * @version 
  */
 public class TimerConsumer extends DefaultConsumer implements StartupListener, Suspendable {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
index 89dd8e8..9899501 100644
--- a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
@@ -24,8 +24,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * The <a href="http://camel.apache.org/validation.html">Validator Component</a> is for validating XML against a schema
- *
- * @version
  */
 public class ValidatorComponent extends DefaultComponent {
 
diff --git a/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java b/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
index 21c8d08..dee1049 100644
--- a/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
@@ -33,8 +33,6 @@ import org.apache.camel.component.seda.SedaComponent;
  * within the classloader tree containing the camel-core.jar.
  *
  * i.e. to handle communicating across CamelContext instances and possibly across web application contexts, providing that camel-core.jar is on the system classpath.
- * 
- * @version
  */
 public class VmComponent extends SedaComponent {
     protected static final Map<String, QueueReference> QUEUES = new HashMap<>();
diff --git a/camel-core/src/main/java/org/apache/camel/converter/AttachmentConverter.java b/camel-core/src/main/java/org/apache/camel/converter/AttachmentConverter.java
index 5e032d5..ef05692 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/AttachmentConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/AttachmentConverter.java
@@ -24,8 +24,6 @@ import org.apache.camel.Converter;
 /**
  * Some useful converters for {@link Attachment}
  * to a {@link DataHandler}
- *
- * @version 
  */
 @Converter
 public final class AttachmentConverter {
diff --git a/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java b/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java
index 497af14..21287de 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java
@@ -26,8 +26,6 @@ import org.apache.camel.Processor;
 /**
  * Some useful converters for Camel APIs such as to convert a {@link Predicate} or {@link Expression}
  * to a {@link Processor}
- *
- * @version 
  */
 @Converter
 public final class CamelConverter {
diff --git a/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java b/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
index e573f9f..7200e24 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
@@ -34,8 +34,6 @@ import org.apache.camel.Converter;
 /**
  * Some core java.util Collection based
  * <a href="http://camel.apache.org/type-converter.html">Type Converters</a>
- *
- * @version 
  */
 @Converter
 public final class CollectionConverter {
diff --git a/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java b/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
index 06f52f0..47a64ad 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
@@ -55,8 +55,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Some core java.io based <a
  * href="http://camel.apache.org/type-converter.html">Type Converters</a>
- *
- * @version 
  */
 @Converter
 public final class IOConverter {
diff --git a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
index c3b4bd0..a5ecb63 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
@@ -32,8 +32,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Some core java.nio based
  * <a href="http://camel.apache.org/type-converter.html">Type Converters</a>
- *
- * @version 
  */
 @Converter
 public final class NIOConverter {
diff --git a/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java b/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
index 8eb04ca..f977417 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
@@ -27,8 +27,6 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Some core java.lang based <a
  * href="http://camel.apache.org/type-converter.html">Type Converters</a>
- *
- * @version 
  */
 @Converter
 public final class ObjectConverter {
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
index dc25a61..4111edb 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
@@ -38,8 +38,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Converts from some DOM types to Java types
- *
- * @version 
  */
 @Converter
 public final class DomConverter {
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
index 7d45089..67fb470 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
@@ -48,8 +48,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A converter of StAX objects
- *
- * @version 
  */
 @Converter
 public class StaxConverter {
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
index 36e017b..59f5c5c 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
@@ -25,8 +25,6 @@ import org.apache.camel.Converter;
 
 /**
  * A converter from {@link StreamSource} objects
- *
- * @version 
  */
 @Converter
 public final class StreamSourceConverter {
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index 71b7201..46c0195 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -78,8 +78,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A helper class to transform to and from various JAXB types such as {@link Source} and {@link Document}
- *
- * @version
  */
 @Converter
 public class XmlConverter {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/BreakpointSupport.java b/camel-core/src/main/java/org/apache/camel/impl/BreakpointSupport.java
index 808b098..ca874d1 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/BreakpointSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/BreakpointSupport.java
@@ -27,8 +27,6 @@ import org.apache.camel.spi.Breakpoint;
  * A support class for {@link Breakpoint} implementations to use as base class.
  * <p/>
  * Will be in active state.
- *
- * @version 
  */
 public abstract class BreakpointSupport implements Breakpoint {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java b/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
index cb30544..b7298f7 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
@@ -52,8 +52,6 @@ import org.slf4j.LoggerFactory;
  * reused by both the <a href="http://camel.apache.org/spring.html">Spring</a>,
  * <a href="http://camel.apache.org/guice.html">Guice</a> and
  * <a href="http://camel.apache.org/blueprint.html">Blueprint</a> support.
- *
- * @version
  */
 public class CamelPostProcessorHelper implements CamelContextAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ConditionSupport.java b/camel-core/src/main/java/org/apache/camel/impl/ConditionSupport.java
index 5a966fd..54d0d3a 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ConditionSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ConditionSupport.java
@@ -25,8 +25,6 @@ import org.apache.camel.spi.Condition;
 
 /**
  * A support class for {@link org.apache.camel.spi.Condition} implementations to use as base class.
- *
- * @version 
  */
 public class ConditionSupport implements Condition {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java b/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
index 02cf4c8..798f126 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
@@ -30,8 +30,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Cache containing created {@link org.apache.camel.Consumer}.
- *
- * @version 
  */
 public class ConsumerCache extends ServiceSupport {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProducer.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProducer.java
index 652f444..b0ec87e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProducer.java
@@ -25,8 +25,6 @@ import org.apache.camel.util.AsyncProcessorHelper;
 /**
  * A default implementation of {@link org.apache.camel.Producer} for implementation inheritance,
  * which can process {@link Exchange}s asynchronously.
- *
- * @version 
  */
 public abstract class DefaultAsyncProducer extends DefaultProducer implements AsyncProducer {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index daf04a1..707d5fd 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -197,8 +197,6 @@ import static org.apache.camel.impl.MDCUnitOfWork.MDC_CAMEL_CONTEXT_ID;
 
 /**
  * Represents the context used to configure routes and the policies to use.
- *
- * @version
  */
 @SuppressWarnings("deprecation")
 public class DefaultCamelContext extends ServiceSupport implements ModelCamelContext, ManagedCamelContext, Suspendable {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java
index ef5b95b..4b9fa26 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java
@@ -22,8 +22,6 @@ import org.apache.camel.spi.CamelContextNameStrategy;
 
 /**
  * A default name strategy which auto assigns a name using a prefix-counter pattern.
- *
- * @version 
  */
 public class DefaultCamelContextNameStrategy implements CamelContextNameStrategy {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
index e8044a5..de21211 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
@@ -32,8 +32,6 @@ import org.slf4j.LoggerFactory;
  * components by using the URI scheme prefix and searching for a file of the URI
  * scheme name in the <b>META-INF/services/org/apache/camel/component/</b>
  * directory on the classpath.
- *
- * @version
  */
 public class DefaultComponentResolver implements ComponentResolver {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
index 9ab5a3d..fe22f3e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
@@ -34,8 +34,6 @@ import org.apache.camel.util.UnitOfWorkHelper;
 
 /**
  * A default consumer useful for implementation inheritance.
- *
- * @version 
  */
 public class DefaultConsumer extends ServiceSupport implements Consumer, RouteAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
index 175e6d5..ea861af 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
@@ -36,8 +36,6 @@ import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
  * Template (named like Spring's TransactionTemplate & JmsTemplate
  * et al) for working with Camel and consuming {@link org.apache.camel.Message} instances in an
  * {@link Exchange} from an {@link Endpoint}.
- *
- * @version 
  */
 public class DefaultConsumerTemplate extends ServiceSupport implements ConsumerTemplate {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
index 571799a..0ee6570 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
@@ -26,8 +26,6 @@ import org.apache.camel.util.ResolverHelper;
 
 /**
  * Default data format resolver
- *
- * @version
  */
 public class DefaultDataFormatResolver implements DataFormatResolver {
     public static final String DATAFORMAT_RESOURCE_PATH = "META-INF/services/org/apache/camel/dataformat/";
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
index dcd0a21..99726b0 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
@@ -48,8 +48,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * The default implementation of the {@link Debugger}.
- *
- * @version 
  */
 public class DefaultDebugger implements Debugger, CamelContextAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
index d7d7632..7206ca8 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
@@ -52,8 +52,6 @@ import org.slf4j.LoggerFactory;
  * endpoint allows Camel end users to dictate whether they want the asynchronous
  * model or not. The option is default <tt>false</tt> which means asynchronous
  * processing is allowed.
- * 
- * @version
  */
 public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint, HasId, CamelContextAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
index eb85d4a..c2357d4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
@@ -39,8 +39,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * A default implementation of {@link Exchange}
- *
- * @version 
  */
 public final class DefaultExchange implements Exchange {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
index 681ff4c..ae23a06 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
@@ -61,8 +61,6 @@ import org.slf4j.LoggerFactory;
  * primitive, String, and Number types (and Exception types for exchange properties). Any other type is skipped.
  * Any message body object that is not serializable will be skipped and Camel will log this at <tt>WARN</tt> level.
  * And any message header values that is not a primitive value will be skipped and Camel will log this at <tt>DEBUG</tt> level.
- *
- * @version 
  */
 public class DefaultExchangeHolder implements Serializable {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinderResolver.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinderResolver.java
index 51abb9b..1d2792d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinderResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinderResolver.java
@@ -22,8 +22,6 @@ import org.apache.camel.spi.FactoryFinderResolver;
 
 /**
  * Default factory finder.
- *
- * @version 
  */
 public class DefaultFactoryFinderResolver implements FactoryFinderResolver {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
index c11a4c4..9d48719 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
@@ -36,8 +36,6 @@ import org.apache.camel.spi.HeaderFilterStrategy;
  * to a native message like JMS and CXF message. You can see example of
  * DefaultHeaderFilterStrategy are being extended and invoked in camel-jms 
  * and camel-cxf components.
- *
- * @version 
  */
 public class DefaultHeaderFilterStrategy implements HeaderFilterStrategy {
     
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
index 102c358..9b68d09 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
@@ -37,8 +37,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Default {@link org.apache.camel.spi.InflightRepository}.
- *
- * @version 
  */
 public class DefaultInflightRepository extends ServiceSupport implements InflightRepository {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
index b7862ce..bb51158 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
@@ -29,8 +29,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Default language resolver that looks for language factories in <b>META-INF/services/org/apache/camel/language/</b> and
  * language resolvers in <b>META-INF/services/org/apache/camel/language/resolver/</b>.
- *
- * @version
  */
 public class DefaultLanguageResolver implements LanguageResolver {
     public static final String LANGUAGE_RESOURCE_PATH = "META-INF/services/org/apache/camel/language/";
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
index 70f8b90..33c970f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
@@ -41,8 +41,6 @@ import org.apache.camel.util.ObjectHelper;
  * See more details at {@link org.apache.camel.util.CaseInsensitiveMap}.
  * The implementation of the map can be configured by the {@link HeadersMapFactory} which can be set
  * on the {@link CamelContext}. The default implementation uses the {@link org.apache.camel.util.CaseInsensitiveMap CaseInsensitiveMap}.
- *
- * @version 
  */
 public class DefaultMessage extends MessageSupport {
     private boolean fault;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java
index 90acc52..cfc8d40 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java
@@ -25,8 +25,6 @@ import org.apache.camel.spi.NodeIdFactory;
 
 /**
  * Default id factory.
- *
- * @version 
  */
 public class DefaultNodeIdFactory implements NodeIdFactory {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java
index 1e54055..5d4dded 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java
@@ -24,8 +24,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A default implementation that will not retry on rollback.
- *
- * @version 
  */
 public class DefaultPollingConsumerPollStrategy implements PollingConsumerPollStrategy {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java
index a4a1b0b..5142a34 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Processor;
 
 /**
  * A base class for an endpoint which the default consumer mode is to use a {@link org.apache.camel.PollingConsumer}
- *
- * @version 
  */
 public abstract class DefaultPollingEndpoint extends ScheduledPollEndpoint  {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
index 019b748..1431730 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
@@ -26,8 +26,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A default implementation of {@link Producer} for implementation inheritance.
- *
- * @version 
  */
 public abstract class DefaultProducer extends ServiceSupport implements Producer {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
index 2eceb58..19c8535 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
@@ -46,8 +46,6 @@ import org.apache.camel.util.concurrent.SynchronousExecutorService;
  * Template (named like Spring's TransactionTemplate & JmsTemplate
  * et al) for working with Camel and sending {@link Message} instances in an
  * {@link Exchange} to an {@link Endpoint}.
- *
- * @version 
  */
 public class DefaultProducerTemplate extends ServiceSupport implements ProducerTemplate {
     private final CamelContext camelContext;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
index b5cd297..10105b3 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
@@ -35,8 +35,6 @@ import org.apache.camel.util.TimeUtils;
  * Use the API from {@link org.apache.camel.CamelContext} to control the lifecycle of a route,
  * such as starting and stopping using the {@link org.apache.camel.spi.RouteController#startRoute(String)}
  * and {@link org.apache.camel.spi.RouteController#stopRoute(String)} methods.
- *
- * @version 
  */
 public abstract class DefaultRoute extends ServiceSupport implements Route {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
index 247890c..c2680d4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
@@ -50,8 +50,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * The context used to activate new routing rules
- *
- * @version 
  */
 public class DefaultRouteContext implements RouteContext {
     private final Map<NamedNode, AtomicInteger> nodeIndex = new HashMap<>();
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java
index d6b81b6..9cb3fe3 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java
@@ -28,8 +28,6 @@ import org.apache.camel.spi.RouteStartupOrder;
 
 /**
  * Default implementation of {@link org.apache.camel.spi.RouteStartupOrder}.
- *
- * @version 
  */
 public class DefaultRouteStartupOrder implements RouteStartupOrder {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
index 847574d..7a9f346 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
@@ -27,8 +27,6 @@ import org.apache.camel.util.ServiceHelper;
 /**
  * A default implementation of an event driven {@link org.apache.camel.Consumer} which uses the
  * {@link PollingConsumer}
- *
- * @version 
  */
 public class DefaultScheduledPollConsumer extends ScheduledPollConsumer {
     private PollingConsumer pollingConsumer;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
index 7d70ff6..457191e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
@@ -110,8 +110,6 @@ import org.slf4j.LoggerFactory;
  * <p/>
  * This information can also be obtained from the {@link org.apache.camel.spi.InflightRepository}
  * at all time during runtime.
- *
- * @version
  */
 public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownStrategy, CamelContextAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
index 6fca426..c8e5b1e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
@@ -38,8 +38,6 @@ import org.apache.camel.util.EndpointHelper;
  * Use the API from {@link org.apache.camel.CamelContext} to control the lifecycle of a route,
  * such as starting and stopping using the {@link org.apache.camel.spi.RouteController#startRoute(String)}
  * and {@link org.apache.camel.spi.RouteController#stopRoute(String)} methods.
- *
- * @version 
  */
 public class EventDrivenConsumerRoute extends DefaultRoute {
     private final Processor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
index 1fac509..695d0c9 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
@@ -39,8 +39,6 @@ import org.slf4j.LoggerFactory;
  * A default implementation of the {@link org.apache.camel.PollingConsumer} which uses the normal
  * asynchronous consumer mechanism along with a {@link BlockingQueue} to allow
  * the caller to pull messages on demand.
- *
- * @version 
  */
 public class EventDrivenPollingConsumer extends PollingConsumerSupport implements Processor, IsSingleton {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java
index 0579b50..560f30d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java
@@ -21,8 +21,6 @@ import org.apache.camel.util.StringHelper;
 
 /**
  * Strategy to used an explicit (fixed) name for {@link org.apache.camel.CamelContext}.
- *
- * @version 
  */
 public class ExplicitCamelContextNameStrategy implements CamelContextNameStrategy {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
index 044d538..87d64de 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
@@ -34,8 +34,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * This is an endpoint when sending to it, is intercepted and is routed in a detour
- *
- * @version 
  */
 public class InterceptSendToEndpoint implements Endpoint, ShutdownableService {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java
index 3a25979..cd4e065 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java
@@ -32,8 +32,6 @@ import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
  * <p/>
  * This strategy will only apply when new endpoints are being created. If you want to replace
  * existing endpoints, you will have to remove them from the {@link org.apache.camel.CamelContext} beforehand.
- *
- * @version 
  */
 public class InterceptSendToMockEndpointStrategy implements EndpointStrategy {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java
index 926f8f0..6f566f2 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java
@@ -30,8 +30,6 @@ import org.apache.camel.util.ServiceHelper;
  * <p/>
  * If Camel cannot successfully consumer from a given consumer, then after X consecutive failed attempts the consumer
  * will be suspended/stopped. This prevents the log to get flooded with failed attempts, for example during nightly runs.
- *
- * @version 
  */
 public class LimitedPollingConsumerPollStrategy extends DefaultPollingConsumerPollStrategy implements Service {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java b/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
index f0f834a..a347d50 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
@@ -27,8 +27,6 @@ import org.slf4j.MDC;
 
 /**
  * This unit of work supports <a href="http://www.slf4j.org/api/org/slf4j/MDC.html">MDC</a>.
- *
- * @version 
  */
 public class MDCUnitOfWork extends DefaultUnitOfWork {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java b/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
index 9498a7f..8360d97 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
@@ -32,8 +32,6 @@ import org.apache.camel.spi.DataTypeAware;
  *
  * Unless a specific provider wishes to do something particularly clever with
  * headers you probably want to just derive from {@link DefaultMessage}
- *
- * @version
  */
 public abstract class MessageSupport implements Message, CamelContextAware, DataTypeAware {
     private CamelContext camelContext;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java b/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
index 14d0f06..1fb3c0c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
@@ -26,8 +26,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A useful base class for implementations of {@link PollingConsumer}
- * 
- * @version 
  */
 public abstract class PollingConsumerSupport extends ServiceSupport implements PollingConsumer {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
index 50f2778..f751292 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
@@ -34,8 +34,6 @@ import org.apache.camel.Producer;
  * If your producers/consumers need more control of its lifecycle it is advised instead to extend
  * {@link org.apache.camel.impl.DefaultEndpoint}, {@link org.apache.camel.impl.DefaultProducer}
  * and {@link org.apache.camel.impl.DefaultConsumer}.
- *
- * @version 
  */
 public class ProcessorEndpoint extends DefaultPollingEndpoint {
     private Processor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProcessorPollingConsumer.java b/camel-core/src/main/java/org/apache/camel/impl/ProcessorPollingConsumer.java
index d3ec52b..77de158 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProcessorPollingConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProcessorPollingConsumer.java
@@ -29,8 +29,6 @@ import org.apache.camel.util.ServiceHelper;
  * A simple implementation of {@link org.apache.camel.PollingConsumer} which just uses
  * a {@link Processor}. This implementation does not support timeout based
  * receive methods such as {@link #receive(long)}
- *
- * @version 
  */
 public class ProcessorPollingConsumer extends PollingConsumerSupport implements IsSingleton {
     private final Processor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index 2caecb6..dfcf898 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -41,8 +41,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Cache containing created {@link Producer}.
- *
- * @version
  */
 public class ProducerCache extends ServiceSupport {
 
@@ -483,8 +481,7 @@ public class ProducerCache extends ServiceSupport {
      * Using this callback as a template pattern ensures that Camel handles the resource handling and will
      * start and stop the given producer, to avoid resource leaks.
      *
-     * @version
-     */
+         */
     public interface AsyncProducerCallback {
 
         /**
diff --git a/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java
index c6b9b22..045cba4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java
@@ -27,8 +27,6 @@ import org.apache.camel.util.ObjectHelper;
  * A {@link Registry} which delegates to the real registry.
  * <p/>
  * This is used to ensure that Camel performs property placeholder resolution on every lookup.
- *
- * @version 
  */
 public class PropertyPlaceholderDelegateRegistry implements Registry {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/RouteService.java b/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
index 8baaa55..9199e62 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
@@ -56,8 +56,6 @@ import static org.apache.camel.impl.MDCUnitOfWork.MDC_ROUTE_ID;
 /**
  * Represents the runtime objects for a given {@link RouteDefinition} so that it can be stopped independently
  * of other routes
- *
- * @version 
  */
 public class RouteService extends ChildServiceSupport {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
index e8a3fd3..5bf1c77 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
@@ -34,8 +34,6 @@ import org.apache.camel.util.IntrospectionSupport;
 
 /**
  * A base class for {@link org.apache.camel.Endpoint} which creates a {@link ScheduledPollConsumer}
- *
- * @version
  */
 public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java b/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java
index c675833..8e1cfee 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java
@@ -30,8 +30,6 @@ import org.apache.camel.util.ExchangeHelper;
 /**
  * The <a href="http://camel.apache.org/data-format.html">data format</a>
  * using Java Serialization.
- *
- * @version 
  */
 public class SerializationDataFormat extends org.apache.camel.support.ServiceSupport implements DataFormat, DataFormatName {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ServicePool.java b/camel-core/src/main/java/org/apache/camel/impl/ServicePool.java
index 83fc313..3343676 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ServicePool.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ServicePool.java
@@ -42,8 +42,6 @@ import sun.misc.Unsafe;
  * (the capacity) services. The pool can contain an unbounded number of keys.
  * <p/>
  * By default the capacity is set to 100.
- *
- * @version 
  */
 public class ServicePool<S extends Service> extends ServiceSupport implements NonManagedService {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/StringDataFormat.java b/camel-core/src/main/java/org/apache/camel/impl/StringDataFormat.java
index 8003f84..bc88743 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/StringDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/StringDataFormat.java
@@ -28,8 +28,6 @@ import org.apache.camel.util.ExchangeHelper;
 /**
  * The text based <a href="http://camel.apache.org/data-format.html">data format</a> supporting
  * charset encoding.
- *
- * @version 
  */
 public class StringDataFormat extends org.apache.camel.support.ServiceSupport implements DataFormat, DataFormatName {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/SynchronousDelegateProducer.java b/camel-core/src/main/java/org/apache/camel/impl/SynchronousDelegateProducer.java
index d68104e..53f7ddd 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/SynchronousDelegateProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/SynchronousDelegateProducer.java
@@ -30,8 +30,6 @@ import org.apache.camel.Producer;
  * This delegate allows the component developers easily to support their
  * existing asynchronous producer to behave synchronously by wrapping their
  * producer in this synchronous delegate.
- *
- * @version 
  */
 public class SynchronousDelegateProducer implements Producer {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java b/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java
index a81c831..6792ce8 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java
@@ -46,8 +46,6 @@ import org.slf4j.LoggerFactory;
  * method. If the route scope is selected then <b>no</b> {@link org.apache.camel.spi.EventNotifier} is in use, as there is already
  * a {@link org.apache.camel.spi.Synchronization} callback on the current {@link Exchange} which triggers the
  * {@link #throttle(org.apache.camel.Route, org.apache.camel.Exchange)} when the current {@link Exchange} is done.
- *
- * @version 
  */
 public class ThrottlingInflightRoutePolicy extends RoutePolicySupport implements CamelContextAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
index 006aacd..6e16e4f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
@@ -62,8 +62,6 @@ import org.slf4j.LoggerFactory;
  * Therefore its recommended to specify FQN class names in the {@link #META_INF_SERVICES} file.
  * Likewise the procedure for scanning using {@link PackageScanClassResolver} may require custom implementations
  * to work in various containers such as JBoss, OSGi, etc.
- *
- * @version
  */
 public class AnnotationTypeConverterLoader implements TypeConverterLoader {
     public static final String META_INF_SERVICES = "META-INF/services/org/apache/camel/TypeConverter";
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
index 29b795a..9bdb5bb 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
@@ -29,8 +29,6 @@ import org.apache.camel.support.TypeConverterSupport;
  * A type converter which is used to convert to and from array types
  * particularly for derived types of array component types and dealing with
  * primitive array types.
- *
- * @version 
  */
 public class ArrayTypeConverter extends TypeConverterSupport {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
index ad011a2..af88992 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
@@ -26,8 +26,6 @@ import org.apache.camel.util.AsyncProcessorConverterHelper;
  * A simple converter that can convert any {@link Processor} to an {@link AsyncProcessor}.
  * Processing will still occur synchronously but it will provide the required
  * notifications that the caller expects.
- *
- * @version
  */
 public class AsyncProcessorTypeConverter extends TypeConverterSupport {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
index 5523604..0972686 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
@@ -59,8 +59,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Base implementation of a type converter registry used for
  * <a href="http://camel.apache.org/type-converter.html">type converters</a> in Camel.
- *
- * @version 
  */
 public abstract class BaseTypeConverterRegistry extends ServiceSupport implements TypeConverter, TypeConverterRegistry, CamelContextAware {
     protected final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java b/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
index f60e986..7f987e1 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
@@ -20,8 +20,6 @@ import org.apache.camel.spi.TypeConverterRegistry;
 
 /**
  * A caching proxy
- *
- * @version 
  */
 public class CachingInjector<T> {
     private final TypeConverterRegistry repository;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
index 0adbb16..0e23ef1 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
@@ -25,8 +25,6 @@ import org.apache.camel.spi.PackageScanClassResolver;
  * <a href="http://camel.apache.org/type-converter.html">type converters</a> in Camel.
  * <p/>
  * This implementation will load type converters up-front on startup.
- *
- * @version 
  */
 public class DefaultTypeConverter extends BaseTypeConverterRegistry {
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java
index 33f5261..3ed1f5e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java
@@ -30,8 +30,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Future type converter.
- *
- * @version 
  */
 @Converter
 public final class FutureTypeConverter extends TypeConverterSupport {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
index 2d6f002..3500e84 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
@@ -27,8 +27,6 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * A {@link org.apache.camel.TypeConverter} implementation which instantiates an object
  * so that an instance method can be used as a fallback type converter
- *
- * @version 
  */
 public class InstanceMethodFallbackTypeConverter extends TypeConverterSupport {
     private final CachingInjector<?> injector;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
index a0b329d..62ebef9 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
@@ -29,8 +29,6 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * A {@link TypeConverter} implementation which instantiates an object
  * so that an instance method can be used as a type converter
- *
- * @version 
  */
 public class InstanceMethodTypeConverter extends TypeConverterSupport {
     private final CachingInjector<?> injector;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
index 7d07c49..2d1e8aa 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
@@ -26,8 +26,6 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * A {@link org.apache.camel.TypeConverter} implementation which invokes a static method
  * as a fallback type converter from a type to another type
- *
- * @version 
  */
 public class StaticMethodFallbackTypeConverter extends TypeConverterSupport {
     private final Method method;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
index 371add7..3febab2 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
@@ -25,8 +25,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * A {@link TypeConverter} implementation which invokes a static method to convert from a type to another type
- *
- * @version 
  */
 public class StaticMethodTypeConverter extends TypeConverterSupport {
     private final Method method;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java b/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
index f2b49e5..f58a91f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
@@ -48,7 +48,6 @@ import java.util.Map;
  * implementation of the Tracker class.
  * 
  * @ThreadSafe
- * @version 
  * @since 1.4
  */
 abstract class AbstractTracked {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java b/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java
index ed1ce5d..0637e77 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java
@@ -60,7 +60,6 @@ import org.osgi.framework.SynchronousBundleListener;
  * thread-safe.
  * 
  * @ThreadSafe
- * @version 
  * @since 1.4
  */
 public class BundleTracker implements BundleTrackerCustomizer {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTrackerCustomizer.java b/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTrackerCustomizer.java
index 9ea69fe..4221a30 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTrackerCustomizer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTrackerCustomizer.java
@@ -61,7 +61,6 @@ import org.osgi.framework.BundleEvent;
  * thread-safe.
  * 
  * @ThreadSafe
- * @version 
  * @since 1.4
  */
 public interface BundleTrackerCustomizer {
diff --git a/camel-core/src/main/java/org/apache/camel/language/Bean.java b/camel-core/src/main/java/org/apache/camel/language/Bean.java
index cd56fc7..d3e1ffb 100644
--- a/camel-core/src/main/java/org/apache/camel/language/Bean.java
+++ b/camel-core/src/main/java/org/apache/camel/language/Bean.java
@@ -27,8 +27,6 @@ import org.apache.camel.component.bean.BeanAnnotationExpressionFactory;
 /**
  * Used to inject a bean expression into a field, property, method or parameter when using
  * <a href="http://camel.apache.org/bean-integration.html">Bean Integration</a>.
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java b/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java
index cdc7df7..42550d7 100644
--- a/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java
+++ b/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java
@@ -26,8 +26,6 @@ import org.apache.camel.component.bean.DefaultAnnotationExpressionFactory;
 
 /**
  * Base annotation for languages.
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java b/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java
index 0f9e6f6..bcc94f6 100644
--- a/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java
@@ -24,8 +24,6 @@ import java.lang.annotation.Target;
 
 /**
  * Base annotation for language expressions.
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java b/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java
index 6db9b0a..386ba53 100644
--- a/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java
+++ b/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java
@@ -24,8 +24,6 @@ import java.lang.annotation.Target;
 
 /**
  * Creates a namespace prefix for an XPath
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/language/Simple.java b/camel-core/src/main/java/org/apache/camel/language/Simple.java
index a1d01f3..88acd88 100644
--- a/camel-core/src/main/java/org/apache/camel/language/Simple.java
+++ b/camel-core/src/main/java/org/apache/camel/language/Simple.java
@@ -25,8 +25,6 @@ import java.lang.annotation.Target;
 /**
  * Used to inject a simple expression into a field, property, method or parameter when using
  * <a href="http://camel.apache.org/bean-integration.html">Bean Integration</a>.
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/language/XPath.java b/camel-core/src/main/java/org/apache/camel/language/XPath.java
index edf0da1..ba11f00 100644
--- a/camel-core/src/main/java/org/apache/camel/language/XPath.java
+++ b/camel-core/src/main/java/org/apache/camel/language/XPath.java
@@ -27,8 +27,6 @@ import org.apache.camel.component.bean.XPathAnnotationExpressionFactory;
 /**
  * Used to inject an XPath expression into a field, property, method or parameter when using
  * <a href="http://camel.apache.org/bean-integration.html">Bean Integration</a>.
- *
- * @version 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java b/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
index 58ef2f2..5f81aca 100644
--- a/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
+++ b/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
@@ -36,8 +36,6 @@ import org.apache.camel.util.StringHelper;
  * <p/>
  * As of Camel 1.5 the bean language also supports invoking a provided bean by
  * its classname or the bean itself.
- *
- * @version 
  */
 public class BeanLanguage implements Language, IsSingleton {
 
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java b/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java
index 2cd6920..5a06525 100644
--- a/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java
+++ b/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java
@@ -21,8 +21,6 @@ import org.apache.camel.RuntimeExpressionException;
 
 /**
  * Exception thrown if invocation of bean failed.
- *
- * @version 
  */
 public class RuntimeBeanExpressionException extends RuntimeExpressionException {
     private static final long serialVersionUID = -7184254079414493118L;
diff --git a/camel-core/src/main/java/org/apache/camel/main/Main.java b/camel-core/src/main/java/org/apache/camel/main/Main.java
index 26a910f..0e2e0d1 100644
--- a/camel-core/src/main/java/org/apache/camel/main/Main.java
+++ b/camel-core/src/main/java/org/apache/camel/main/Main.java
@@ -29,8 +29,6 @@ import org.apache.camel.spi.Registry;
 
 /**
  * A command line tool for booting up a CamelContext
- *
- * @version 
  */
 public class Main extends MainSupport {
 
diff --git a/camel-core/src/main/java/org/apache/camel/main/MainSupport.java b/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
index ef14275..097e799 100644
--- a/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
@@ -45,8 +45,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Base class for main implementations to allow starting up a JVM with Camel embedded.
- *
- * @version 
  */
 public abstract class MainSupport extends ServiceSupport {
     protected static final Logger LOG = LoggerFactory.getLogger(MainSupport.class);
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
index 3e2a133..feaa52a 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
@@ -113,7 +113,6 @@ import org.apache.camel.util.ObjectHelper;
  * {@link org.apache.camel.spi.ManagementStrategy}.
  *
  * @see org.apache.camel.spi.ManagementStrategy
- * @version 
  */
 @SuppressWarnings("deprecation")
 public class DefaultManagementLifecycleStrategy extends ServiceSupport implements LifecycleStrategy, CamelContextAware {
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
index 444722f..2ae19d4 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
@@ -37,8 +37,6 @@ import org.apache.camel.util.ServiceHelper;
  * An assembler to assemble a {@link javax.management.modelmbean.ModelMBean} which can be used
  * to register the object in JMX. The assembler is capable of using the Camel JMX annotations to
  * gather the list of JMX operations and attributes.
- *
- * @version 
  */
 public class DefaultManagementMBeanAssembler extends ServiceSupport implements ManagementMBeanAssembler {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
index 8d00550..8de5adc 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
@@ -48,7 +48,6 @@ import org.slf4j.LoggerFactory;
  * provided by Camel extends this class as well.
  *
  * @see ManagedManagementStrategy
- * @version 
  */
 public class DefaultManagementStrategy extends ServiceSupport implements ManagementStrategy, CamelContextAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java b/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java
index 0a0dbff..7a8cc12 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java
@@ -30,8 +30,6 @@ import org.apache.camel.api.management.PerformanceCounter;
  * <p/>
  * This delegation is needed as how Camel is designed to register services in the
  * {@link org.apache.camel.spi.LifecycleStrategy} in various stages.
- *
- * @version 
  */
 public class DelegatePerformanceCounter implements PerformanceCounter {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java b/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
index a1712a1..184865e 100644
--- a/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
@@ -34,8 +34,6 @@ import org.apache.camel.util.KeyValueHolder;
  * <p/>
  * This class looks up a map to determine which PerformanceCounter should go into the
  * InstrumentationProcessor for any particular target processor.
- *
- * @version 
  */
 public class InstrumentationInterceptStrategy implements InterceptStrategy {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java b/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
index 635cf61..5c5a7a5 100644
--- a/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
@@ -34,8 +34,6 @@ import org.slf4j.LoggerFactory;
  * <p/>
  * This implementation has been optimised to work in dual mode, either as an advice or as a processor.
  * The former is faster and the latter is required when the error handler has been configured with redelivery enabled.
- *
- * @version 
  */
 public class InstrumentationProcessor extends DelegateAsyncProcessor implements CamelInternalProcessorAdvice<StopWatch>, Ordered {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/JmxNotificationEventNotifier.java b/camel-core/src/main/java/org/apache/camel/management/JmxNotificationEventNotifier.java
index d2a05c4..850be7d 100644
--- a/camel-core/src/main/java/org/apache/camel/management/JmxNotificationEventNotifier.java
+++ b/camel-core/src/main/java/org/apache/camel/management/JmxNotificationEventNotifier.java
@@ -30,8 +30,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A JMX based {@link EventNotifier} which broadcasts JMX {@link Notification}s.
- *
- * @version 
  */
 public class JmxNotificationEventNotifier extends EventNotifierSupport implements JmxNotificationBroadcasterAware {
     private static final Logger LOG = LoggerFactory.getLogger(JmxNotificationEventNotifier.class);
diff --git a/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java b/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
index 8fc9040..75aba15 100644
--- a/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
+++ b/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
@@ -18,8 +18,6 @@ package org.apache.camel.management;
 
 /**
  * This module contains jmx related system property key constants.
- *
- * @version 
  */
 public final class JmxSystemPropertyKeys {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/LoggingEventNotifier.java b/camel-core/src/main/java/org/apache/camel/management/LoggingEventNotifier.java
index 5c0d336..8b82ec2 100644
--- a/camel-core/src/main/java/org/apache/camel/management/LoggingEventNotifier.java
+++ b/camel-core/src/main/java/org/apache/camel/management/LoggingEventNotifier.java
@@ -25,8 +25,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Logging event notifier that only notifies if <tt>INFO</tt> log level has
  * been configured for its logger.
- *
- * @version 
  */
 public class LoggingEventNotifier extends EventNotifierSupport {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java b/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
index 97686df..f6211a5 100644
--- a/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
@@ -51,7 +51,6 @@ import org.slf4j.LoggerFactory;
  *
  * @see org.apache.camel.spi.ManagementStrategy
  * @see org.apache.camel.management.DefaultManagementStrategy
- * @version 
  */
 public class ManagedManagementStrategy extends DefaultManagementStrategy {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java b/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java
index 17d0ed9..79b5ec5 100644
--- a/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java
+++ b/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java
@@ -35,8 +35,6 @@ import org.apache.camel.util.URISupport;
  * This notifier is only enabled when {@link CamelContext} is started. This avoids problems when
  * sending notifications during start/shutdown of {@link CamelContext} which causes problems by
  * sending those events to Camel routes by this notifier.
- *
- * @version 
  */
 public class PublishEventNotifier extends EventNotifierSupport implements CamelContextAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/AbstractContextEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/AbstractContextEvent.java
index cd3540e..6daa2ef 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/AbstractContextEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/AbstractContextEvent.java
@@ -22,8 +22,6 @@ import org.apache.camel.CamelContext;
 
 /**
  * Base class for {@link CamelContext} events.
- *
- * @version 
  */
 public abstract class AbstractContextEvent extends EventObject {
     private static final long serialVersionUID = 1L;
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java
index 715e3a7..5573ce7 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java
@@ -22,8 +22,6 @@ import org.apache.camel.Exchange;
 
 /**
  * Base class for {@link Exchange} events.
- *
- * @version 
  */
 public abstract class AbstractExchangeEvent extends EventObject {
     private static final long serialVersionUID = 1L;
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/AbstractRouteEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/AbstractRouteEvent.java
index 8de3be8..be0ce89 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/AbstractRouteEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/AbstractRouteEvent.java
@@ -23,8 +23,6 @@ import org.apache.camel.Route;
 
 /**
  * Base class for {@link CamelContext} events.
- *
- * @version 
  */
 public abstract class AbstractRouteEvent extends EventObject {
     private static final long serialVersionUID = 1L;
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java
index c2f4df2..a13718f 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class CamelContextResumeFailureEvent extends AbstractContextEvent implements FailureEvent {
     private static final long serialVersionUID = -4271899927507894566L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java
index 5baa430..1c0fee6 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class CamelContextResumedEvent extends AbstractContextEvent {
     private static final long serialVersionUID = 6761726800283234512L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java
index d788b4a..e7d4375 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class CamelContextResumingEvent extends AbstractContextEvent {
     private static final long serialVersionUID = 6761726800283234511L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java
index 2086be5..5ee2aeb 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class CamelContextStartedEvent extends AbstractContextEvent {
     private static final long serialVersionUID = 6761726800283073490L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java
index de5b9a7..769d5e8 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class CamelContextStartingEvent extends AbstractContextEvent {
     private static final long serialVersionUID = -1120225323715688981L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
index 11f31a2..243913f 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class CamelContextStartupFailureEvent extends AbstractContextEvent implements FailureEvent {
     private static final long serialVersionUID = -4271899927507894567L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
index 9dc4365..cee25d0 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class CamelContextStopFailureEvent extends AbstractContextEvent implements FailureEvent {
     private static final long serialVersionUID = -802046840118188292L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java
index 86e64e3..d2862b6 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class CamelContextStoppedEvent extends AbstractContextEvent {
     private static final long serialVersionUID = -8406258841784891998L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java
index 59b63db..10723ff 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class CamelContextStoppingEvent extends AbstractContextEvent {
     private static final long serialVersionUID = -1074581102102126334L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java
index 8c54d71..98219d5 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class CamelContextSuspendedEvent extends AbstractContextEvent {
     private static final long serialVersionUID = 6761726800283072242L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java
index 4c8cce1..c10c42b 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class CamelContextSuspendingEvent extends AbstractContextEvent {
     private static final long serialVersionUID = 6761726800283072241L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java b/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java
index 4bf7f7f..696437b 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java
@@ -28,8 +28,6 @@ import org.apache.camel.spi.EventFactory;
 
 /**
  * Default implementation of the {@link org.apache.camel.spi.EventFactory}.
- *
- * @version 
  */
 public class DefaultEventFactory implements EventFactory {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCompletedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCompletedEvent.java
index 43a0cb7..f73aab1 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCompletedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCompletedEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.Exchange;
 
-/**
- * @version 
- */
 public class ExchangeCompletedEvent extends AbstractExchangeEvent {
     private static final long serialVersionUID = -3231801412021356098L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCreatedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCreatedEvent.java
index d60c314..761354f 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCreatedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCreatedEvent.java
@@ -24,8 +24,6 @@ import org.apache.camel.Exchange;
  * <b>Notice:</b> This event may be emitted after an {@link ExchangeSendingEvent}, and
  * therefore its not guaranteed this event is the first event being send for a given {@link Exchange}
  * lifecycle.
- *
- * @version 
  */
 public class ExchangeCreatedEvent extends AbstractExchangeEvent {
     private static final long serialVersionUID = -19248832613958243L;
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java
index f6cf273..1a4bd3a 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.Exchange;
 
-/**
- * @version 
- */
 public class ExchangeFailedEvent extends AbstractExchangeEvent implements FailureEvent {
     private static final long serialVersionUID = -8484326904627268101L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java
index 862fb3a..b4ad79e 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java
@@ -20,9 +20,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.util.URISupport;
 
-/**
- * @version 
- */
 public class ExchangeFailureHandledEvent extends AbstractExchangeEvent {
     private static final long serialVersionUID = -7554809462006009548L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandlingEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandlingEvent.java
index 614b308..99e5093 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandlingEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandlingEvent.java
@@ -20,9 +20,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.util.URISupport;
 
-/**
- * @version 
- */
 public class ExchangeFailureHandlingEvent extends AbstractExchangeEvent {
     private static final long serialVersionUID = -7554809462006009549L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeRedeliveryEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeRedeliveryEvent.java
index 727a55f..c5af078 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeRedeliveryEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeRedeliveryEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.Exchange;
 
-/**
- * @version 
- */
 public class ExchangeRedeliveryEvent extends AbstractExchangeEvent {
     private static final long serialVersionUID = -19248832613958122L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java
index 10a9004..9a502b5 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java
@@ -36,7 +36,6 @@ import org.apache.camel.Exchange;
  * method to receive events for either of them.
  *
  * @see ExchangeSentEvent
- * @version 
  */
 public class ExchangeSendingEvent extends AbstractExchangeEvent {
     private static final long serialVersionUID = -19248832613958122L;
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java
index e6dc10d..aba3f7a 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java
@@ -30,7 +30,6 @@ import org.apache.camel.Exchange;
  * method to receive events for either of them.
  *
  * @see ExchangeSendingEvent
- * @version
  */
 public class ExchangeSentEvent extends AbstractExchangeEvent {
     private static final long serialVersionUID = -19248832613958123L;
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/FailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/FailureEvent.java
index 70ff950..6c9a6f7 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/FailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/FailureEvent.java
@@ -20,7 +20,6 @@ package org.apache.camel.management.event;
  * This interface is implemented by all events that contain an exception and is used to
  * retrieve the exception in a universal way.
  *  
- * @version
  */
 public interface FailureEvent {
     Throwable getCause();
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java
index 52f67e9..095eb30 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.Route;
 
-/**
- * @version 
- */
 public class RouteAddedEvent extends AbstractRouteEvent {
 
     private static final long serialVersionUID = 9155960708789798708L;
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java
index f4f5c66..f579be4 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.Route;
 
-/**
- * @version 
- */
 public class RouteRemovedEvent extends AbstractRouteEvent {
 
     private static final long serialVersionUID = 7966471393751298719L;
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
index bafa273..b26a9d3 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.Route;
 
-/**
- * @version 
- */
 public class RouteStartedEvent extends AbstractRouteEvent {
     private static final long serialVersionUID = 1330257282431407329L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java
index 4b1bc96..ba0d0a6 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java
@@ -18,9 +18,6 @@ package org.apache.camel.management.event;
 
 import org.apache.camel.Route;
 
-/**
- * @version 
- */
 public class RouteStoppedEvent extends AbstractRouteEvent {
     private static final long serialVersionUID = -4466503512787398888L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java
index 3a47fc5..94c2a88 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java
@@ -20,9 +20,6 @@ import java.util.EventObject;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class ServiceStartupFailureEvent extends EventObject implements FailureEvent {
     private static final long serialVersionUID = -9171964933795931862L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java
index b37d4ea..98bf097 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java
@@ -20,9 +20,6 @@ import java.util.EventObject;
 
 import org.apache.camel.CamelContext;
 
-/**
- * @version 
- */
 public class ServiceStopFailureEvent extends EventObject implements FailureEvent {
     private static final long serialVersionUID = 4139591666998762617L;
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java
index 4c96df1..052fe49 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java
@@ -25,9 +25,6 @@ import org.apache.camel.model.AggregateDefinition;
 import org.apache.camel.processor.aggregate.AggregateProcessor;
 import org.apache.camel.spi.ManagementStrategy;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed AggregateProcessor")
 public class ManagedAggregateProcessor extends ManagedProcessor implements ManagedAggregateProcessorMBean {
     private final AggregateProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogTracer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogTracer.java
index 7defbe7..6482d64 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogTracer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogTracer.java
@@ -25,9 +25,6 @@ import org.apache.camel.api.management.mbean.ManagedBacklogTracerMBean;
 import org.apache.camel.processor.interceptor.BacklogTracer;
 import org.apache.camel.spi.ManagementStrategy;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed BacklogTracer")
 public class ManagedBacklogTracer implements ManagedBacklogTracerMBean {
     private final CamelContext camelContext;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java
index 5133b16..d1e55e0 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java
@@ -24,9 +24,6 @@ import org.apache.camel.component.bean.BeanProcessor;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.util.ObjectHelper;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Bean Processor")
 public class ManagedBeanProcessor extends ManagedProcessor implements ManagedBeanMBean {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
index a1e0c59..5b236e6 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
@@ -25,9 +25,6 @@ import org.apache.camel.api.management.mbean.ManagedBrowsableEndpointMBean;
 import org.apache.camel.spi.BrowsableEndpoint;
 import org.apache.camel.util.MessageHelper;
 
-/**
- * @version
- */
 @ManagedResource(description = "Managed BrowsableEndpoint")
 public class ManagedBrowsableEndpoint extends ManagedEndpoint implements ManagedBrowsableEndpointMBean {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index 70cf3eb..6a6af16 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -64,9 +64,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 
-/**
- * @version
- */
 @ManagedResource(description = "Managed CamelContext")
 public class ManagedCamelContext extends ManagedPerformanceCounter implements TimerListener, ManagedCamelContextMBean {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
index 2eb247e..f56e34f 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
@@ -35,9 +35,6 @@ import org.apache.camel.processor.ChoiceProcessor;
 import org.apache.camel.processor.FilterProcessor;
 import org.apache.camel.util.ObjectHelper;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Choice")
 public class ManagedChoice extends ManagedProcessor implements ManagedChoiceMBean {
     private final ChoiceProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClaimCheck.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClaimCheck.java
index 9857260..7d1a459 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClaimCheck.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClaimCheck.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedClaimCheckMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.ClaimCheckProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Claim Check")
 public class ManagedClaimCheck extends ManagedProcessor implements ManagedClaimCheckMBean {
     private final ClaimCheckProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
index a13ac0e..6d72c71 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
@@ -42,9 +42,6 @@ import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.JsonSchemaHelper;
 import org.apache.camel.util.ObjectHelper;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Component")
 public class ManagedComponent implements ManagedInstance, ManagedComponentMBean {
     private final Component component;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java
index bcc9967..7b65093 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java
@@ -21,9 +21,6 @@ import org.apache.camel.Consumer;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedConsumerMBean;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Consumer")
 public class ManagedConsumer extends ManagedService implements ManagedConsumerMBean {
     private final Consumer consumer;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumerCache.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumerCache.java
index c8fc158..8ccf129 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumerCache.java
@@ -21,9 +21,6 @@ import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedConsumerCacheMBean;
 import org.apache.camel.impl.ConsumerCache;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed ConsumerCache")
 public class ManagedConsumerCache extends ManagedService implements ManagedConsumerCacheMBean {
     private final ConsumerCache consumerCache;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConvertBody.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConvertBody.java
index 01aae9f..57424d3 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConvertBody.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConvertBody.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedConvertBodyMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.ConvertBodyProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed ConvertBody")
 public class ManagedConvertBody extends ManagedProcessor implements ManagedConvertBodyMBean {
     private final ConvertBodyProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCustomLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCustomLoadBalancer.java
index 3fa414d..f85380c 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCustomLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCustomLoadBalancer.java
@@ -24,9 +24,6 @@ import org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition;
 import org.apache.camel.processor.loadbalancer.LoadBalancer;
 import org.apache.camel.util.ObjectHelper;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Custom LoadBalancer")
 public class ManagedCustomLoadBalancer extends ManagedProcessor implements ManagedCustomLoadBalancerMBean {
     private final LoadBalancer processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
index ef83388..d8a0c44 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
@@ -24,9 +24,6 @@ import org.apache.camel.builder.ExpressionBuilder;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.Delayer;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Delayer")
 public class ManagedDelayer extends ManagedProcessor implements ManagedDelayerMBean {
     private final Delayer delayer;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
index a1f5f38..8663158 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
@@ -35,9 +35,6 @@ import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed DynamicRouter")
 public class ManagedDynamicRouter extends ManagedProcessor implements ManagedDynamicRouterMBean {
     private final DynamicRouter processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpointRegistry.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpointRegistry.java
index 32f211d..bee9b87 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpointRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpointRegistry.java
@@ -34,9 +34,6 @@ import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed EndpointRegistry")
 public class ManagedEndpointRegistry extends ManagedService implements ManagedEndpointRegistryMBean {
     private final EndpointRegistry endpointRegistry;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
index b3c3107..f1ad3d0 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
@@ -35,9 +35,6 @@ import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Enricher")
 public class ManagedEnricher extends ManagedProcessor implements ManagedEnricherMBean {
     private final Enricher processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java
index 314891f..4f4e318 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java
@@ -26,9 +26,6 @@ import org.apache.camel.processor.RedeliveryErrorHandler;
 import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.spi.RouteContext;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed ErrorHandler")
 public class ManagedErrorHandler implements ManagedErrorHandlerMBean {
     private final RouteContext routeContext;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java
index 07d02c0..fd52ecb 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java
@@ -27,9 +27,6 @@ import org.apache.camel.api.management.JmxNotificationBroadcasterAware;
 import org.apache.camel.spi.EventNotifier;
 import org.apache.camel.spi.ManagementStrategy;
 
-/**
- * @version 
- */
 public class ManagedEventNotifier extends NotificationBroadcasterSupport implements ManagedEventNotifierMBean {
     private final CamelContext context;
     private final EventNotifier eventNotifier;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java
index 7fdea32..81d9b30 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFailoverLoadBalancer.java
@@ -36,9 +36,6 @@ import org.apache.camel.processor.loadbalancer.FailOverLoadBalancer;
 import org.apache.camel.util.CollectionStringBuffer;
 import org.apache.camel.util.ObjectHelper;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Failover LoadBalancer")
 public class ManagedFailoverLoadBalancer extends ManagedProcessor implements ManagedFailoverLoadBalancerMBean {
     private final FailOverLoadBalancer processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFilter.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFilter.java
index 4b01d79..7568898 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFilter.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedFilter.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedFilterMBean;
 import org.apache.camel.model.ExpressionNode;
 import org.apache.camel.processor.FilterProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Filter")
 public class ManagedFilter extends ManagedProcessor implements ManagedFilterMBean {
     private final FilterProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedLog.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
index 242e9d0..8f3fbca 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
@@ -24,9 +24,6 @@ import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.LogProcessor;
 import org.slf4j.Marker;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Log")
 public class ManagedLog extends ManagedProcessor implements ManagedLogMBean {
     private final LogProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedLoop.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedLoop.java
index 73ee7dd..9b1cfc7 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedLoop.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedLoop.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedLoopMBean;
 import org.apache.camel.model.LoopDefinition;
 import org.apache.camel.processor.LoopProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Loop")
 public class ManagedLoop extends ManagedProcessor implements ManagedLoopMBean {
     private final LoopProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedMarshal.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedMarshal.java
index 29b69dc..f9fde8e 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedMarshal.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedMarshal.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedMarshalMBean;
 import org.apache.camel.model.MarshalDefinition;
 import org.apache.camel.processor.MarshalProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Marshal")
 public class ManagedMarshal extends ManagedProcessor implements ManagedMarshalMBean {
     private final MarshalProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedMulticast.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedMulticast.java
index ea72a46..2c736eb 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedMulticast.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedMulticast.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedMulticastMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.MulticastProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Multicast")
 public class ManagedMulticast extends ManagedProcessor implements ManagedMulticastMBean {
     private final MulticastProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
index d166d25..1d18878 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
@@ -35,9 +35,6 @@ import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed PollEnricher")
 public class ManagedPollEnricher extends ManagedProcessor implements ManagedPollEnricherMBean {
     private final PollEnricher processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcess.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcess.java
index 34720fa..823de9e 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcess.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcess.java
@@ -24,9 +24,6 @@ import org.apache.camel.api.management.mbean.ManagedProcessMBean;
 import org.apache.camel.model.ProcessDefinition;
 import org.apache.camel.util.ObjectHelper;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Process")
 public class ManagedProcess extends ManagedProcessor implements ManagedProcessMBean {
     private final Processor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
index 23373a3..e562d4f 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
@@ -41,9 +41,6 @@ import org.apache.camel.util.JsonSchemaHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.ServiceHelper;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Processor")
 public class ManagedProcessor extends ManagedPerformanceCounter implements ManagedInstance, ManagedProcessorMBean {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProducer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProducer.java
index da77e2c..81bd85c 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProducer.java
@@ -21,9 +21,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedProducerMBean;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Producer")
 public class ManagedProducer extends ManagedService implements ManagedProducerMBean {
     private final Producer producer;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProducerCache.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProducerCache.java
index ef07077..e72dc3c 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProducerCache.java
@@ -21,9 +21,6 @@ import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedProducerCacheMBean;
 import org.apache.camel.impl.ProducerCache;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed ProducerCache")
 public class ManagedProducerCache extends ManagedService implements ManagedProducerCacheMBean {
     private final ProducerCache producerCache;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRandomLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRandomLoadBalancer.java
index 17f3c66..1bfed77 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRandomLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRandomLoadBalancer.java
@@ -23,9 +23,6 @@ import org.apache.camel.model.LoadBalanceDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.loadbalancer.RandomLoadBalancer;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Random LoadBalancer")
 public class ManagedRandomLoadBalancer extends ManagedProcessor implements ManagedRandomLoadBalancerMBean {
     private final RandomLoadBalancer processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java
index 72c1a20..428852d 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRecipientList.java
@@ -35,9 +35,6 @@ import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed RecipientList")
 public class ManagedRecipientList extends ManagedProcessor implements ManagedRecipientListMBean {
     private final RecipientList processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeader.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeader.java
index 069255e..35e000b 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeader.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeader.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedRemoveHeaderMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.RemoveHeaderProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed RemoveHeader")
 public class ManagedRemoveHeader extends ManagedProcessor implements ManagedRemoveHeaderMBean {
     private final RemoveHeaderProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java
index ae5d333..2fea3fd 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveHeaders.java
@@ -24,9 +24,6 @@ import org.apache.camel.api.management.mbean.ManagedRemoveHeadersMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.RemoveHeadersProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed RemoveHeaders")
 public class ManagedRemoveHeaders extends ManagedProcessor implements ManagedRemoveHeadersMBean {
     private final RemoveHeadersProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java
index f843b77..6b9652f 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperties.java
@@ -24,9 +24,6 @@ import org.apache.camel.api.management.mbean.ManagedRemovePropertiesMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.RemovePropertiesProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed RemoveProperties")
 public class ManagedRemoveProperties extends ManagedProcessor implements ManagedRemovePropertiesMBean {
     private final RemovePropertiesProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperty.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperty.java
index 61eaa790..31faf3e 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperty.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRemoveProperty.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedRemovePropertyMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.RemovePropertyProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed RemoveProperty")
 public class ManagedRemoveProperty extends ManagedProcessor implements ManagedRemovePropertyMBean {
     private final RemovePropertyProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedResequencer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedResequencer.java
index a3429cc..d7ad120 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedResequencer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedResequencer.java
@@ -23,9 +23,6 @@ import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.Resequencer;
 import org.apache.camel.processor.StreamResequencer;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Resequencer")
 public class ManagedResequencer extends ManagedProcessor implements ManagedResequencerMBean {
     private final Resequencer processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRollback.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRollback.java
index 6342590..9e6e1a6 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRollback.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRollback.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedRollbackMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.RollbackProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Rollback")
 public class ManagedRollback extends ManagedProcessor implements ManagedRollbackMBean {
     private final RollbackProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoundRobinLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoundRobinLoadBalancer.java
index 369c782..80dbf0d 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoundRobinLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoundRobinLoadBalancer.java
@@ -23,9 +23,6 @@ import org.apache.camel.model.LoadBalanceDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed RoundRobin LoadBalancer")
 public class ManagedRoundRobinLoadBalancer extends ManagedProcessor implements ManagedRoundRobinLoadBalancerMBean {
     private final RoundRobinLoadBalancer processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java
index 23f0e83..9121670 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoutingSlip.java
@@ -35,9 +35,6 @@ import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed RoutingSlip")
 public class ManagedRoutingSlip extends ManagedProcessor implements ManagedRoutingSlipMBean {
     private final RoutingSlip processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeCamelCatalog.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeCamelCatalog.java
index 6a99656..5587a9e 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeCamelCatalog.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeCamelCatalog.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedRuntimeCamelCatalogMBean;
 import org.apache.camel.runtimecatalog.RuntimeCamelCatalog;
 import org.apache.camel.spi.ManagementStrategy;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed RuntimeCamelCatalog")
 public class ManagedRuntimeCamelCatalog extends ManagedService implements ManagedRuntimeCamelCatalogMBean {
     private final CamelContext camelContext;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSamplingThrottler.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSamplingThrottler.java
index 5e5cac8..9638b5d 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSamplingThrottler.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSamplingThrottler.java
@@ -24,9 +24,6 @@ import org.apache.camel.api.management.mbean.ManagedSamplingThrottlerMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.SamplingThrottler;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed SamplingThrottler")
 public class ManagedSamplingThrottler extends ManagedProcessor implements ManagedSamplingThrottlerMBean {
     private final SamplingThrottler processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedScheduledPollConsumer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedScheduledPollConsumer.java
index 64694fd..80e03a0 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedScheduledPollConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedScheduledPollConsumer.java
@@ -23,9 +23,6 @@ import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedSchedulePollConsumerMBean;
 import org.apache.camel.impl.ScheduledPollConsumer;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Scheduled Polling Consumer")
 public class ManagedScheduledPollConsumer extends ManagedConsumer implements ManagedSchedulePollConsumerMBean {
     private final ScheduledPollConsumer consumer;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedScript.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedScript.java
index 51ea141..a36dc06 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedScript.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedScript.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedScriptMBean;
 import org.apache.camel.model.ScriptDefinition;
 import org.apache.camel.processor.ScriptProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Script")
 public class ManagedScript extends ManagedProcessor implements ManagedScriptMBean {
     private final ScriptProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
index 70e34a7..e756ae3 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
@@ -35,9 +35,6 @@ import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed SendDynamicProcessor")
 public class ManagedSendDynamicProcessor extends ManagedProcessor implements ManagedSendDynamicProcessorMBean {
     private final SendDynamicProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
index d58f9ee..5fcf508 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
@@ -32,9 +32,6 @@ import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed SendProcessor")
 public class ManagedSendProcessor extends ManagedProcessor implements ManagedSendProcessorMBean {
     private final SendProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetBody.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetBody.java
index 0a2c5c9..95b5544 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetBody.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetBody.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedSetBodyMBean;
 import org.apache.camel.model.SetBodyDefinition;
 import org.apache.camel.processor.SetBodyProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed SetBody")
 public class ManagedSetBody extends ManagedProcessor implements ManagedSetBodyMBean {
     private final SetBodyProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetExchangePattern.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetExchangePattern.java
index 204c901..2fd9520 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetExchangePattern.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetExchangePattern.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedSetExchangePatternMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.ExchangePatternProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed SetExchangePattern")
 public class ManagedSetExchangePattern extends ManagedProcessor implements ManagedSetExchangePatternMBean {
     private final ExchangePatternProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetHeader.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetHeader.java
index ac65967..807f43a 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetHeader.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetHeader.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedSetHeaderMBean;
 import org.apache.camel.model.SetHeaderDefinition;
 import org.apache.camel.processor.SetHeaderProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed SetHeader")
 public class ManagedSetHeader extends ManagedProcessor implements ManagedSetHeaderMBean {
     private final SetHeaderProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetProperty.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetProperty.java
index 2b5e6cf..ed95553 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetProperty.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSetProperty.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedSetPropertyMBean;
 import org.apache.camel.model.SetPropertyDefinition;
 import org.apache.camel.processor.SetPropertyProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed SetProperty")
 public class ManagedSetProperty extends ManagedProcessor implements ManagedSetPropertyMBean {
     private final SetPropertyProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSplitter.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSplitter.java
index 857b99e..6f8e1dc 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSplitter.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSplitter.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedSplitterMBean;
 import org.apache.camel.model.SplitDefinition;
 import org.apache.camel.processor.Splitter;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Splitter")
 public class ManagedSplitter extends ManagedMulticast implements ManagedSplitterMBean {
     private final Splitter processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStickyLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStickyLoadBalancer.java
index a073165..6a8cd99 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStickyLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStickyLoadBalancer.java
@@ -24,9 +24,6 @@ import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition;
 import org.apache.camel.processor.loadbalancer.StickyLoadBalancer;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Sticky LoadBalancer")
 public class ManagedStickyLoadBalancer extends ManagedProcessor implements ManagedStickyLoadBalancerMBean {
     private final StickyLoadBalancer processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStop.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStop.java
index 8eff563..fe3a1e9 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStop.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStop.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedStopMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.StopProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Stop")
 public class ManagedStop extends ManagedProcessor implements ManagedStopMBean {
     private final StopProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java
index 817a153..4332ee1 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java
@@ -24,9 +24,6 @@ import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedThreadPoolMBean;
 import org.apache.camel.spi.ManagementStrategy;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed ThreadPool")
 public class ManagedThreadPool implements ManagedThreadPoolMBean {
 
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java
index fe78b10..07e3ee0 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java
@@ -26,9 +26,6 @@ import org.apache.camel.api.management.mbean.ManagedThreadsMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.ThreadsProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Threads")
 public class ManagedThreads extends ManagedProcessor implements ManagedThreadsMBean {
     private final ThreadsProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
index 6c5e977..65a85e9 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
@@ -24,9 +24,6 @@ import org.apache.camel.processor.Throttler;
 
 import static org.apache.camel.builder.Builder.constant;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Throttler")
 public class ManagedThrottler extends ManagedProcessor implements ManagedThrottlerMBean {
     private final Throttler throttler;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottlingInflightRoutePolicy.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottlingInflightRoutePolicy.java
index ab02d26..f8c1c74 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottlingInflightRoutePolicy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottlingInflightRoutePolicy.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedThrottlingInflightRoutePolicyMBean;
 import org.apache.camel.impl.ThrottlingInflightRoutePolicy;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed ThrottlingInflightRoutePolicy")
 public class ManagedThrottlingInflightRoutePolicy extends ManagedService implements ManagedThrottlingInflightRoutePolicyMBean {
     private final ThrottlingInflightRoutePolicy policy;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrowException.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrowException.java
index ee23988..035cfe6 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrowException.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrowException.java
@@ -23,9 +23,6 @@ import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.ThrowExceptionProcessor;
 import org.apache.camel.util.ObjectHelper;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed ThrowException")
 public class ManagedThrowException extends ManagedProcessor implements ManagedThrowExceptionMBean {
     private final ThrowExceptionProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTopicLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTopicLoadBalancer.java
index ce5cc64..51fd5fc 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTopicLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTopicLoadBalancer.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedTopicLoadBalancerMBean;
 import org.apache.camel.model.LoadBalanceDefinition;
 import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Topic LoadBalancer")
 public class ManagedTopicLoadBalancer extends ManagedProcessor implements ManagedTopicLoadBalancerMBean {
     private final TopicLoadBalancer processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTransformer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTransformer.java
index 970aaa7..85ffa70 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTransformer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTransformer.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedTransformMBean;
 import org.apache.camel.model.TransformDefinition;
 import org.apache.camel.processor.TransformProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Transformer")
 public class ManagedTransformer extends ManagedProcessor implements ManagedTransformMBean {
     private final TransformProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTransformerRegistry.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTransformerRegistry.java
index f916a10..7477604 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTransformerRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTransformerRegistry.java
@@ -34,9 +34,6 @@ import org.apache.camel.spi.Transformer;
 import org.apache.camel.spi.TransformerRegistry;
 import org.apache.camel.util.ObjectHelper;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed TransformerRegistry")
 public class ManagedTransformerRegistry extends ManagedService implements ManagedTransformerRegistryMBean {
     private final TransformerRegistry transformerRegistry;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedUnmarshal.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedUnmarshal.java
index aacb19f..132326b 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedUnmarshal.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedUnmarshal.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedUnmarshalMBean;
 import org.apache.camel.model.UnmarshalDefinition;
 import org.apache.camel.processor.UnmarshalProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Unmarshal")
 public class ManagedUnmarshal extends ManagedProcessor implements ManagedUnmarshalMBean {
     private final UnmarshalProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedValidate.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedValidate.java
index bead620..d101128 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedValidate.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedValidate.java
@@ -22,9 +22,6 @@ import org.apache.camel.api.management.mbean.ManagedValidateMBean;
 import org.apache.camel.model.ValidateDefinition;
 import org.apache.camel.processor.validation.PredicateValidatingProcessor;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Validate")
 public class ManagedValidate extends ManagedProcessor implements ManagedValidateMBean {
     private final PredicateValidatingProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedValidatorRegistry.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedValidatorRegistry.java
index e2d6317..398db4f 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedValidatorRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedValidatorRegistry.java
@@ -34,9 +34,6 @@ import org.apache.camel.spi.Validator;
 import org.apache.camel.spi.ValidatorRegistry;
 import org.apache.camel.util.ObjectHelper;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed ValidatorRegistry")
 public class ManagedValidatorRegistry extends ManagedService implements ManagedValidatorRegistryMBean {
     private final ValidatorRegistry validatorRegistry;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWeightedLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWeightedLoadBalancer.java
index ca0bb69..5647da8 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWeightedLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWeightedLoadBalancer.java
@@ -24,9 +24,6 @@ import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition;
 import org.apache.camel.processor.loadbalancer.WeightedLoadBalancer;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed Weighted LoadBalancer")
 public class ManagedWeightedLoadBalancer extends ManagedProcessor implements ManagedWeightedBalancerMBean {
     private final WeightedLoadBalancer processor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
index 438eb03..3f9ff2a 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
@@ -35,9 +35,6 @@ import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
-/**
- * @version 
- */
 @ManagedResource(description = "Managed WireTapProcessor")
 public class ManagedWireTapProcessor extends ManagedProcessor implements ManagedWireTapMBean {
     private final WireTapProcessor processor;
diff --git a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
index 4e5e191..3bad006 100644
--- a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -52,8 +52,6 @@ import org.apache.camel.util.concurrent.SynchronousExecutorService;
 
 /**
  * Aggregates many messages into a single message
- *
- * @version 
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "aggregate")
diff --git a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
index 62b78f4..ea5d43e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
@@ -38,8 +38,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Calls a java bean
- *
- * @version 
  */
 @Metadata(label = "eip,endpoint")
 @XmlRootElement(name = "bean")
diff --git a/camel-core/src/main/java/org/apache/camel/model/Block.java b/camel-core/src/main/java/org/apache/camel/model/Block.java
index f5a7797..e82cad6 100644
--- a/camel-core/src/main/java/org/apache/camel/model/Block.java
+++ b/camel-core/src/main/java/org/apache/camel/model/Block.java
@@ -18,8 +18,6 @@ package org.apache.camel.model;
 
 /**
  * Interface to add block featuring to the XML element type.
- *
- * @version 
  */
 public interface Block {
 
diff --git a/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java b/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
index c5b3a5d..41e9780 100644
--- a/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
@@ -36,8 +36,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Catches exceptions as part of a try, catch, finally block
- *
- * @version 
  */
 @Metadata(label = "error")
 @XmlRootElement(name = "doCatch")
diff --git a/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
index 7756df8..7df7d3c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
@@ -40,8 +40,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Routes messages based on a series of predicates
- *
- * @version
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "choice")
diff --git a/camel-core/src/main/java/org/apache/camel/model/Constants.java b/camel-core/src/main/java/org/apache/camel/model/Constants.java
index f86c2d9..2a29a9d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/Constants.java
+++ b/camel-core/src/main/java/org/apache/camel/model/Constants.java
@@ -18,8 +18,6 @@ package org.apache.camel.model;
 
 /**
  * Various constants.
- *
- * @version 
  */
 public final class Constants {
 
diff --git a/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java b/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
index 53cc7d5..64ec97e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
@@ -35,8 +35,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Delays processing for a specified length of time
- *
- * @version 
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "delay")
diff --git a/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
index 65f99de..6bf0ee0 100644
--- a/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
@@ -26,8 +26,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To provide comments about the node.
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "description")
diff --git a/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
index 9a25505..3425048 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
@@ -22,8 +22,6 @@ import org.apache.camel.ExecutorServiceAware;
 
 /**
  * Enables definitions to support concurrency using {@link java.util.concurrent.ExecutorService}
- *
- * @version 
  */
 public interface ExecutorServiceAwareDefinition<Type extends ProcessorDefinition<?>> extends ExecutorServiceAware {
 
diff --git a/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java b/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
index 51237a5..bf46b3c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
@@ -34,8 +34,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * A base class for nodes which contain an expression and a number of outputs
- *
- * @version
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlTransient
diff --git a/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java b/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
index 2853b2e..f1c1e3b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
@@ -30,8 +30,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Filter out messages based using a predicate
- *
- * @version 
  */
 @Metadata(label = "eip,routing") @AsPredicate
 @XmlRootElement(name = "filter")
diff --git a/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
index 4e63409..8e7a943 100644
--- a/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
@@ -27,8 +27,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Path traversed when a try, catch, finally block exits
- *
- * @version 
  */
 @Metadata(label = "error")
 @XmlRootElement(name = "doFinally")
diff --git a/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java b/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
index 656e9c1..2d35887 100644
--- a/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
@@ -28,8 +28,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Act as a message source as input to a route
- *
- * @version 
  */
 @Metadata(label = "eip,endpoint,routing")
 @XmlRootElement(name = "from")
diff --git a/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java b/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
index c3da7ea..1552834 100644
--- a/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
+++ b/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
@@ -35,8 +35,6 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- *
- * @version 
  */
 @XmlType(name = "identifiedType")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
index 93fdd1c..ae8e682 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
@@ -26,8 +26,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * Marks the exchange pattern for the route to one way
- *
- * @version 
  */
 @Metadata(label = "eip,endpoint,routing")
 @XmlRootElement(name = "inOnly")
diff --git a/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
index f3c17b3..efbc742 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
@@ -26,8 +26,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * Marks the exchange pattern for the route to request/reply
- *
- * @version 
  */
 @Metadata(label = "eip,endpoint,routing")
 @XmlRootElement(name = "inOut")
diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
index 4f1b786..a6ebd76 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
@@ -36,8 +36,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Intercepts a message at each step in the route
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "intercept")
diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
index 6921128..ffcf3ef 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
@@ -29,8 +29,6 @@ import org.apache.camel.support.ExpressionAdapter;
 
 /**
  * Intercepts incoming messages
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "interceptFrom")
diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
index efe90cb..c34ce25 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
@@ -38,8 +38,6 @@ import org.apache.camel.util.URISupport;
 
 /**
  * Intercepts messages being sent to an endpoint
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "interceptSendToEndpoint")
diff --git a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
index d41a83e..72b2ddb 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
@@ -42,8 +42,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Logs the defined message to the logger
- *
- * @version 
  */
 @Metadata(label = "eip,configuration")
 @XmlRootElement(name = "log")
diff --git a/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
index 66aa427..68100f9 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
@@ -31,8 +31,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Processes a message multiple times
- *
- * @version 
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "loop")
diff --git a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
index fa516e4..569cd66 100644
--- a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
@@ -69,8 +69,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Marshals data into a specified format for transmission over a transport or component
- *
- * @version
  */
 @Metadata(label = "eip,transformation")
 @XmlRootElement(name = "marshal")
diff --git a/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
index 2dfb28f..ebe0083 100644
--- a/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
@@ -41,8 +41,6 @@ import org.apache.camel.util.CamelContextHelper;
 
 /**
  *  Routes the same message to multiple paths either sequentially or in parallel.
- *
- * @version 
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "multicast")
diff --git a/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java b/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
index cb90886..d9dbed4 100644
--- a/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
+++ b/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
@@ -31,8 +31,6 @@ import org.apache.camel.model.language.ExpressionDefinition;
  * <p/>
  * This node is to be extended by definitions which need to support an expression but the definition should not
  * contain any outputs, such as {@link org.apache.camel.model.TransformDefinition}.
- *
- * @version 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 public abstract class NoOutputExpressionNode extends ExpressionNode {
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
index 906765d..6ce0781 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
@@ -42,8 +42,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Route to be executed when normal route processing completes
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "onCompletion")
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
index 21939e1..537118f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
@@ -51,8 +51,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Route to be executed when an exception is thrown
- *
- * @version 
  */
 @Metadata(label = "error")
 @XmlRootElement(name = "onException")
diff --git a/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
index 7815125..15b2733 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
@@ -26,8 +26,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To configure optimistic locking
- *
- * @version
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "optimisticLockRetryPolicy")
diff --git a/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
index be3b065..9845546 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
@@ -27,8 +27,6 @@ import org.apache.camel.spi.NodeIdFactory;
 
 /**
  * Allows an element to have an optional ID specified
- *
- * @version 
  */
 @XmlType(name = "optionalIdentifiedDefinition")
 @XmlAccessorType(XmlAccessType.PROPERTY)
diff --git a/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
index 7b7d208..3866242 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
@@ -29,8 +29,6 @@ import org.apache.camel.util.CollectionStringBuffer;
 
 /**
  * Route to be executed when all other choices evaluate to <tt>false</tt>
- *
- * @version 
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "otherwise")
diff --git a/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
index 9dec267..3441e39 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
@@ -28,8 +28,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * A useful base class for output types
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlType(name = "output")
diff --git a/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
index 9a6e738..b0a102a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
@@ -26,8 +26,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Routes the message to a sequence of processors.
- *
- * @version
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "pipeline")
diff --git a/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
index 925b78e..df5a63a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
@@ -33,8 +33,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Defines a policy the route will use
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "policy")
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
index 84e34ec..31c6da3 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
@@ -33,8 +33,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Calls a Camel processor
- *
- * @version 
  */
 @Metadata(label = "eip,endpoint")
 @XmlRootElement(name = "process")
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index a102dbd..2d6e282 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -80,8 +80,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Base class for processor types that most XML types extend.
- *
- * @version 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>> extends OptionalIdentifiedDefinition<Type> implements Block, OtherAttributesAware {
diff --git a/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
index 1ebbe91..99326b1 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
@@ -44,8 +44,6 @@ import org.apache.camel.util.CamelContextHelper;
 
 /**
  * Routes messages to a number of dynamically specified recipients (dynamic to)
- *
- * @version 
  */
 @Metadata(label = "eip,endpoint,routing")
 @XmlRootElement(name = "recipientList")
diff --git a/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
index 11a2966..c54b327 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
@@ -30,8 +30,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * To configure re-delivery for error handling
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "redeliveryPolicy")
diff --git a/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
index 5c5cf48..7bb5448 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
@@ -44,8 +44,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Resequences (re-order) messages based on an expression
- *
- * @version 
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "resequence")
diff --git a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
index 6c98516..243e196 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
@@ -28,8 +28,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To refer to an XML file with rest services defined using the rest-dsl
- *
- * @version 
  */
 @Metadata(label = "configuration,rest")
 @XmlRootElement(name = "restContextRef")
diff --git a/camel-core/src/main/java/org/apache/camel/model/RethrowDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RethrowDefinition.java
index 13d06e5..e96db8a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RethrowDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RethrowDefinition.java
@@ -27,8 +27,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Rethrow an exception inside a catch block
- *
- * @version 
  */
 @Metadata(label = "error")
 @XmlRootElement(name = "rethrow")
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
index 0b3e581..5df42fc 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
@@ -30,8 +30,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * To refer to a Java {@link org.apache.camel.builder.RouteBuilder} instance to use.
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "routeBuilder")
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java b/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java
index 6eeef8d..ad255b9 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java
@@ -22,8 +22,6 @@ import javax.xml.bind.annotation.XmlElementRef;
 
 /**
  * Container to hold {@link org.apache.camel.model.RouteDefinition Route}.
- *
- * @version 
  */
 public interface RouteContainer {
 
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
index 348d09b..9875b8a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
@@ -27,8 +27,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To refer to an XML file with routes defined using the xml-dsl
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "routeContextRef")
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
index 76b69df..e808835 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -62,8 +62,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * A Camel route
- *
- * @version
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "route")
diff --git a/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
index d26f0e6..555e458 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
@@ -32,8 +32,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * A series of Camel routes
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "routes")
diff --git a/camel-core/src/main/java/org/apache/camel/model/SagaDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SagaDefinition.java
index 754d782..66dac06 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SagaDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SagaDefinition.java
@@ -47,8 +47,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Enables sagas on the route
- *
- * @version
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "saga")
diff --git a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
index b27fb93..1fc64f7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
@@ -33,8 +33,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Extract a sample of the messages passing through a route
- *
- * @version 
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "sample")
diff --git a/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
index 575e011..fdb4db5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
@@ -31,8 +31,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Sends the message to an endpoint
- *
- * @version 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 public abstract class SendDefinition<Type extends ProcessorDefinition<Type>> extends NoOutputDefinition<Type> implements EndpointRequiredDefinition {
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
index 7493481..69357d5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
@@ -30,8 +30,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Sets the exchange pattern on the message exchange
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "setExchangePattern")
diff --git a/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
index 80abba4..a2fb46a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
@@ -38,8 +38,6 @@ import org.apache.camel.util.CamelContextHelper;
 
 /**
  * Splits a single message into many sub-messages.
- *
- * @version 
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "split")
diff --git a/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java b/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
index 61079f2..8b58b16 100644
--- a/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
@@ -27,8 +27,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Stops the processing of the current message
- *
- * @version 
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "stop")
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
index e80202d..785b3f1 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
@@ -31,8 +31,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To configure thread pools
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "threadPoolProfile")
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
index 6059fe5..fa24a45 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
@@ -41,8 +41,6 @@ import org.apache.camel.spi.ThreadPoolProfile;
 
 /**
  * Specifies that all steps after this node are processed asynchronously
- *
- * @version 
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "threads")
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
index e4a616f..7d32bfc 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
@@ -37,8 +37,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Controls the rate at which messages are passed to the next node in the route
- *
- * @version 
  */
 @Metadata(label = "eip,routing")
 @XmlRootElement(name = "throttle")
diff --git a/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
index 6c5df76..7659ab7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
@@ -27,8 +27,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * Sends the message to a static endpoint
- *
- * @version 
  */
 @Metadata(label = "eip,endpoint,routing")
 @XmlRootElement(name = "to")
diff --git a/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java b/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
index 691aadd..5773dab 100644
--- a/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
@@ -41,8 +41,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Enables transaction on the route
- *
- * @version 
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "transacted")
diff --git a/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java b/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
index 9e5a12e..756f4fa 100644
--- a/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
@@ -39,8 +39,6 @@ import org.apache.camel.util.ExpressionToPredicateAdapter;
 
 /**
  * Marks the beginning of a try, catch, finally block
- *
- * @version 
  */
 @Metadata(label = "error")
 @XmlRootElement(name = "doTry")
diff --git a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index feca13a..f4195fc 100644
--- a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -68,8 +68,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Converts the message data received from the wire into a format that Apache Camel processors can consume
- *
- * @version
  */
 @Metadata(label = "eip,transformation")
 @XmlRootElement(name = "unmarshal")
diff --git a/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
index babd01c..960ccc0 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
@@ -30,8 +30,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Validates a message based on an expression
- *
- * @version 
  */
 @Metadata(label = "eip,transformation") @AsPredicate
 @XmlRootElement(name = "validate")
diff --git a/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java b/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
index bfa8c70..34b2f58 100644
--- a/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
@@ -27,8 +27,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * Triggers a route when an expression evaluates to <tt>true</tt>
- * 
- * @version 
  */
 @Metadata(label = "eip,routing") @AsPredicate
 @XmlRootElement(name = "when")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
index ab301fe..a5eaa9d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
@@ -29,8 +29,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * The Avro data format is used for serialization and deserialization of messages using Apache Avro binary dataformat.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.14.0", label = "dataformat,transformation", title = "Avro")
 @XmlRootElement(name = "avro")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
index be2500a..62155e8 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
@@ -28,8 +28,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * The Barcode data format is used for creating barccode images (such as QR-Code)
- *
- * @version 
  */
 @Metadata(firstVersion = "2.14.0", label = "dataformat,transformation", title = "Barcode")
 @XmlRootElement(name = "barcode")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
index d6b2e13..dcaa987 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
@@ -28,8 +28,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * The Base64 data format is used for base64 encoding and decoding.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.11.0", label = "dataformat,transformation", title = "Base64")
 @XmlRootElement(name = "base64")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
index 2fcec60..1007c27 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
@@ -28,8 +28,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * The BeanIO data format is used for working with flat payloads (such as CSV, delimited, or fixed length formats).
- *
- * @version 
  */
 @Metadata(firstVersion = "2.10.0", label = "dataformat,transformation,csv", title = "BeanIO")
 @XmlRootElement(name = "beanio")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
index 4826f91..30bc28f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
@@ -31,8 +31,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * The Bindy data format is used for working with flat payloads (such as CSV, delimited, fixed length formats, or FIX messages).
- *
- * @version 
  */
 @Metadata(firstVersion = "2.0.0", label = "dataformat,transformation,csv", title = "Bindy")
 @XmlRootElement(name = "bindy")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java
index b5a1b38..3ef1ecc 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java
@@ -21,8 +21,6 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * Represents the different types of bindy data formats.
- *
- * @version 
  */
 @XmlType
 @XmlEnum
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
index 1ae45ab..507e312 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
@@ -34,8 +34,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * Crypto data format is used for encrypting and decrypting of messages using Java Cryptographic Extension.
- *
- * @version
  */
 @Metadata(firstVersion = "2.3.0", label = "dataformat,transformation,security", title = "Crypto (Java Cryptographic Extension)")
 @XmlRootElement(name = "crypto")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
index a9528e3..0a04e39 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
@@ -28,8 +28,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * To use a custom data format implementation that does not come out of the box from Apache Camel.
- *
- * @version
  */
 @Metadata(label = "dataformat,transformation", title = "Custom")
 @XmlRootElement(name = "customDataFormat")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
index 35baeea..78c503b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
@@ -25,8 +25,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * The GZip data format is a message compression and de-compression format (which works with the popular gzip/gunzip tools).
- *
- * @version 
  */
 @Metadata(firstVersion = "2.0.0", label = "dataformat,transformation", title = "GZip")
 @XmlRootElement(name = "gzip")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
index 0a93fe9..42b8785 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
@@ -29,8 +29,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * The HL7 data format can be used to marshal or unmarshal HL7 (Health Care) model objects.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.0.0", label = "dataformat,transformation,hl7", title = "HL7")
 @XmlRootElement(name = "hl7")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
index 9fad9ea..7bdfe89 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
@@ -31,8 +31,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * JacksonXML data format is used for unmarshal a XML payload to POJO or to marshal POJO back to XML payload.
- *
- * @version
  */
 @Metadata(firstVersion = "2.16.0", label = "dataformat,transformation,xml", title = "JacksonXML")
 @XmlRootElement(name = "jacksonxml")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
index 38d58b8..b486c65 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
@@ -33,8 +33,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * JAXB data format uses the JAXB2 XML marshalling standard to unmarshal an XML payload into Java objects or to marshal Java objects into an XML payload.
- *
- * @version 
  */
 @Metadata(firstVersion = "1.0.0", label = "dataformat,transformation,xml", title = "JAXB")
 @XmlRootElement(name = "jaxb")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
index 4d9bc6e..6735158 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
@@ -33,8 +33,6 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * JSon data format is used for unmarshal a JSon payload to POJO or to marshal
  * POJO back to JSon payload.
- *
- * @version
  */
 @Metadata(label = "dataformat,transformation,json", title = "JSon")
 @XmlRootElement(name = "json")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
index c86bc04..5edd4f3 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
@@ -21,8 +21,6 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * Represents the concrete Json libraries Camel supports.
- *
- * @version 
  */
 @XmlType
 @XmlEnum
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
index 864ebcd..ba077a9 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
@@ -29,8 +29,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * The Protobuf data format is used for serializing between Java objects and the Google Protobuf protocol.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.2.0", label = "dataformat,transformation", title = "Protobuf")
 @XmlRootElement(name = "protobuf")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
index 7d88c37..cd7b5c1 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
@@ -26,8 +26,6 @@ import org.apache.camel.spi.RouteContext;
 /**
  * Serialization is a data format which uses the standard Java Serialization mechanism
  * to unmarshal a binary payload into Java objects or to marshal Java objects into a binary blob.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.12.0", label = "dataformat,transformation,core", title = "Java Object Serialization")
 @XmlRootElement(name = "serialization")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
index da23c67..76b98b0 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
@@ -28,8 +28,6 @@ import org.apache.camel.spi.RouteContext;
 
 /**
  * String data format is a textual based format that supports character encoding.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.12.0", label = "dataformat,transformation,core", title = "String Encoding")
 @XmlRootElement(name = "string")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
index 1df9a64..583a510 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
@@ -25,8 +25,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * The Syslog dataformat is used for working with RFC3164 and RFC5424 messages (logging and monitoring).
- *
- * @version 
  */
 @Metadata(firstVersion = "2.6.0", label = "dataformat,transformation,monitoring", title = "Syslog")
 @XmlRootElement(name = "syslog")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
index 1d9ee1b..8ed97be 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
@@ -29,8 +29,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * The Thrift data format is used for serialization and deserialization of messages using Apache Thrift binary dataformat.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.20.0", label = "dataformat,transformation", title = "Thrift")
 @XmlRootElement(name = "thrift")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
index 4062476..5b2db56 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
@@ -44,8 +44,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * XSTream data format is used for unmarshal a XML payload to POJO or to marshal POJO back to XML payload.
- *
- * @version 
  */
 @Metadata(firstVersion = "1.3.0", label = "dataformat,transformation,xml,json", title = "XStream")
 @XmlRootElement(name = "xstream")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
index a1c26708..f2e44f8 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
@@ -35,8 +35,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * YAML is a data format to marshal and unmarshal Java objects to and from YAML.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.17.0", label = "dataformat,transformation,yaml", title = "YAML")
 @XmlRootElement(name = "yaml")
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
index 75b3bb6..465f092 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
@@ -21,8 +21,6 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * Represents the concrete Yaml libraries Camel supports.
- *
- * @version 
  */
 @XmlType
 @XmlEnum
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
index 7a80a0f..2f44056 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
@@ -24,8 +24,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To use a Camel Exchange property in expressions or predicates.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.0.0", label = "language,core", title = "ExchangeProperty")
 @XmlRootElement(name = "exchangeProperty")
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
index f0c7336..9025973 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
@@ -24,8 +24,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To use Groovy scripts in Camel expressions or predicates.
- *
- * @version 
  */
 @Metadata(firstVersion = "1.3.0", label = "language,script", title = "Groovy")
 @XmlRootElement(name = "groovy")
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
index 2da6002..3f6a4f0 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
@@ -24,8 +24,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To use a Camel Message header in expressions or predicates.
- *
- * @version 
  */
 @Metadata(firstVersion = "1.5.0", label = "language,core", title = "Header")
 @XmlRootElement(name = "header")
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
index 160161a..a29b172 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
@@ -24,8 +24,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To use JavaScript in Camel expressions or predicates.
- *
- * @version 
  */
 @Metadata(firstVersion = "1.0.0", label = "language,script", title = "JavaScript")
 @XmlRootElement(name = "javaScript")
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
index d289437..2e1a099 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
@@ -30,8 +30,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * To use JsonPath in Camel expressions or predicates.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.13.0", label = "language,json", title = "JsonPath")
 @XmlRootElement(name = "jsonpath")
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
index bc3a628..2131a09 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
@@ -25,8 +25,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To use the specified language in Camel expressions or predicates.
- *
- * @version 
  */
 @Metadata(label = "language,core", title = "Language")
 @XmlRootElement(name = "language")
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
index 6ca924e..e842f8c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
@@ -39,8 +39,6 @@ import org.apache.camel.util.OgnlHelper;
 
 /**
  * To use a Java bean (aka method call) in Camel expressions or predicates.
- *
- * @version
  */
 @Metadata(firstVersion = "1.3.0", label = "language,core,java", title = "Bean method")
 @XmlRootElement(name = "method")
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
index 1840bb6..d806d2e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
@@ -24,8 +24,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To use MVEL scripts in Camel expressions or predicates.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.0.0", label = "language,java", title = "MVEL")
 @XmlRootElement(name = "mvel")
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
index 053883e..7d7c21e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
@@ -30,8 +30,6 @@ import org.apache.camel.spi.NamespaceAware;
 /**
  * A useful base class for any expression which may be namespace or XML content aware
  * such as {@link XPathExpression} or {@link XQueryExpression}
- *
- * @version 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 public abstract class NamespaceAwareExpression extends ExpressionDefinition implements NamespaceAware {
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
index 8255166..fc8c13c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
@@ -24,8 +24,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To use OGNL scripts in Camel expressions or predicates.
- *
- * @version 
  */
 @Metadata(firstVersion = "1.1.0", label = "language,java", title = "OGNL")
 @XmlRootElement(name = "ognl")
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
index adebce0..a5fd8a0 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
@@ -31,8 +31,6 @@ import org.apache.camel.util.ObjectHelper;
 
 /**
  * To use Camels built-in Simple language in Camel expressions or predicates.
- *
- * @version 
  */
 @Metadata(firstVersion = "1.1.0", label = "language,core,java", title = "Simple")
 @XmlRootElement(name = "simple")
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
index 7954dd3..55f664c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
@@ -24,8 +24,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To use Spring Expression Language (SpEL) in Camel expressions or predicates.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.7.0", label = "language,spring", title = "SpEL")
 @XmlRootElement(name = "spel")
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java
index e4eff89..b3b8581 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java
@@ -24,8 +24,6 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * To use HL7 terser scripts in Camel expressions or predicates.
- *
- * @version 
  */
 @Metadata(firstVersion = "2.11.0", label = "language,hl7", title = "HL7 Terser")
... 45381 lines suppressed ...