You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2018/09/20 15:00:26 UTC

[camel] branch java-10-test updated (bd158b4 -> cc6c33b)

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

zregvart pushed a change to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git.


 discard bd158b4  CAMEL-12618: Additional dependencies needed on ...
 discard bd21c0e  CAMEL-12618: upgrade Groovy Eclipse compiler
 discard 0cd790f  CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
 discard 53b9231  CAMEL-12618: Use fork of maven-plugin-plugin th...
 discard c5dedf5  CAMEL-12618: Use fork of MVEL that supports Jav...
 discard 4df70b4  Temporary disable JDK 9 and karaf-itest and spr...
     add d03f64f  Improved the Slack Verifier Extension after the Slack Consumer has been implemented
     add ad66cb2  Fixed CS
     add 37cb037  Upgrade Netty to version 4.1.29.Final
     add ab9b2e2  CAMEL-12610: Bean component with cache=false will now also lookup beans that implements Processor on each invocation.
     add 358a5de  CAMEL-12610: Added global cache option on bean component.
     add 1799205  Fixed wrong links in camel-saxon
     add 9dcdc62  Regen
     add 8128645  Upgrade Commons configuration to version 2.3
     add 3912d2e  Starting moving old release notes for the new site, from 2.17.0 ahead. Release 2.17.0 added
     add 39dfa5f  Migrating old release notes: 2.17.1 release notes
     add 3a5bc31  Fixed some stuff on 2.17.0 release notes
     add abcc786  Fixed minor stuff on 2.17.1 release doc
     add 689e950  Added release notes for Camel 2.17.2 to docs
     add af91638  Added Camel 2.17.3 release notes to docs
     add cc00117  Added Camel 2.17.4 release notes to docs
     add 6486ad1  Added Camel 2.17.5 release notes to docs
     add c3b1b75  Minor fixes to 2.17.4 release notes doc
     add 74a81ec  Added Camel 2.17.6 release notes to docs
     add 5bc016d  Added camel 2.17.7 release notes to docs
     add 32a0419  CAMEL-12727: Fixed potential concurrency issue in DefaultExchange copy. Going back to use ConcurrenctMap as we did in Camel 2.19 and older.
     add a0c2e10  CAMEL-12752: Upgrade Jetty to 9.4.11
     add c3cd895  CAMEL-12753: Fixed camel-undertow consumer with OPTIONS in rest-dsl to return mutiple verbs if the same context-path has more http verbs like GET,POST etc. Thanks to Tomas Turek for unit test
     add 7331d83  CAMEL-12753: Fixed camel-servlet,camel-jetty consumer with OPTIONS in rest-dsl to return mutiple verbs if the same context-path has more http verbs like GET,POST etc. Thanks to Tomas Turek for unit test
     add e3b5a4e  CAMEL-12753: Fixed camel-netty4-http consumer with OPTIONS in rest-dsl to return mutiple verbs if the same context-path has more http verbs like GET,POST etc. Thanks to Tomas Turek for unit test
     add 47447cb  CAMEL-12546: Polished
     add 9930191  CAMEL-12486: Placeholders are not resolved in Simple language while using resource: prefix. Thanks to Jan Bednar for unit test.
     add 3d130cd  CAMEL-12755: Upgrade Infinispan
     add 2685737  Upgrade Zookeeper to version 3.4.13
     add f7e9cdf  Upgrade Karaf to version 4.2.1
     add f69646a  Upgrade Pax Exam to version 4.12.0
     add 25a4eaf  camel-zipkin - Generate tracing identifiers on exchange begin if they… (#2494)
     add 9e20983  Upgrade Minidns to version 0.3.2
     add 4125e71  Upgrade jclouds
     add f039382  CAMEL-12757: Added camel-jclouds-starter
     add 5f1c396  Add camel-as2-starter to kit and spring-boot itests.
     add d0f0887  CAMEL-12760: deprecate camel-xmlrpc component
     add 1055887  Upgrade SnakeYAML to version 1.23
     add 4d726ef  Upgrade XMLUnit to version 2.6.2
     add 73d12c6  Upgrade AssertJ to version 3.11.1
     add 30d44a9  Upgrade CXF and regen
     add fa87236  [CAMEL-12605] Integrated encryption logic into component.
     add c8be031  Do not use deprecated api
     add 2513a9c  Upgrade Quickfixj to version 2.1.0
     add 1e65537  Fixed CS
     add e4de63b  CAMEL-12762: close JMS producer
     add d254c8f  [CAMEL-12605] Added test for enveloped request.
     add 4a1d0a4  Upgrade Cassandra Datastax Driver to version 3.6.0
     add 9cc6f62  camel-core - Fix typo in XmlConverter javadoc
     add 1c77fe5  Upgrade Cassandra Guava version as the new driver is using
     add f26f5cd  Added Camel 2.18.0 release notes to docs
     add 67f4c0b  Added Camel 2.18.1 release notes to docs
     add fd1d9f6  Added Camel 2.18.2 release notes to docs
     add 32af142  Added Camel 2.18.3 release notes to docs
     add 39f9a0b  Added Camel 2.18.4 release notes to docs
     add 08f8399  Fix typo in Camel 2.18.3 release notes
     add 2c01d1e  Added Camel 2.18.5 release notes to docs
     add 556d5bd  Upgrade Ehcache to version 3.6.0
     add ba863e1  Regen
     add 3941307  [CAMEL-12761] Switch to junit 4
     add a90cd75  [CAMEL-12761] Use Assume
     add 1e3f1df  [CAMEL-12761] Fix missing toString() method on TestSupport
     add de3876e  [CAMEL-12761] Fix indentation
     add c42e31e  Merge pull request #2499 from gnodet/junit
     add dd5d12b  Upgrade JavaMail to version 1.6.2
     add 510eb15  CAMEL-12721:camel-zipkin - Add support for easy enabling of logging integration (#2497)
     add 0e993dc  Upgrade Zipkin to version 2.11.4
     add 219c1a4  Added Brave context slf4j to Camel-Zipkin Karaf feature
     add 28ddaca  Upgrade Jxmpp to version 0.6.3
     add 64b48e6  Better readResponse methods in camel-slack component
     add d4f0d33  Fixed CS
     add 2dd646b  Revert "Upgrade JavaMail to version 1.6.2", because the upgrade cause unit tests to fail.
     add bcff832  CAMEL-12768: Upgraded dozer to 6.4.1
     add 244b2bf  Upgrade Chronicle Core to version 1.16.23
     add fe4a5d2  Upgrade Chronicle Bytes to version 1.16.24
     add c3bc1d4  Upgrade Chronicle Wire to version 1.16.17
     add 91e02cd  Upgrade Chronicle Network to version 1.16.5
     add 0468b38  Upgrade Swagger to version 1.5.21
     add db7f707  Upgrade Swagger Parser to version 1.0.37
     add 6bc0e74  Regen
     add a5008b3  [CAMEL-12763] Improve the logic to relate the consumer to the producer in the direct component
     add dedd946  [CAMEL-12770] Allow endpoints to migrate from the dynamic to the static map in the endpoint registry
     add a53b165  [CAMEL-12771] Do not use the deprecated methods on ObjectHelper in camel-core
     add e788aa7  [CAMEL-12771] Do not use the deprecated methods on ObjectHelper in other modules
     add 5f01118  Fix typo
     add 6a98e0b  Lets make the camel-api-component-maven-plugin handle generic methods with non generic return types
     add 388db1b  FHIR component add extended operations support
     add 019a809  Refactored
     add 4482cbf  CAMEL-12598: Camel maven tooling validate to detect direct/send endpoints missing names, eg sending to none existing seda queue which has no consumers etc.
     add deb326f  CAMEL-12598: Camel maven tooling validate to detect direct/send endpoints missing names, eg sending to none existing seda queue which has no consumers etc.
     add 3fa3008  CAMEL-12598: Camel maven tooling validate to detect direct/send endpoints missing names, eg sending to none existing seda queue which has no consumers etc.
     add 318840e  CAMEL-12598: Polished
     add 8173eb6  CAMEL-12758:SOAP request causing null namespace URI in SimpleNsStreamWriter (#2503)
     add 5e2fe2e  Upgrade Infinispan to version 9.3.2.Final
     add 4a0e2f5  Upgrade Rabbitmq client to version 5.4.1
     add bf50bd4  Upgrade Build Helper Maven plugin to version 1.12
     add 4e179c1  Added Camel 2.19.0 release notes to docs
     add 30cb13f  Added Camel 2.19.1 release notes to docs
     add ab8396a  Added Camel 2.19.2 release notes to docs
     add d6d7f38  Added Camel 2.19.3 release notes to docs
     add aed2501  Added Camel 2.19.4 release notes to docs
     add 15dc812  Added Camel 2.19.5 release notes to docs
     add 55d81d8  Upgrade Netty Tcnative Static Boring SSL to version 2.0.15.Final
     add d1d9a97  Upgrade Chronicle Core to version 1.16.24
     add 73255a0  Upgrade Chronicle Bytes to version 1.16.25
     add 8fa8bc9  CAMEL-12769: Combination of File consumer with charset and Split DSL with XPath doesn't parse XML correctly (#2505)
     add 6223c79  CAMEL-12756: Fixed spring boot name of property in conditional on property must use dash syntax.
     add fde4584  CAMEL-12774 - Camel-elasticsearch-rest: Error during type conversion from type: java.lang.String to the required type: org.elasticsearch.action.update.UpdateRequest
     add 46ae4f4  CAMEL-12774 - Fixed CS
     add 4ee688c  Upgrade Async Http Client to version 2.5.3
     add 64749fa  CAMEL-12778: Deprecate standalone CamelCatalog as MXBean as its not compliant and not in use anyway.
     add 21a5e9f  CAMEL-12775: Fixed stub component with MEP InOut vs InOnly mode would expect a reply message or not. Otherwise InOut with no active consumer would block and timeout after 30 seconds and fail. Thanks to Guido Schreuder for reporting and the unit test.
     add dce9c18  Added Camel 2.20.0 release notes to docs
     add 0cb887e  Added Camel 2.20.1 release notes to docs
     add 12f4b36  Added Camel 2.20.2 release notes to docs
     add 39371bc  Added Camel 2.20.3 release notes to docs
     add 0a25aa1d Added Camel 2.20.4 release notes to docs
     add 76c9fc1  CAMEL-11325: Upgraded Apache Spark to 2.3.1
     add a1f083e  CAMEL-11325: Regen docs
     add 359000c  Added Camel 2.21.0 release notes to docs
     add b7ebf2e  Added Camel 2.21.2 release notes to docs
     add f59fa9f  Added Camel 2.21.1 release notes to docs
     add 6e57ee7  CAMEL-12779: camel-spring-redis - When stopping consumer it should stop the message listener
     add d3d952b  Polished
     add 15f3a75  Fix typo
     add d30d920  Fix typo
     add 9f19904  Fix typo
     add a60fcf9  Fix typo
     add 4b8aafd  Fix typo in RestDefinition#outTypeList java doc
     add 0e7ba6a  CAMEL-12320: camel-restlet - Should match better on uri pattern and return 404 for invalid urls
     add f7cacf5  Camel-restlet: Removed a system.out.println statement from test
     add 877bfa0  CAMEL-12777 - Checkstyle issues
     add dbbd746  CAMEL-12777 - Checkstyle issues
     add 4ed0abf  CAMEL-12777 - Checkstyle issues
     add 806af2d  Upgrade Fastjson and related bundle to version 1.2.49
     add 29169fc  Upgrade InfluxDb Java and related bundle to version 2.12
     add 6b95cd2  Upgrade Facebook4j and related bundle to version 2.4.12 (note that the version of the bundle for 2.4.12 is 2.4.11_2)
     add 722934a  Upgrade Twitter4j and related bundle to version 4.0.7
     add 1584b2f  Upgrade Consul client and related bundle to version 1.2.4
     add 6f90f06  CAMEL-12751 - Added Content-Length Test for incorrect length.
     add 2147d7b  CAMEL-12751 - Default http4 producer to ignore content-length header.
     add b2aefeb  CAMEL-12751 - Added documentation to ignoreContentLengthHeader parameter
     add 1e896e5  CAMEL-12751 - Removed config. Instead ignoring content-length on streams
     add 38accde  CAMEL-12777 - Checkstyle issues
     add ae54468  Fix typos in javadoc
     add 021dfd4  CAMEL-12784 - Create a Camel-google-calendar-stream component
     add addee9c  CAMEL-12784 - Create a Camel-google-calendar-stream component
     add ff9e415  CAMEL-12784 - Create a Camel-google-calendar-stream component
     add 5cfd504  CAMEL-12784 - Create a Camel-google-calendar-stream component
     add 4900e20  CAMEL-12784 - Regen
     add 46d7993  Remove trailing blanks of log messages
     add 1e3ff96  Salesforce consumer should use AyncCallback, fixes CAMEL-12780
     add fb0765e  Merge pull request #2508 from dhirajsb/master
     add a5e4eca  Remove log placeholders from exception messages
     add 2272482  [CAMEL-12780] Fixed tests
     add abfe501  Fixed CS Camel-salesforce
     add 5e97986  Add XML schema references for release 2.22.1
     add 689b74a  CAMEL-12751: Remove itest as the content-length header is not always provided.
     add e34e211  Adding docs section on Spring Boot testing with example (#2510)
     add 995e912  CAMEL-12781: Re-adding missing code samples to documentation (#2511)
     add 6f1a3e2  camel-core: remove unnecessary object array creation when logging with placeholders
     add 85762b6  Upgrade Artemis to version 2.6.3
     add 66cbfbb  Upgrade Chronicle Core to version 1.16.25
     add 42a3adc  Upgrade Chronicle Wire to version 1.16.18
     add f303135  CAMEL-11497: Migrate 'Working with Camel and ...' guides and related docs (#2512)
     add 1d290bd  CAMEL-12784 - Create a Camel-google-calendar-stream component, option to set a Calendar to consume from with its summary name
     add 7d3cfc9  CAMEL-12784 - Fixed CS
     add 7093d63  Regen
     add a6c3941  CAMEL-12782 - More specific error message for unresolved model classes. (#2509)
     add 9fa8ae2  Upgrade Zipkin to version 2.11.5
     add 717dbea  Upgrade Zipkin reporter to version 2.7.8
     add f9b156e  Upgrade Brave Zipkin to version 5.3.0
     add bf416b8  CAMEL-12114: Have XmlLineNumberParser respecting namespace uri also for anonymous namespaces (without prefix) from its parent+ tag
     add 9566b95  Fixed CS
     add b32f01e  Polished
     add dde018d  Polished
     add 726bd10  Remove unnecessary object array creation when logging with placeholders.
     add e5401ec  fix CAMEL-12787 Accept header is not respected anymore in CXFRS consumer when POST
     add 1bf155f  Upgrade RXJava to version 2.2.2
     add b47a089  Update aws-kinesis-component.adoc (#2514)
     add e2fbc3f  Upgrade Jgit to version 5.0.3.201809091024-r
     add 556a293  Upgrade TestContainers to version 1.9.0
     add d32da42  CAMEL-12784 - Create a Camel-google-calendar-stream component, option to consume from now or to start from the beginning
     add 84ac53c  CAMEL-12784 - Create a Camel-google-calendar-stream component, option to base the next poll on the lastUpdate date of the last event consumed
     add 97e585a  CAMEL-12784 - Fixed CS
     add 48872c3  Upgrade Infinispan to version 9.3.3.Final
     add f320837  Remove #toString calls on arguments of parameterized log messages.
     add ad8308c  Revert "Upgrade TestContainers to version 1.9.0", because "org.testcontainers:testcontainers:jar:1.9.0" is not in maven central yet.
     add 120fd86  Upgrade Reactor to version 3.1.9.RELEASE
     add 786b0b8  CAMEL-12802 - Camel-google-mail, Camel-google-mail-stream: Add Google Mail verifier Extension
     add 3de15e8  CAMEL-12802 - Camel-google-mail, Camel-google-mail-stream: Add Google Mail verifier Extension
     add 4778130  CAMEL-12802 - Camel-google-mail, Camel-google-mail-stream: Add Google Mail verifier Extension
     add d757c59  Replace string concatenation in logging with placeholders.
     add 59780e6  Remove #toString calls on arguments of parameterized log messages.
     add ba91b30  Revert "Replace string concatenation in logging with placeholders." (d757c59030ba9979951af8cdc23508b34e47d559) for camel-examples which use java.util.logging.
     add a126746  Fix syntax of some log with placeholder statements.
     add b3a7888  CAMEL-12785: ServletComponent ignores HttpBinding
     add dc1c110  Regen
     add 4641580  CAMEL-12733. Check if directory exists via ls, so we don't need to return back to original dir later.
     add 6ec03f7  Upgrade Kubernetes-model to version 3.0.3
     add 4dcd905  Upgrade Kubernetes client to version 4.0.5
     add c320070  Upgrade Brave Zipkin to version 5.3.1
     add 6ececac  Security Advisories: Porting to docs
     add a530bf1  Security Advisories: Porting to docs
     add 403af26  Security Advisories: Porting to docs
     add 4434e5a  Security Advisories: Porting to docs
     add 7119b74  Security Advisories: Porting to docs
     add b9205b5  Security Advisories: Porting to docs
     add 6e86751  Security Advisories: Porting to docs
     add afb5032  Security Advisories: Porting to docs
     add 34ac4a8  Security Advisories: Porting to docs
     add b46412b  Security Advisories: Porting to docs
     add 3587596  Security Advisories: Porting to docs
     add 7215c1e  Security Advisories: Porting to docs
     add 59d4078  Security Advisories: Porting to docs
     add 8b433b7  Security Advisories: Porting to docs
     add e852f68  Removed useless logging added for testing
     add 1186393  Fix "unmarshal" at camel-base64 docs (#2519)
     add 3a0bcd7  Upgrade Pubnub to version 4.20.0
     add 48a472e  Upgrade AWS XRay to version 2.0.1
     add fd1cfe5  Upgrade JNats to version 2.1.0
     add f8a40ba  Upgrade Hibernate Validator to version 6.0.13.Final
     add 99b2c83  CAMEL-12806 - Camel-Slack: Add a check on the messages list while consuming
     add d0c9615  CAMEL-12806 - Fixed CS
     add c2a07c6  Corrected a typo in camel-netty4 documentation
     add 1a9e611  Fixed CS issues in camel-core
     add 0b70f64  CAMEL-12784 - Create a Camel-google-calendar-stream component, use calendarId instead of CalendarSummary
     add 97b1957  CAMEL-12784 - Fixed CS
     add 07a0a8a  Upgrade Brave Zipkin to version 5.3.2
     add fe919d4  Upgrade Hazelcast to version 3.10.5
     add a481a51  Use the latest hazelcast-kubernetes-bootstrapper in the hazelcast-kubernetes example (3.10.5)
     add 7c8df47  CAMEL-12807 Avoid to use endpoint attribute when MqttConnectOptions is declared once
     add fd463ab  CAMEL-12807 - Fix documentation
     add dd39d79  CAMEL-12807 - Fixed CS
     add 8517fdf  [CAMEL-12809] Threading issues with the throttler when using a correlation key
     add 1bcdfb9  Fix typo in Netty and Netty4 javadoc
     add 8c5b9e6  Fixed CS in camel-spring
     add ff90f1f  Fixed CS in camel-cxf
     add 8c1008b  Fixed CS in camel-leveldb
     add adfa7cb  Upgrade Jgroups to version 4.0.14.Final
     add 675a6ca  Upgrade Dropbox to version 3.0.9
     add d65fb0c  Upgrade Owasp Maven Plugin to version 3.3.2
     add 4a06a41  Upgrade Brave Zipkin to version 5.3.3
     add 67c45a7  Fixed some Camel-weather integration tests
     add 0260618  Regen
     add d4b32f7  Upgrade Spring-Boot to version 2.0.5.RELEASE
     add ee1376f  Upgrade Xchange to version 4.3.10
     add cc70d07  CAMEL-12816: Fixed CS issues in some components
     add 24c10ef  Update Spring Framework to version 5.0.9.RELEASE
     add 34d295f  Update Spring Security to version 5.0.8.RELEASE
     add 082224b  Update Spring WS to version 3.0.3.RELEASE
     add 18cd057  Upgrade Spring Boot here too
     add d54f4b3  Regen
     add 6eda5e0  Upgrade Chronicle Core to version 1.16.26
     add 8ebd9f8  Upgrade Chronicle Threads to version 1.16.4
     add 241c645  Upgrade Chronicle Bytes to version 1.16.26
     add c815b3e  Upgrade Chronicle Wire to version 1.16.19
     add d1ba18f  Upgrade Mongodb Java Driver to version 3.8.1
     add d22aeb5  Upgrade Apache POM to version 21
     add 97f2cd0  CAMEL-12820 - SQS: Malformed queue URL due to bad region parsing
     add e94b664  CAMEL-12816: Fixed CS in some components
     add 7e7cf44  Fix MQTT URI param typo.
     add fe4747c  Extended camel-mqtt configuration test coverage with respect to Quality Of Service
     add d05a6bd  Upgrade Chronicle Core to version 1.16.27
     add 9c237f0  [CAMEL-12605] Refactored encryption algorithms and added tests for all supported algorithms.
     add ef2fc55  Upgrade Deltaspike to version 1.9.0
     add 4b4653c  Camel-google-mail: set logging level to INFO for tests
     add 5a171f4  CAMEL-12542: Fixed seda endpoint documentation about default queue size.
     add 1abd2b8  Upgrade JGit to version 5.1.1.201809181055-r
     add c052f73  CAMEL-12822: camel-http4 exposes client connection stats in JMX
     add 3ced953  Upgrade MongoDB Java Driver to version 3.8.2
     add 68bd903  camel-servlet - Improve docs format (#2525)
     add e8e2eca  Upgrade Jackson to version 2.9.7
     add 8c79fcb  Upgrade hapi-fhir to 3.5.0
     add da91d24  Upgrade JNats to version 2.1.1
     add 6c8c11d  Upgrade Mvel to version 2.4.2.Final
     new 42b0115  Temporary disable JDK 9 and karaf-itest and spr...
     new e51d4e9  CAMEL-12618: Use fork of MVEL that supports Jav...
     new 659325e  CAMEL-12618: Use fork of maven-plugin-plugin th...
     new bce7bd2  CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
     new e7f8781  CAMEL-12618: upgrade Groovy Eclipse compiler
     new cc6c33b  CAMEL-12618: Additional dependencies needed on ...

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (bd158b4)
            \
             N -- N -- N   refs/heads/java-10-test (cc6c33b)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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


Summary of changes:
 apache-camel/pom.xml                               |   10 +
 apache-camel/src/main/descriptors/common-bin.xml   |    3 +
 .../src/test/java/__className__Test.java           |    2 +-
 bom/camel-bom/pom.xml                              |   10 +
 camel-core/src/main/docs/bean-component.adoc       |   13 +-
 camel-core/src/main/docs/class-component.adoc      |   13 +-
 camel-core/src/main/docs/seda-component.adoc       |    2 +-
 camel-core/src/main/docs/stub-component.adoc       |    2 +-
 camel-core/src/main/docs/vm-component.adoc         |    2 +-
 .../src/main/java/org/apache/camel/Message.java    |    1 +
 .../org/apache/camel/ThreadPoolRejectedPolicy.java |    1 +
 .../management/mbean/ManagedCamelContextMBean.java |    1 +
 .../management/mbean/ManagedCamelHealthMBean.java  |    1 +
 .../management/mbean/ManagedComponentMBean.java    |    1 +
 .../mbean/ManagedRuntimeEndpointRegistryMBean.java |    1 +
 .../camel/builder/DeadLetterChannelBuilder.java    |    4 +-
 .../apache/camel/builder/ExpressionBuilder.java    |    8 +-
 .../org/apache/camel/builder/ExpressionClause.java |    2 +-
 .../org/apache/camel/builder/RouteBuilder.java     |    3 +-
 .../org/apache/camel/builder/SimpleBuilder.java    |    4 +-
 .../camel/builder/xml/DefaultNamespaceContext.java |    1 +
 .../camel/builder/xml/FileResultHandler.java       |    1 +
 .../org/apache/camel/builder/xml/XPathBuilder.java |  283 +++---
 .../org/apache/camel/builder/xml/XsltBuilder.java  |    1 +
 .../camel/builder/xml/XsltErrorListener.java       |    6 +-
 .../apache/camel/builder/xml/XsltUriResolver.java  |    1 +
 .../component/bean/AbstractBeanProcessor.java      |   36 +-
 .../bean/AbstractCamelInvocationHandler.java       |    5 +-
 .../bean/BeanAnnotationExpressionFactory.java      |    3 +-
 .../apache/camel/component/bean/BeanComponent.java |   32 +-
 .../apache/camel/component/bean/BeanEndpoint.java  |   11 +-
 .../org/apache/camel/component/bean/BeanInfo.java  |    2 +-
 .../apache/camel/component/bean/BeanProcessor.java |    8 +
 .../apache/camel/component/bean/MethodInfo.java    |   10 +-
 .../component/dataformat/DataFormatComponent.java  |    6 +-
 .../component/direct/DirectBlockingProducer.java   |   96 --
 .../camel/component/direct/DirectConsumer.java     |   11 +-
 .../camel/component/direct/DirectEndpoint.java     |   71 +-
 .../camel/component/direct/DirectProducer.java     |   37 +-
 .../apache/camel/component/file/FileConsumer.java  |    3 +-
 .../camel/component/file/FileOperations.java       |   10 +-
 .../apache/camel/component/file/GenericFile.java   |    5 +-
 .../camel/component/file/GenericFileComponent.java |    3 +-
 .../camel/component/file/GenericFileEndpoint.java  |    4 +-
 .../component/file/GenericFileOnCompletion.java    |    4 +-
 .../camel/component/file/GenericFileProducer.java  |    4 +-
 .../MarkerFileExclusiveReadLockStrategy.java       |    6 +-
 .../component/language/LanguageComponent.java      |    5 +-
 .../apache/camel/component/mock/MockEndpoint.java  |    6 +-
 .../apache/camel/component/mock/TimeClause.java    |    2 +-
 .../properties/DefaultPropertiesParser.java        |    7 +-
 .../properties/EnvPropertiesFunction.java          |    6 +-
 .../component/properties/PropertiesComponent.java  |    4 +-
 .../component/properties/PropertiesLocation.java   |    4 +-
 .../properties/ServiceHostPropertiesFunction.java  |    6 +-
 .../properties/ServicePortPropertiesFunction.java  |    6 +-
 .../properties/ServicePropertiesFunction.java      |    6 +-
 .../properties/SysPropertiesFunction.java          |    6 +-
 .../apache/camel/component/rest/RestComponent.java |   10 +-
 .../camel/component/seda/BlockingQueueFactory.java |    1 +
 .../seda/PriorityBlockingQueueFactory.java         |    1 -
 .../apache/camel/component/seda/SedaComponent.java |    2 +-
 .../apache/camel/component/seda/SedaConsumer.java  |    2 +-
 .../apache/camel/component/seda/SedaEndpoint.java  |   12 +-
 .../apache/camel/component/seda/SedaProducer.java  |    1 +
 .../apache/camel/component/stub/StubEndpoint.java  |    7 +-
 .../apache/camel/component/stub/StubProducer.java  |   59 ++
 .../camel/component/timer/TimerConsumer.java       |    2 +-
 .../apache/camel/component/xslt/XsltComponent.java |    1 +
 .../apache/camel/component/xslt/XsltEndpoint.java  |    1 +
 .../apache/camel/component/xslt/XsltHelper.java    |    1 +
 .../org/apache/camel/converter/IOConverter.java    |   87 +-
 .../org/apache/camel/converter/NIOConverter.java   |    2 +-
 .../apache/camel/converter/jaxp/StaxConverter.java |    9 +-
 .../converter/jaxp/StreamSourceConverter.java      |    1 +
 .../converter/jaxp/XMLStreamReaderInputStream.java |    4 +-
 .../apache/camel/converter/jaxp/XmlConverter.java  |   25 +-
 .../converter/stream/StreamCacheConverter.java     |    1 +
 .../camel/converter/stream/StreamSourceCache.java  |    1 +
 .../apache/camel/impl/ActiveMQUuidGenerator.java   |    2 +-
 .../org/apache/camel/impl/ConfigurationHelper.java |    2 +-
 .../impl/DefaultAsyncProcessorAwaitManager.java    |    4 +-
 .../camel/impl/DefaultCamelBeanPostProcessor.java  |    8 +-
 .../org/apache/camel/impl/DefaultCamelContext.java |   33 +-
 .../apache/camel/impl/DefaultClassResolver.java    |    9 +-
 .../org/apache/camel/impl/DefaultComponent.java    |    2 +-
 .../camel/impl/DefaultComponentResolver.java       |    2 +-
 .../org/apache/camel/impl/DefaultEndpoint.java     |    6 +-
 .../apache/camel/impl/DefaultEndpointRegistry.java |    4 +
 .../org/apache/camel/impl/DefaultExchange.java     |    6 +-
 .../camel/impl/DefaultExecutorServiceManager.java  |    5 +-
 .../camel/impl/DefaultManagementNameStrategy.java  |    6 +-
 .../java/org/apache/camel/impl/DefaultMessage.java |    1 +
 .../impl/DefaultPackageScanClassResolver.java      |    6 +-
 .../camel/impl/DefaultStreamCachingStrategy.java   |   10 +-
 .../org/apache/camel/impl/DefaultUnitOfWork.java   |    4 +-
 .../org/apache/camel/impl/DurationRoutePolicy.java |    2 +-
 .../impl/ExplicitCamelContextNameStrategy.java     |    4 +-
 .../org/apache/camel/impl/FileStateRepository.java |    2 +-
 .../impl/InterceptSendToEndpointProcessor.java     |    2 +-
 .../impl/InterceptSendToMockEndpointStrategy.java  |    4 +-
 .../java/org/apache/camel/impl/JndiRegistry.java   |    1 +
 .../java/org/apache/camel/impl/ProducerCache.java  |    8 +-
 .../java/org/apache/camel/impl/RouteService.java   |    2 +-
 .../apache/camel/impl/ScheduledPollConsumer.java   |    6 +-
 .../camel/impl/ThrottlingInflightRoutePolicy.java  |    4 +-
 .../converter/AnnotationTypeConverterLoader.java   |    1 +
 .../java/org/apache/camel/impl/osgi/Activator.java |    2 +-
 .../impl/transformer/DataFormatTransformer.java    |    1 +
 .../apache/camel/language/bean/BeanLanguage.java   |    5 +-
 .../simple/ast/SimpleFunctionExpression.java       |   28 +-
 .../java/org/apache/camel/main/MainSupport.java    |    2 +-
 .../camel/management/DefaultManagementAgent.java   |    8 +-
 .../DefaultManagementLifecycleStrategy.java        |    3 +-
 .../DefaultManagementNamingStrategy.java           |    1 +
 .../camel/management/InstrumentationProcessor.java |    2 +-
 .../management/JmxNotificationEventNotifier.java   |    1 +
 .../camel/management/MBeanInfoAssembler.java       |    6 +-
 .../mbean/JMXNotificationTraceEventHandler.java    |    1 +
 .../mbean/ManagedAsyncProcessorAwaitManager.java   |    1 +
 .../management/mbean/ManagedCamelContext.java      |    1 +
 .../camel/management/mbean/ManagedCamelHealth.java |    1 +
 .../camel/management/mbean/ManagedChoice.java      |    1 +
 .../camel/management/mbean/ManagedComponent.java   |    1 +
 .../camel/management/mbean/ManagedDataFormat.java  |    1 +
 .../management/mbean/ManagedDynamicRouter.java     |    1 +
 .../camel/management/mbean/ManagedEndpoint.java    |    1 +
 .../management/mbean/ManagedEndpointRegistry.java  |    1 +
 .../camel/management/mbean/ManagedEnricher.java    |    1 +
 .../management/mbean/ManagedEventNotifier.java     |    1 +
 .../mbean/ManagedFailoverLoadBalancer.java         |    1 +
 .../mbean/ManagedInflightRepository.java           |    1 +
 .../management/mbean/ManagedPollEnricher.java      |    1 +
 .../camel/management/mbean/ManagedProcessor.java   |    1 +
 .../management/mbean/ManagedRecipientList.java     |    1 +
 .../management/mbean/ManagedRestRegistry.java      |    1 +
 .../camel/management/mbean/ManagedRoute.java       |    1 +
 .../camel/management/mbean/ManagedRoutingSlip.java |    1 +
 .../mbean/ManagedRuntimeEndpointRegistry.java      |    1 +
 .../mbean/ManagedSendDynamicProcessor.java         |    1 +
 .../mbean/ManagedTransformerRegistry.java          |    1 +
 .../mbean/ManagedTypeConverterRegistry.java        |    1 +
 .../management/mbean/ManagedValidatorRegistry.java |    1 +
 .../management/mbean/ManagedWireTapProcessor.java  |    1 +
 .../management/mbean/RouteCoverageXmlParser.java   |    2 +
 .../java/org/apache/camel/model/AOPDefinition.java |    1 +
 .../apache/camel/model/AggregateDefinition.java    |    1 +
 .../org/apache/camel/model/CatchDefinition.java    |    1 +
 .../org/apache/camel/model/ChoiceDefinition.java   |    1 +
 .../apache/camel/model/ContextScanDefinition.java  |    1 +
 .../apache/camel/model/ConvertBodyDefinition.java  |    1 +
 .../apache/camel/model/DataFormatDefinition.java   |    1 +
 .../org/apache/camel/model/DelayDefinition.java    |    1 +
 .../camel/model/DynamicRouterDefinition.java       |    1 +
 .../org/apache/camel/model/ExpressionNode.java     |    1 +
 .../camel/model/HystrixConfigurationCommon.java    |    1 +
 .../model/HystrixConfigurationDefinition.java      |    3 +-
 .../org/apache/camel/model/HystrixDefinition.java  |    1 +
 .../apache/camel/model/InputTypeDefinition.java    |    1 +
 .../apache/camel/model/InterceptDefinition.java    |    1 +
 .../model/InterceptSendToEndpointDefinition.java   |    1 +
 .../apache/camel/model/LoadBalanceDefinition.java  |    1 +
 .../apache/camel/model/LoadBalancerDefinition.java |    5 +-
 .../java/org/apache/camel/model/LogDefinition.java |    3 +-
 .../java/org/apache/camel/model/ModelHelper.java   |    1 +
 .../apache/camel/model/MulticastDefinition.java    |    1 +
 .../apache/camel/model/NoOutputExpressionNode.java |    1 +
 .../apache/camel/model/OnCompletionDefinition.java |    1 +
 .../apache/camel/model/OnExceptionDefinition.java  |    1 +
 .../apache/camel/model/OnFallbackDefinition.java   |    1 +
 .../apache/camel/model/OtherAttributesAware.java   |    1 +
 .../apache/camel/model/OtherwiseDefinition.java    |    1 +
 .../org/apache/camel/model/OutputDefinition.java   |    1 +
 .../apache/camel/model/OutputTypeDefinition.java   |    1 +
 .../apache/camel/model/PackageScanDefinition.java  |    1 +
 .../apache/camel/model/ProcessorDefinition.java    |    1 +
 .../camel/model/ProcessorDefinitionHelper.java     |    8 +-
 .../apache/camel/model/PropertiesDefinition.java   |    1 +
 .../camel/model/RecipientListDefinition.java       |    1 +
 .../apache/camel/model/ResequenceDefinition.java   |    1 +
 .../camel/model/RestContextRefDefinition.java      |    1 +
 .../model/RestContextRefDefinitionHelper.java      |    1 +
 .../org/apache/camel/model/RouteContainer.java     |    1 +
 .../camel/model/RouteContextRefDefinition.java     |    1 +
 .../model/RouteContextRefDefinitionHelper.java     |    1 +
 .../org/apache/camel/model/RouteDefinition.java    |    1 +
 .../org/apache/camel/model/RoutesDefinition.java   |    1 +
 .../apache/camel/model/RoutingSlipDefinition.java  |    1 +
 .../org/apache/camel/model/SagaDefinition.java     |    1 +
 .../org/apache/camel/model/SamplingDefinition.java |    1 +
 .../org/apache/camel/model/SortDefinition.java     |    1 +
 .../org/apache/camel/model/SplitDefinition.java    |    1 +
 .../camel/model/ThreadPoolProfileDefinition.java   |    1 +
 .../org/apache/camel/model/ThreadsDefinition.java  |    1 +
 .../org/apache/camel/model/ThrottleDefinition.java |    5 +-
 .../apache/camel/model/ToDynamicDefinition.java    |   11 +-
 .../apache/camel/model/TransactedDefinition.java   |    1 +
 .../java/org/apache/camel/model/TryDefinition.java |    1 +
 .../org/apache/camel/model/WireTapDefinition.java  |    1 +
 ...ngServiceCallServiceDiscoveryConfiguration.java |    1 +
 ...klistServiceCallServiceFilterConfiguration.java |    1 +
 ...ngServiceCallServiceDiscoveryConfiguration.java |    1 +
 ...edServiceCallServiceDiscoveryConfiguration.java |    1 +
 ...binedServiceCallServiceFilterConfiguration.java |    1 +
 .../camel/model/cloud/ServiceCallDefinition.java   |    1 +
 .../cloud/ServiceCallExpressionConfiguration.java  |    1 +
 .../ServiceCallServiceChooserConfiguration.java    |    1 +
 .../ServiceCallServiceDiscoveryConfiguration.java  |    1 +
 .../ServiceCallServiceFilterConfiguration.java     |    1 +
 ...erviceCallServiceLoadBalancerConfiguration.java |    1 +
 ...icServiceCallServiceDiscoveryConfiguration.java |    1 +
 .../camel/model/config/ResequencerConfig.java      |    1 +
 .../camel/model/dataformat/CryptoDataFormat.java   |    1 +
 .../camel/model/dataformat/CsvDataFormat.java      |    1 +
 .../model/dataformat/DataFormatsDefinition.java    |    1 +
 .../camel/model/dataformat/FhirDataformat.java     |    2 +
 .../camel/model/dataformat/FhirJsonDataFormat.java |    1 +
 .../camel/model/dataformat/FhirXmlDataFormat.java  |    1 +
 .../camel/model/dataformat/JaxbDataFormat.java     |    1 +
 .../dataformat/UniVocityAbstractDataFormat.java    |    1 +
 .../model/dataformat/XMLSecurityDataFormat.java    |    1 +
 .../camel/model/dataformat/XStreamDataFormat.java  |    1 +
 .../camel/model/dataformat/XmlJsonDataFormat.java  |    1 +
 .../camel/model/dataformat/YAMLDataFormat.java     |    1 +
 .../camel/model/dataformat/ZipDataFormat.java      |    1 +
 .../camel/model/language/ExpressionDefinition.java |    1 +
 .../model/language/NamespaceAwareExpression.java   |    1 +
 .../CircuitBreakerLoadBalancerDefinition.java      |    1 +
 .../loadbalancer/CustomLoadBalancerDefinition.java |    4 +-
 .../FailoverLoadBalancerDefinition.java            |    1 +
 .../WeightedLoadBalancerDefinition.java            |    1 +
 .../model/rest/RestConfigurationDefinition.java    |    1 +
 .../org/apache/camel/model/rest/RestContainer.java |    1 +
 .../apache/camel/model/rest/RestDefinition.java    |   12 +-
 .../model/rest/RestOperationParamDefinition.java   |    1 +
 .../RestOperationResponseHeaderDefinition.java     |    1 +
 .../rest/RestOperationResponseMsgDefinition.java   |    1 +
 .../camel/model/rest/RestSecuritiesDefinition.java |    1 +
 .../camel/model/rest/RestSecurityOAuth2.java       |    1 +
 .../apache/camel/model/rest/RestsDefinition.java   |    1 +
 .../apache/camel/model/rest/VerbDefinition.java    |    1 -
 .../transformer/CustomTransformerDefinition.java   |    1 +
 .../DataFormatTransformerDefinition.java           |    1 +
 .../transformer/EndpointTransformerDefinition.java |    1 +
 .../model/transformer/TransformerDefinition.java   |    1 +
 .../model/transformer/TransformersDefinition.java  |    1 +
 .../camel/model/validator/ValidatorDefinition.java |    1 +
 .../model/validator/ValidatorsDefinition.java      |    1 +
 .../camel/processor/CamelInternalProcessor.java    |    2 +-
 .../org/apache/camel/processor/RecipientList.java  |    5 +-
 .../camel/processor/RedeliveryErrorHandler.java    |    2 +-
 .../apache/camel/processor/RedeliveryPolicy.java   |    5 +-
 .../java/org/apache/camel/processor/Splitter.java  |    1 +
 .../java/org/apache/camel/processor/Throttler.java |  301 ++----
 .../processor/aggregate/AggregateProcessor.java    |    2 +-
 .../aggregate/AggregationStrategyBeanInfo.java     |    2 +-
 .../camel/processor/interceptor/BacklogTracer.java |    6 +-
 .../processor/interceptor/DefaultChannel.java      |    2 +-
 .../interceptor/DefaultTraceEventHandler.java      |    2 +-
 .../resequencer/ExpressionResultComparator.java    |    2 +-
 .../validation/DefaultValidationErrorHandler.java  |    7 +-
 .../validation/PredicateValidatingProcessor.java   |    2 +-
 .../camel/processor/validation/SchemaReader.java   |    3 +-
 .../main/java/org/apache/camel/spi/Contract.java   |   10 +-
 .../apache/camel/spi/ManagementNamingStrategy.java |    1 +
 .../camel/support/TokenPairExpressionIterator.java |    7 +-
 .../camel/support/TokenXMLExpressionIterator.java  |    7 +-
 .../support/TokenXMLPairExpressionIterator.java    |    5 +-
 .../camel/support/XMLTokenExpressionIterator.java  |    5 +-
 .../org/apache/camel/util/CamelContextHelper.java  |    6 +-
 .../apache/camel/util/CamelContextStatDump.java    |    1 +
 .../main/java/org/apache/camel/util/CastUtils.java |    1 +
 .../java/org/apache/camel/util/EndpointHelper.java |    6 +-
 .../main/java/org/apache/camel/util/FileUtil.java  |    6 +-
 .../org/apache/camel/util/GroupTokenIterator.java  |    1 -
 .../main/java/org/apache/camel/util/IOHelper.java  |    8 +-
 .../apache/camel/util/IntrospectionSupport.java    |   20 +-
 .../java/org/apache/camel/util/MessageDump.java    |    1 +
 .../java/org/apache/camel/util/ObjectHelper.java   |    2 +-
 .../java/org/apache/camel/util/OgnlHelper.java     |    2 +-
 .../java/org/apache/camel/util/PackageHelper.java  |    2 +-
 .../java/org/apache/camel/util/ResolverHelper.java |    2 +-
 .../java/org/apache/camel/util/ResourceHelper.java |   29 +-
 .../java/org/apache/camel/util/RouteStatDump.java  |    1 +
 .../java/org/apache/camel/util/SedaConstants.java  |    1 +
 .../java/org/apache/camel/util/ServiceHelper.java  |    8 +-
 .../java/org/apache/camel/util/URISupport.java     |    4 +-
 .../org/apache/camel/util/XmlLineNumberParser.java |    2 +
 .../camel/util/component/ApiMethodParser.java      |   13 +-
 .../concurrent/SizedScheduledExecutorService.java  |    2 +-
 .../apache/camel/util/concurrent/ThreadHelper.java |    4 +-
 .../util/jndi/CamelInitialContextFactory.java      |    1 +
 .../jndi/CamelSingletonInitialContextFactory.java  |    1 +
 .../camel/util/jsse/BaseSSLContextParameters.java  |    1 -
 .../util/toolbox/FlexibleAggregationStrategy.java  |    5 +-
 .../util/toolbox/XsltAggregationStrategy.java      |    1 +
 .../org/apache/camel/BodyAndHeaderConvertTest.java |   18 +-
 .../java/org/apache/camel/CamelExceptionsTest.java |   27 +
 .../java/org/apache/camel/ContextTestSupport.java  |   14 +-
 .../java/org/apache/camel/ExchangePatternTest.java |    7 +-
 .../java/org/apache/camel/ExchangeTestSupport.java |    2 +-
 .../org/apache/camel/InjectorDefaultsTest.java     |    4 +
 .../java/org/apache/camel/LoggingLevelTest.java    |    4 +-
 .../org/apache/camel/SuspendableServiceTest.java   |    6 +-
 .../test/java/org/apache/camel/TestSupport.java    |   51 +-
 .../org/apache/camel/TestSupportJmxCleanup.java    |    1 +
 .../apache/camel/ThreadPoolRejectedPolicyTest.java |    9 +
 .../camel/builder/AddRoutesAtRuntimeTest.java      |    2 +
 .../camel/builder/BuilderWithScopesTest.java       |   23 +
 .../camel/builder/ContextErrorHandlerTest.java     |    8 +-
 .../camel/builder/ErrorHandlerBuilderRefTest.java  |    2 +
 .../org/apache/camel/builder/ErrorHandlerTest.java |   19 +-
 .../apache/camel/builder/ExceptionBuilderTest.java |    7 +
 .../ExceptionBuilderWithHandledExceptionTest.java  |    4 +
 .../apache/camel/builder/ExchangeBuilderTest.java  |    8 +-
 .../camel/builder/ExpressionBuilderTest.java       |   28 +-
 .../builder/ExpressionClauseSupplierTest.java      |    2 +
 .../apache/camel/builder/ExpressionClauseTest.java |    3 +
 .../camel/builder/ExpressionFunctionTest.java      |    2 +
 .../camel/builder/FluentProducerTemplateTest.java  |   19 +
 .../builder/LoggingErrorHandlerBuilderTest.java    |    7 +
 .../camel/builder/NotifyBuilderFromRouteTest.java  |    2 +
 .../apache/camel/builder/NotifyBuilderTest.java    |   47 +
 .../builder/NotifyBuilderWhenDoneByIndexTest.java  |    2 +
 .../builder/PredicateBinaryCoerceRouteTest.java    |   15 +
 .../builder/PredicateBinaryCoerceTypeTest.java     |   16 +-
 .../builder/PredicateBuilderConcurrentTest.java    |    2 +
 .../apache/camel/builder/PredicateBuilderTest.java |   21 +-
 .../ProxyBuilderSkipJavaLangObjectMethodsTest.java |    2 +
 .../org/apache/camel/builder/ProxyBuilderTest.java |    2 +
 .../RouteBuilderAddRoutesOnlyInterceptTest.java    |    2 +
 .../camel/builder/RouteBuilderAddRoutesTest.java   |    2 +
 .../org/apache/camel/builder/RouteBuilderTest.java |   14 +
 .../apache/camel/builder/SimpleBuilderTest.java    |    7 +
 .../camel/builder/ThreadPoolBuilderTest.java       |   12 +
 .../camel/builder/TransformerBuilderTest.java      |    4 +
 .../org/apache/camel/builder/ValueBuilderTest.java |    4 +
 .../builder/xml/DefaultNamespaceContextTest.java   |    7 +
 .../builder/xml/ExtractXPathWithNamespaceTest.java |    4 +
 .../camel/builder/xml/NodeListToDocumentTest.java  |    2 +
 .../builder/xml/XPathContentBasedRouterTest.java   |    2 +
 .../apache/camel/builder/xml/XPathFeatureTest.java |    5 +
 .../camel/builder/xml/XPathFunctionsTest.java      |    4 +
 .../XPathHeaderNameResultTypeAndNamespaceTest.java |    2 +
 .../camel/builder/xml/XPathHeaderNameTest.java     |    4 +
 .../apache/camel/builder/xml/XPathHeaderTest.java  |    4 +
 .../apache/camel/builder/xml/XPathMockTest.java    |    8 +
 .../camel/builder/xml/XPathNamespaceTest.java      |    4 +
 .../builder/xml/XPathNestedNamespaceTest.java      |    2 +
 .../org/apache/camel/builder/xml/XPathTest.java    |   42 +-
 .../camel/builder/xml/XPathTransformRouteTest.java |    2 +
 .../camel/builder/xml/XPathTransformTest.java      |    4 +
 .../xml/XPathWithNamespacesFromDomTest.java        |    2 +
 .../apache/camel/builder/xml/XsltBuilderTest.java  |   26 +-
 .../camel/builder/xml/XsltOutputFileTest.java      |    3 +
 .../org/apache/camel/builder/xml/XsltTest.java     |    2 +
 .../builder/xml/XsltTestErrorListenerTest.java     |    7 +-
 .../camel/builder/xml/XsltUriResolverTest.java     |    6 +-
 ...AmbiguousMethodCallExceptionSimplifiedTest.java |    2 +
 .../component/bean/BeanByteArrayBodyTest.java      |    2 +
 ...seMethodWithMatchingTypeAndSkipSettersTest.java |    6 +-
 .../bean/BeanComponentMissingParenthesisTest.java  |    4 +
 .../camel/component/bean/BeanConcurrentTest.java   |    2 +
 .../camel/component/bean/BeanEndpointTest.java     |    7 +
 .../BeanExchangeAsReturnTypeNotAllowedTest.java    |    2 +
 .../component/bean/BeanExcludedMethodTest.java     |    3 +
 .../bean/BeanExplicitMethodAmbiguousTest.java      |    5 +
 .../component/bean/BeanExplicitMethodTest.java     |    3 +
 .../bean/BeanExpressionConcurrentTest.java         |    2 +
 .../bean/BeanHandlerMethodPredicateTest.java       |    2 +
 .../component/bean/BeanHandlerMethodTest.java      |    8 +
 .../component/bean/BeanImplicitMethodTest.java     |    2 +
 .../camel/component/bean/BeanInPipelineTest.java   |    2 +
 .../bean/BeanInfoAMoreComplexOverloadedTest.java   |    4 +
 .../component/bean/BeanInfoInheritanceTest.java    |    4 +
 .../component/bean/BeanInfoOverloadedTest.java     |    2 +
 .../BeanInfoOverloadedWithSubTypeParamTest.java    |    2 +
 .../component/bean/BeanInfoSelectMethodTest.java   |    3 +
 .../apache/camel/component/bean/BeanInfoTest.java  |   15 +-
 .../bean/BeanInfoWithBridgedMethodTest.java        |    3 +
 .../bean/BeanInvocationSerializeTest.java          |    3 +
 .../camel/component/bean/BeanInvokeAsyncTest.java  |    5 +
 .../BeanInvokeSimpleOgnlToStringMethodTest.java    |    2 +
 .../bean/BeanInvokeSingleMethodNoBodyTest.java     |    2 +
 .../camel/component/bean/BeanInvokeStaticTest.java |    3 +
 .../camel/component/bean/BeanInvokeTest.java       |    4 +
 .../bean/BeanInvokeToStringMethodTest.java         |    2 +
 .../component/bean/BeanInvokeWithNullBodyTest.java |    4 +
 .../camel/component/bean/BeanLifecycleTest.java    |   11 +-
 .../bean/BeanLookupUsingJndiRegistryIssueTest.java |    6 +-
 .../camel/component/bean/BeanMapPutTest.java       |    2 +
 .../camel/component/bean/BeanMethodBeanTest.java   |    2 +
 .../bean/BeanMethodNameHeaderIssueTest.java        |    2 +
 .../bean/BeanMethodValueWithCommaTest.java         |    5 +
 .../bean/BeanMethodValueWithExchangeTest.java      |    3 +
 ...rameterAndNoMethodWithNoParameterIssueTest.java |    3 +
 .../component/bean/BeanMethodWithExchangeTest.java |    2 +
 .../bean/BeanMethodWithMultipleParametersTest.java |    4 +
 .../bean/BeanMethodWithStringParameterTest.java    |    3 +
 .../camel/component/bean/BeanNoCacheTest.java      |    2 +
 .../bean/BeanNoTypeConvertionPossibleTest.java     |    4 +
 ...BeanNoTypeConvertionPossibleWhenHeaderTest.java |    5 +
 .../BeanOgnlBodyMethodReturnNullValueTest.java     |    3 +
 .../component/bean/BeanOgnlPerformanceTest.java    |    2 +
 .../component/bean/BeanOnglStaticMethodTest.java   |    2 +
 .../bean/BeanOverloadedCovariantMethodTest.java    |    5 +
 .../bean/BeanOverloadedMethodFQNTest.java          |    7 +
 .../BeanOverloadedMethodParameterValueTest.java    |    9 +
 .../component/bean/BeanOverloadedMethodTest.java   |   12 +
 .../bean/BeanOverloadsWithAssignableParamTest.java |    2 +
 .../BeanParameterBindingStreamCachingTest.java     |    2 +
 .../component/bean/BeanParameterInfoTest.java      |    2 +
 .../bean/BeanParameterInvalidSyntaxTest.java       |    2 +
 .../bean/BeanParameterInvalidValueTest.java        |    5 +
 .../BeanParameterMethodCallThreeBodyOgnlTest.java  |    2 +
 .../bean/BeanParameterNoBeanBindingTest.java       |    2 +
 .../bean/BeanParameterThreeBodyOgnlTest.java       |    2 +
 .../component/bean/BeanParameterValueOgnlTest.java |    4 +
 .../bean/BeanParameterValueOverloadedTest.java     |    3 +
 .../component/bean/BeanParameterValueTest.java     |    9 +
 .../camel/component/bean/BeanPerformanceTest.java  |    2 +
 .../camel/component/bean/BeanPipelineTest.java     |    3 +
 .../component/bean/BeanPropagateHeaderTest.java    |    2 +
 .../component/bean/BeanProxyNoBindingTest.java     |   15 +
 .../apache/camel/component/bean/BeanProxyTest.java |   15 +
 .../component/bean/BeanRefMethodNotFoundTest.java  |    2 +
 .../camel/component/bean/BeanRefNoCacheTest.java   |    2 +
 .../camel/component/bean/BeanRefNotFoundTest.java  |    2 +
 .../camel/component/bean/BeanRegistryBeanTest.java |    6 +
 .../bean/BeanReturnCallableReturnNullTest.java     |    3 +
 .../component/bean/BeanReturnCallableTest.java     |    3 +
 .../camel/component/bean/BeanReturnNullTest.java   |    4 +
 .../bean/BeanWithAnnotationAndExchangeTest.java    |    2 +
 .../bean/BeanWithAnnotationInheritedTest.java      |    6 +
 .../bean/BeanWithAttachmentAnnotationTest.java     |    3 +
 .../BeanWithExchangeExceptionAnnotationTest.java   |    2 +
 .../BeanWithExpressionInjectionPredicateTest.java  |    3 +
 .../bean/BeanWithExpressionInjectionTest.java      |    2 +
 .../component/bean/BeanWithHeaderAnnotation.java   |    1 +
 .../camel/component/bean/BeanWithHeaderTest.java   |    2 +
 .../bean/BeanWithHeadersAndBodyInject2Test.java    |    5 +
 .../bean/BeanWithHeadersAndBodyInject3Test.java    |    5 +
 .../bean/BeanWithHeadersAndBodyInjectionTest.java  |    2 +
 .../bean/BeanWithInputStreamBodyTest.java          |    6 +
 .../component/bean/BeanWithMethodHeaderTest.java   |    8 +
 ...thPropertiesAndHeadersAndBodyInjectionTest.java |    3 +
 .../BeanWithPropertiesAndHeadersInjectionTest.java |    2 +
 ...BeanWithXPathInjectionUsingHeaderValueTest.java |    2 +
 .../BeanWithXPathInjectionUsingResultTypeTest.java |    2 +
 .../BodyAnnotationToDisambiguateMethodsTest.java   |    2 +
 .../ClassComponentInvalidConfigurationTest.java    |    3 +
 .../camel/component/bean/ClassComponentTest.java   |    2 +
 ...entWithPropertiesLookupSetFromEndpointTest.java |    2 +
 ...ComponentWithPropertiesSetFromEndpointTest.java |    2 +
 .../bean/CustomParameterMappingStrategyTest.java   |    2 +
 .../bean/DefaultParameterMappingStrategyTest.java  |    7 +
 ...ressionAnnotationToDisambiguateMethodsTest.java |    3 +
 .../bean/FileBeanParameterBindingTest.java         |    7 +-
 .../bean/MethodCallBeanRefMethodNotFoundTest.java  |    2 +
 .../bean/MethodCallBeanRefNotFoundTest.java        |    2 +
 .../bean/MethodCallMissingParenthesisTest.java     |    4 +
 .../bean/MethodCallRefOrBeanPrefixTest.java        |    2 +
 .../component/bean/MethodCallStaticMethodTest.java |    2 +
 .../MethodNotFoundExceptionSimplifiedTest.java     |    2 +
 .../component/bean/MyAuditServiceProxyTest.java    |    2 +
 .../camel/component/bean/MyCurrencyBeanTest.java   |    3 +
 .../camel/component/bean/MyServiceProxyTest.java   |    7 +
 .../camel/component/bean/NewInstanceTest.java      |    2 +
 .../camel/component/bean/PredicateAsBeanTest.java  |    2 +
 .../bean/ProxyReturnFutureExceptionTest.java       |    2 +
 .../component/bean/ProxyReturnFutureListTest.java  |    3 +
 .../component/bean/ProxyReturnFutureTest.java      |    3 +
 .../component/bean/RouteMethodCallStaticTest.java  |    2 +
 .../SimpleLanguageBeanBodyParenthesisTest.java     |    3 +
 ...nguageBeanFunctionMethodValueWithCommaTest.java |    5 +
 ...BeanFunctionMethodValueWithParenthesisTest.java |    5 +
 .../bean/issues/BeanAbstractMethodIssueTest.java   |    2 +
 .../issues/BeanInfoSingleMethodServiceTest.java    |    4 +
 .../BeanParameterBestTypeMatchIssueTest.java       |    6 +
 .../bean/issues/BeanRouteToDerivedClassTest.java   |    4 +
 .../issues/BeanVsProcessorPerformanceTest.java     |    3 +
 ...efaultMethodCalledFromSimpleExpressionTest.java |    2 +
 .../issues/FilterBeanLanguageNonRegistryTest.java  |    2 +
 .../bean/issues/FilterBeanNonRegistryTest.java     |    3 +
 .../bean/issues/FilterBeanRegistryTest.java        |    3 +
 .../component/bean/issues/FilterPojoIssueTest.java |    3 +
 .../bean/issues/TransformerIssueTest.java          |    2 +
 .../camel/component/browse/BrowseEndpointTest.java |    3 +
 .../camel/component/browse/BrowseRouteTest.java    |    2 +
 .../apache/camel/component/browse/BrowseTest.java  |    2 +
 .../ControlBusLanguageSimpleStartRouteTest.java    |    3 +
 .../controlbus/ControlBusRestartRouteTest.java     |    2 +
 .../controlbus/ControlBusStartRouteAsyncTest.java  |    2 +
 .../controlbus/ControlBusStartRouteTest.java       |    6 +
 .../component/controlbus/ControlBusStatsTest.java  |    4 +
 .../DataFormatEndpointSerializationTest.java       |    2 +
 .../dataformat/DataFormatEndpointStringTest.java   |    2 +
 .../camel/component/dataset/BigDataSetTest.java    |    3 +
 .../camel/component/dataset/CustomDataSetTest.java |    2 +
 .../component/dataset/DataSetEndpointTest.java     |    6 +
 .../component/dataset/DataSetPreloadTest.java      |    2 +
 .../camel/component/dataset/DataSetSedaTest.java   |    2 +
 .../camel/component/dataset/DataSetTest.java       |    2 +
 .../component/dataset/FileDataSetConsumerTest.java |    6 +-
 .../dataset/FileDataSetConsumerWithSplitTest.java  |    6 +-
 .../component/dataset/FileDataSetProducerTest.java |    6 +-
 .../dataset/FileDataSetProducerWithSplitTest.java  |    6 +-
 .../component/dataset/ListDataSetConsumerTest.java |    7 +-
 .../component/dataset/ListDataSetProducerTest.java |    7 +-
 .../direct/DirectEndpointRouteInlinedTest.java     |    3 +
 .../camel/component/direct/DirectEndpointTest.java |    3 +
 .../component/direct/DirectNoConsumerTest.java     |    1 +
 .../direct/DirectNoMultipleConsumersTest.java      |    2 +
 .../camel/component/direct/DirectNoToTypeTest.java |    2 +
 .../direct/DirectProducerBlockingTest.java         |    4 +
 .../camel/component/direct/DirectQueueTest.java    |    2 +
 .../camel/component/direct/DirectRouteTest.java    |    7 +-
 .../direct/DirectShouldUseSameThreadTest.java      |    2 +
 .../SendToNonExistingDirectEndpointTest.java       |    2 +
 ...SendingToAlotOfDifferentDirectEndpointTest.java |    2 +
 .../direct/TwoCamelContextDirectEndpointTest.java  |   21 +-
 .../directvm/AbstractDirectVmTestSupport.java      |    4 +-
 .../directvm/DirectVmConsumerExpressionTest.java   |    6 +-
 .../directvm/DirectVmHeaderFilterStrategyTest.java |    2 +
 ...DirectVmNoPropertyPropagationComponentTest.java |    2 +
 .../DirectVmNoPropertyPropagationTest.java         |    2 +
 .../directvm/DirectVmProducerBlockingTest.java     |    4 +
 .../directvm/DirectVmShouldUseSameThreadTest.java  |    2 +
 .../DirectVmTwoCamelContextAdviceWithTest.java     |    2 +
 ...rectVmTwoCamelContextDuplicateConsumerTest.java |    2 +
 .../directvm/DirectVmTwoCamelContextTest.java      |    2 +
 .../extension/verifier/ComponentVerifierTest.java  |    9 +-
 .../file/AntPathMatcherGenericFileFilterTest.java  |   14 +-
 .../camel/component/file/BeanToFileTest.java       |    2 +
 .../file/ConsumerTemplateFileShutdownTest.java     |    2 +
 .../component/file/DirectoryCreateIssueTest.java   |    7 +-
 .../file/FileAbsoluteAndRelativeConsumerTest.java  |    8 +-
 .../component/file/FileAbsolutePathIssueTest.java  |    7 +-
 .../file/FileBatchConsumerMemoryLeakTest.java      |    8 +-
 .../file/FileBeginFailureOneTimeTest.java          |    7 +-
 .../component/file/FileBrowsableEndpointTest.java  |   10 +-
 .../FileConcurrentWriteAppendSameFileTest.java     |    7 +-
 .../camel/component/file/FileConfigureTest.java    |   10 +-
 .../FileConsumeAlterFileNameHeaderIssueTest.java   |   10 +-
 .../file/FileConsumeBackoffMultiplierTest.java     |    7 +-
 .../component/file/FileConsumeCharsetTest.java     |    7 +-
 .../file/FileConsumeDoneFileIssueTest.java         |    9 +-
 .../file/FileConsumeFilesAndDeleteTest.java        |    7 +-
 .../file/FileConsumeMaxMessagesPerPollTest.java    |    7 +-
 .../file/FileConsumeMoveRelativeNameTest.java      |    7 +-
 .../file/FileConsumeMultipleDirectoriesTest.java   |    7 +-
 .../FileConsumeNoopIdempotentDisabledTest.java     |    7 +-
 .../file/FileConsumeNoopIdempotentEnabledTest.java |    7 +-
 .../FileConsumeNotEagerMaxMessagesPerPollTest.java |    7 +-
 .../file/FileConsumePollEnrichFileTest.java        |    7 +-
 ...ileConsumePollEnrichFileUsingProcessorTest.java |    7 +-
 .../file/FileConsumeRootDirManualTest.java         |    2 +
 .../file/FileConsumeRunLoggingLevelTest.java       |    7 +-
 ...ileConsumeSimpleAbsoluteMoveToAbsoluteTest.java |    7 +-
 ...ileConsumeSimpleAbsoluteMoveToRelativeTest.java |    7 +-
 ...ileConsumeSimpleRelativeMoveToAbsoluteTest.java |    7 +-
 ...ileConsumeSimpleRelativeMoveToRelativeTest.java |    7 +-
 .../file/FileConsumeSingleDirectoryOnlyTest.java   |    7 +-
 .../component/file/FileConsumeTemplateTest.java    |    7 +-
 .../file/FileConsumeWithDollarInPathTest.java      |    7 +-
 .../FileConsumerAbsolutePathDefaultMoveTest.java   |    7 +-
 .../file/FileConsumerAbsolutePathTest.java         |    7 +-
 ...leConsumerAbsolutePathWithAbsoluteMoveTest.java |    7 +-
 ...leConsumerAbsolutePathWithRelativeMoveTest.java |    7 +-
 ...ileConsumerAbsoluteRootPathDefaultMoveTest.java |    2 +
 .../file/FileConsumerAutoCreateDirectoryTest.java  |    6 +
 .../component/file/FileConsumerBatchTest.java      |    7 +-
 ...BeginAndCommitExpressionRenameStrategyTest.java |    8 +-
 ...leConsumerBeginAndCommitRenameStrategyTest.java |    8 +-
 ...eConsumerBeginExpressionRenameStrategyTest.java |    8 +-
 .../file/FileConsumerBeginRenameStrategyTest.java  |    8 +-
 ...ileConsumerBridgeRouteExceptionHandlerTest.java |    2 +
 ...nsumerCommitRenameAbsolutePathStrategyTest.java |    7 +-
 .../file/FileConsumerCommitRenameStrategyTest.java |    8 +-
 .../file/FileConsumerConsumedFileNameTest.java     |    7 +-
 .../FileConsumerCustomExceptionHandlerTest.java    |    2 +
 .../file/FileConsumerCustomSchedulerTest.java      |    7 +-
 .../file/FileConsumerDeleteAndFailureTest.java     |    7 +-
 .../file/FileConsumerDirectoryFilterTest.java      |    7 +-
 .../file/FileConsumerDirectoryNotMatchedTest.java  |    7 +-
 .../file/FileConsumerExcludeNameTest.java          |    2 +
 .../file/FileConsumerExtendedAttributesTest.java   |    5 +-
 .../file/FileConsumerFailureHandledTest.java       |   10 +-
 .../file/FileConsumerFileExpressionTest.java       |    8 +-
 ...leConsumerFileExpressionThrowExceptionTest.java |    7 +-
 .../component/file/FileConsumerFileFilterTest.java |    8 +-
 .../file/FileConsumerFilterDirectoryTest.java      |    8 +-
 .../component/file/FileConsumerFilterFileTest.java |    9 +-
 ...FileConsumerIdempotentKeyChangedIssue2Test.java |    2 +
 .../FileConsumerIdempotentKeyChangedIssueTest.java |    2 +
 .../FileConsumerIdempotentKeyNameAndSizeTest.java  |    2 +
 ...leConsumerIdempotentOnExceptionHandledTest.java |    7 +-
 .../file/FileConsumerIdempotentRefTest.java        |    7 +-
 .../component/file/FileConsumerIdempotentTest.java |    7 +-
 .../file/FileConsumerIdleMessageTest.java          |    2 +
 .../FileConsumerIncludeAndExcludeNameTest.java     |    7 +-
 .../file/FileConsumerIncludeNameTest.java          |    7 +-
 .../file/FileConsumerInterceptEmptyFileTest.java   |    7 +-
 .../file/FileConsumerMoveAndMoveFailureTest.java   |    7 +-
 .../file/FileConsumerMoveExpressionTest.java       |   11 +-
 .../FileConsumerMoveFailureOnCompletionTest.java   |    8 +-
 .../file/FileConsumerMoveFailureTest.java          |    7 +-
 .../camel/component/file/FileConsumerNoopTest.java |    7 +-
 .../file/FileConsumerPathWithAmpersandTest.java    |    7 +-
 .../file/FileConsumerPollStrategyNotBeginTest.java |    7 +-
 ...FileConsumerPollStrategyPolledMessagesTest.java |    7 +-
 ...umerPollStrategyRollbackThrowExceptionTest.java |    7 +-
 ...FileConsumerPollStrategyStopOnRollbackTest.java |    7 +-
 .../file/FileConsumerPollStrategyTest.java         |    7 +-
 .../file/FileConsumerPreMoveDeleteTest.java        |    8 +-
 .../file/FileConsumerPreMoveIssueTest.java         |    7 +-
 .../file/FileConsumerPreMoveLastModifiedTest.java  |    7 +-
 .../file/FileConsumerPreMoveNoopTest.java          |    8 +-
 .../component/file/FileConsumerPreMoveTest.java    |    8 +-
 ...ileConsumerPreMoveWithProbeContentTypeTest.java |    7 +-
 .../file/FileConsumerProducerRouteTest.java        |    7 +-
 .../file/FileConsumerRelativeFileNameTest.java     |    7 +-
 .../file/FileConsumerRestartNotLeakThreadTest.java |    7 +-
 .../FileConsumerSharedThreadPollStopRouteTest.java |    2 +
 .../file/FileConsumerSharedThreadPollTest.java     |    7 +-
 .../file/FileConsumerSkipDotFilesTest.java         |    8 +-
 .../file/FileConsumerSpringSchedulerTest.java      |    2 +
 .../file/FileConsumerSuspendAndResumeTest.java     |    7 +-
 .../component/file/FileConsumerSuspendTest.java    |    7 +-
 .../component/file/FileConsumerTemplateTest.java   |    7 +-
 .../FileConsumerThreadsInProgressIssueTest.java    |    2 +
 .../component/file/FileContentBasedRouterTest.java |    9 +-
 .../component/file/FileConvertBodyToUTF8Test.java  |    7 +-
 .../file/FileEagerDeleteTargetFileTest.java        |    9 +-
 .../file/FileExclusiveReadManuelTest.java          |    7 +-
 .../file/FileExclusiveReadNoneStrategyTest.java    |    7 +-
 .../file/FileHeaderFileNameProducedTest.java       |    2 +
 .../file/FileIdempotentReadSameFileAgainTest.java  |    7 +-
 .../file/FileInvalidStartingPathTest.java          |    3 +
 .../component/file/FileKeepLastModifiedTest.java   |    9 +-
 .../camel/component/file/FileLanguageCBRTest.java  |    9 +-
 .../camel/component/file/FileMEPInOutTest.java     |    2 +
 .../file/FileMarkerFileDeleteOldLockFilesTest.java |    7 +-
 ...eMarkerFileRecursiveDeleteOldLockFilesTest.java |    7 +-
 ...erFileRecursiveDoNotDeleteOldLockFilesTest.java |    7 +-
 ...cursiveFilterDeleteOldLockFilesIncludeTest.java |    7 +-
 ...rFileRecursiveFilterDeleteOldLockFilesTest.java |    7 +-
 .../file/FileMoveAndMoveFailedIssueTest.java       |    8 +-
 .../FileMoveErrorOnExceptionNotHandledTest.java    |    7 +-
 .../component/file/FileMulticastDeleteTest.java    |    7 +-
 .../camel/component/file/FileNoOpLockFileTest.java |    8 +-
 .../component/file/FilePollEnrichNoWaitTest.java   |    7 +-
 .../camel/component/file/FilePollEnrichTest.java   |    7 +-
 .../component/file/FilePollingConsumerTest.java    |    7 +-
 .../component/file/FileProduceAppendTest.java      |    7 +-
 .../file/FileProduceGeneratedFileNameTest.java     |    2 +
 .../file/FileProduceOverruleExpressionTest.java    |    8 +-
 .../file/FileProduceOverruleOnlyOnceTest.java      |    7 +-
 .../component/file/FileProduceOverruleTest.java    |    9 +-
 .../file/FileProduceTempFileNameTest.java          |   10 +-
 .../component/file/FileProduceTempPrefixTest.java  |   11 +-
 ...ProducerAllowNullBodyFileAlreadyExistsTest.java |    8 +-
 .../file/FileProducerAllowNullBodyTest.java        |    8 +-
 .../file/FileProducerCharsetUTFOptimizedTest.java  |    7 +-
 .../FileProducerCharsetUTFtoISOConfiguredTest.java |    7 +-
 ...leProducerCharsetUTFtoISOConvertBodyToTest.java |    7 +-
 .../file/FileProducerCharsetUTFtoISOTest.java      |    7 +-
 .../file/FileProducerCharsetUTFtoUTFTest.java      |    7 +-
 .../file/FileProducerChmodOptionTest.java          |   10 +-
 .../file/FileProducerDirectoryChmodOptionTest.java |    9 +-
 .../component/file/FileProducerExpressionTest.java |   13 +-
 .../file/FileProducerFileBodyGetsMoved.java        |    2 +-
 ...ileProducerFileExistAppendNoFileBeforeTest.java |    7 +-
 .../file/FileProducerFileExistAppendTest.java      |    7 +-
 .../file/FileProducerFileExistFailTest.java        |    7 +-
 .../file/FileProducerFileExistIgnoreTest.java      |    7 +-
 ...eProducerFileExistOverrideNoFileBeforeTest.java |    7 +-
 .../file/FileProducerFileExistOverrideTest.java    |    7 +-
 .../file/FileProducerFileExistTryRenameTest.java   |    7 +-
 .../file/FileProducerFilenameConstantTest.java     |    7 +-
 .../file/FileProducerMoveExistingTest.java         |   12 +-
 .../file/FileProducerNoForcedWritesTest.java       |    7 +-
 .../file/FileProducerRenameUsingCopyTest.java      |    7 +-
 .../file/FileProducerTempFileExistsIssueTest.java  |   12 +-
 .../component/file/FileRecursiveDepthTest.java     |    9 +-
 .../component/file/FileRecursiveNoopTest.java      |    7 +-
 .../file/FileRenameFileOnCommitIssueTest.java      |    7 +-
 .../FileRenameReadLockMustUseMarkerFileTest.java   |    7 +-
 .../file/FileRouteOnDosWithNoVolTest.java          |    3 +-
 .../component/file/FileSortByExpressionTest.java   |    8 +-
 .../file/FileSortByIgnoreCaseExpressionTest.java   |    9 +-
 .../file/FileSortByNestedExpressionTest.java       |    8 +-
 .../camel/component/file/FileSorterRefTest.java    |    7 +-
 .../camel/component/file/FileSplitInSplitTest.java |    7 +-
 .../component/file/FileToFileNioLowBufferTest.java |    7 +-
 .../component/file/FileToFileWithFlattenTest.java  |   12 +-
 .../camel/component/file/FileURLDecodingTest.java  |   20 +-
 .../file/FilerConsumerDoneFileNameDeleteTest.java  |    7 +-
 .../file/FilerConsumerDoneFileNamePrefixTest.java  |    7 +-
 .../FilerConsumerDoneFileNameSimplePrefixTest.java |    7 +-
 .../file/FilerConsumerDoneFileNameSuffixTest.java  |    7 +-
 .../file/FilerConsumerDoneFileNameTest.java        |    7 +-
 .../file/FilerConsumerDoneFileNoopTest.java        |    7 +-
 .../file/FilerConsumerDualDoneFileNameTest.java    |    8 +-
 .../FilerConsumerMoveFailedDoneFileNameTest.java   |    7 +-
 .../file/FilerConsumerPreMoveDoneFileNameTest.java |    7 +-
 .../file/FilerConsumerRetryDoneFileNameTest.java   |    7 +-
 .../FilerConsumerShouldSkipDoneFilePrefixTest.java |    7 +-
 .../FilerConsumerShouldSkipDoneFileSuffixTest.java |    7 +-
 .../file/FilerConsumerShouldSkipDoneFileTest.java  |    7 +-
 .../component/file/FilerProducerAbsoluteTest.java  |    7 +-
 .../file/FilerProducerDoneFileNameRouteTest.java   |    7 +-
 .../file/FilerProducerDoneFileNameTest.java        |   13 +-
 .../component/file/FilerProducerFileNamesTest.java |    8 +-
 .../FromFileDoNotDeleteFileIfProcessFailsTest.java |    7 +-
 .../FromFileDoNotMoveFileIfProcessFailsTest.java   |    7 +-
 .../file/FromFileMoveDoneCustomHeaderTest.java     |    7 +-
 .../file/FromFileMoveFileIfProcessFailsTest.java   |    7 +-
 .../file/FromFileMulticastToFilesTest.java         |    8 +-
 .../file/FromFilePollThirdTimeOkTest.java          |    7 +-
 .../component/file/GenericFileConverterTest.java   |   12 +-
 .../component/file/GenericFileMessageTest.java     |    3 +
 ...kerFileExclusiveReadLockStrategyUnlockTest.java |    7 +-
 .../camel/component/file/NewFileConsumeTest.java   |    7 +-
 .../camel/component/file/NewFileConsumerTest.java  |    7 +-
 .../camel/component/file/NewFileProduceTest.java   |    8 +-
 .../camel/component/file/ToFileRouteTest.java      |    2 +
 .../camel/component/file/XPathToFileTest.java      |    7 +-
 .../FileChangedReadLockMinAgeShortCircuitTest.java |    7 +-
 .../strategy/FileChangedReadLockMinAgeTest.java    |    7 +-
 .../file/strategy/FileChangedReadLockTest.java     |    7 +-
 .../FileChangedZeroLengthReadLockTest.java         |    7 +-
 .../FileIdempotentReadLockDelayedAsyncTest.java    |    7 +-
 .../FileIdempotentReadLockDelayedTest.java         |    7 +-
 .../file/strategy/FileIdempotentReadLockTest.java  |    7 +-
 .../GenericFileDeleteProcessStrategyTest.java      |    3 +
 .../MarkerFileExclusiveReadLockStrategyTest.java   |    7 +-
 .../file/stress/FileAsyncStressFileDropper.java    |    2 +-
 .../component/file/stress/FileAsyncStressTest.java |    7 +-
 .../file/stress/FileConsumerPollManyFilesTest.java |    7 +-
 .../FileProducerAppendManyMessagesFastTest.java    |    7 +-
 .../stress/FileProducerAppendManyMessagesTest.java |    7 +-
 .../language/LanguageCacheScriptTest.java          |    2 +
 .../language/LanguageEndpointScriptRouteTest.java  |    2 +
 .../language/LanguageHeaderRouteTest.java          |    2 +
 .../LanguageLoadScriptFromClasspathHeaderTest.java |    2 +
 .../LanguageLoadScriptFromClasspathTest.java       |    2 +
 .../LanguageLoadScriptFromFileCachedTest.java      |    8 +-
 .../LanguageLoadScriptFromFileUpdateTest.java      |    7 +-
 .../language/LanguageNoCacheScriptTest.java        |    2 +
 ...guageResourceLoadConstantFromClasspathTest.java |    2 +
 .../language/LanguageRouteConvertBodyTest.java     |    2 +
 .../language/LanguageRouteNoTransformTest.java     |    2 +
 .../component/language/LanguageRouteTest.java      |    2 +
 ...guageScriptInHeaderRouteTakePrecedenceTest.java |    3 +
 .../language/LanguageScriptInHeaderRouteTest.java  |    2 +
 .../language/LanguageScriptRouteTest.java          |    2 +
 .../component/language/LanguageXPathRouteTest.java |    2 +
 .../log/DefaultExchangeFormatterTest.java          |   16 +
 .../component/log/LogBodyWithNewLineTest.java      |    6 +-
 .../camel/component/log/LogCustomLoggerTest.java   |    1 -
 .../component/log/LogEndpointOptionsTest.java      |    2 +
 .../camel/component/log/LogEndpointTest.java       |    3 +
 .../camel/component/log/LogInputStreamTest.java    |    5 +
 .../apache/camel/component/log/LogRouteTest.java   |    5 +
 .../camel/component/log/ThroughputLoggerTest.java  |    3 +
 .../camel/component/mock/MockAsBeanTest.java       |    8 +-
 .../component/mock/MockAssertionClauseTest.java    |    3 +
 .../camel/component/mock/MockEndpointTest.java     |   78 ++
 .../component/mock/MockEndpointTimeClauseTest.java |   12 +
 .../mock/MockEndpointWithParametersTest.java       |    2 +
 .../mock/MockExpectedBodiesAsListTest.java         |    4 +
 .../component/mock/MockPredicateEqualityTest.java  |    5 +
 .../camel/component/mock/MockPredicateTest.java    |    4 +
 .../component/mock/MockStreamCachingTest.java      |    3 +
 .../camel/component/mock/MockThroughtputTest.java  |    2 +
 .../apache/camel/component/mock/MockXpathTest.java |    2 +
 .../apache/camel/component/pojo/PojoRouteTest.java |    6 +-
 .../ComponentResolvePropertyPlaceholdersTest.java  |    2 +
 .../OptionalPropertiesDslInvalidSyntaxTest.java    |    3 +
 .../properties/OptionalPropertiesDslTest.java      |    2 +
 ...onentAdviceWithInterceptSendToEndpointTest.java |    2 +
 ...opertiesComponentConcatenatePropertiesTest.java |   12 +-
 .../PropertiesComponentDefaultFunctionsTest.java   |    3 +
 .../properties/PropertiesComponentDefaultTest.java |    8 +
 .../PropertiesComponentDisableDefaultsTest.java    |    2 +
 ...pertiesComponentEIPChoiceConvertBodyToTest.java |    3 +
 .../PropertiesComponentEIPChoiceSimpleTest.java    |    2 +
 .../PropertiesComponentEIPConvertBodyToTest.java   |    2 +
 .../PropertiesComponentEIPRoutingSlipTest.java     |    2 +
 .../PropertiesComponentEncodingTest.java           |    2 +
 .../PropertiesComponentEndpointTest.java           |    4 +
 .../PropertiesComponentFunctionTest.java           |    2 +
 .../PropertiesComponentGetOrElseTest.java          |    5 +
 .../PropertiesComponentInitialPropertiesTest.java  |    2 +
 .../PropertiesComponentInterceptFromTest.java      |    2 +
 ...ertiesComponentInterceptSendToEndpointTest.java |    2 +
 ...ponentLoadPropertiesFromFileTrimValuesTest.java |    7 +-
 ...ertiesComponentLocationWithJvmPropertyTest.java |    7 +-
 ...iesComponentLocationWithTwoJvmPropertyTest.java |    5 +-
 .../PropertiesComponentNestPropertiesTest.java     |   11 +-
 ...ertiesComponentOnExceptionDelayPatternTest.java |    2 +
 .../PropertiesComponentOnExceptionTest.java        |    2 +
 ...ropertiesComponentOnlyUseDefaultValuesTest.java |    4 +
 .../PropertiesComponentOverridePropertiesTest.java |    2 +
 .../properties/PropertiesComponentRefTest.java     |    3 +
 .../PropertiesComponentRegistryTest.java           |    4 +
 .../properties/PropertiesComponentRestartTest.java |    2 +
 .../PropertiesComponentServiceHostPortTest.java    |    3 +
 .../PropertiesComponentServiceHostTest.java        |    3 +
 .../PropertiesComponentServicePortTest.java        |    3 +
 .../properties/PropertiesComponentServiceTest.java |    3 +
 .../PropertiesComponentSetHeaderSimpleTest.java    |    2 +
 .../PropertiesComponentSimpleLanguageTest.java     |    7 +
 ...rtiesComponentSomethingElseBoundToJndiTest.java |    2 +
 .../properties/PropertiesComponentTest.java        |   30 +
 .../PropertiesEnvironmentVariableOverrideTest.java |    2 +
 .../properties/PropertiesResolverTest.java         |    2 +
 .../properties/PropertiesRouteFromTest.java        |    2 +
 .../properties/PropertiesRouteIdTest.java          |    2 +
 .../camel/component/ref/RefComponentTest.java      |    2 +
 .../camel/component/ref/RefFileEndpointTest.java   |    7 +-
 .../apache/camel/component/ref/RefInvalidTest.java |    3 +
 .../camel/component/rest/FromRestApiTest.java      |    2 +
 .../component/rest/FromRestConfigurationTest.java  |    2 +
 .../component/rest/FromRestDefaultValueTest.java   |    3 +
 .../component/rest/FromRestDuplicateTest.java      |    3 +
 .../component/rest/FromRestGetContentTypeTest.java |    2 +
 .../rest/FromRestGetCorsAllowCredentialsTest.java  |    3 +
 .../component/rest/FromRestGetCorsCustomTest.java  |    2 +
 .../camel/component/rest/FromRestGetCorsTest.java  |    2 +
 .../rest/FromRestGetEmbeddedRouteTest.java         |    2 +
 .../component/rest/FromRestGetEndPathTest.java     |    2 +
 .../rest/FromRestGetHttpErrorCodeTest.java         |    2 +
 .../component/rest/FromRestGetInterceptTest.java   |    2 +
 .../component/rest/FromRestGetOnExceptionTest.java |    2 +
 .../component/rest/FromRestGetPolicyTest.java      |    2 +
 .../camel/component/rest/FromRestGetTest.java      |    2 +
 .../rest/FromRestIdAndDescriptionTest.java         |    2 +
 .../camel/component/rest/FromRestOptionsTest.java  |    2 +
 .../component/rest/FromRestUriPrefixTest.java      |    2 +
 .../rest/RestComponentVerifierExtensionTest.java   |    3 +
 .../component/rest/RestComponentVerifierTest.java  |    3 +
 .../rest/RestProducerBindingProcessorTest.java     |    2 +-
 .../camel/component/saga/SagaComponentTest.java    |    6 +
 .../scheduler/SchedulerNoPolledMessagesTest.java   |    2 +
 .../component/scheduler/SchedulerRouteTest.java    |    3 +
 .../TwoSchedulerConcurrentTasksOneRouteTest.java   |    2 +
 .../scheduler/TwoSchedulerConcurrentTasksTest.java |    2 +
 .../component/scheduler/TwoSchedulerTest.java      |    2 +
 .../component/seda/CollectionProducerTest.java     |    2 +
 .../seda/DirectRequestReplyAndSedaInOnlyTest.java  |    2 +
 .../seda/FileSedaShutdownCompleteAllTasksTest.java |    7 +-
 ...meSedaQueueMultipleConsumersDifferenceTest.java |    4 +
 .../seda/SameSedaQueueSizeAndNoSizeTest.java       |    4 +
 .../component/seda/SedaAsyncProducerTest.java      |    3 +
 .../camel/component/seda/SedaAsyncRouteTest.java   |    2 +
 .../SedaBlockWhenFullInvalidConfigurationTest.java |    2 +
 .../component/seda/SedaBlockWhenFullTest.java      |    5 +
 .../camel/component/seda/SedaComplexInOutTest.java |    2 +
 .../seda/SedaComponentReferenceEndpointTest.java   |    2 +
 .../seda/SedaConcurrentConsumersNPEIssueTest.java  |    3 +
 .../seda/SedaConcurrentConsumersTest.java          |    2 +
 .../camel/component/seda/SedaConcurrentTest.java   |    5 +
 .../camel/component/seda/SedaConfigureTest.java    |    5 +
 .../seda/SedaConsumerSuspendResumeTest.java        |    2 +
 .../seda/SedaDefaultBlockWhenFullTest.java         |    5 +
 .../seda/SedaDefaultUnboundedQueueSizeTest.java    |    3 +
 .../seda/SedaDiscardIfNoConsumerTest.java          |    3 +
 .../camel/component/seda/SedaEndpointTest.java     |    7 +
 .../camel/component/seda/SedaFromRouteIdTest.java  |    2 +
 .../component/seda/SedaInOnlyChainedTest.java      |    2 +
 .../camel/component/seda/SedaInOnlyTest.java       |    2 +
 .../component/seda/SedaInOutBigChainedTest.java    |    2 +
 .../camel/component/seda/SedaInOutChainedTest.java |    2 +
 .../seda/SedaInOutChainedTimeoutTest.java          |    2 +
 .../seda/SedaInOutChainedWithOnCompletionTest.java |    2 +
 .../apache/camel/component/seda/SedaInOutTest.java |    2 +
 .../SedaInOutWithErrorDeadLetterChannelTest.java   |    2 +
 .../component/seda/SedaInOutWithErrorTest.java     |    2 +
 .../component/seda/SedaMultipleConsumersTest.java  |    3 +
 .../component/seda/SedaPurgeWhenStoppingTest.java  |    2 +
 .../camel/component/seda/SedaQueueFactoryTest.java |    4 +
 .../apache/camel/component/seda/SedaQueueTest.java |    3 +
 .../seda/SedaRemoveRouteThenAddAgainTest.java      |    2 +
 .../apache/camel/component/seda/SedaRouteTest.java |   12 +-
 .../seda/SedaShouldNotUseSameThreadTest.java       |    2 +
 .../camel/component/seda/SedaSimpleSizeTest.java   |    2 +
 .../seda/SedaSuspendConsumerStopRouteTest.java     |    2 +
 .../component/seda/SedaTimeoutDisabledTest.java    |    2 +
 .../camel/component/seda/SedaTimeoutTest.java      |    4 +
 .../camel/component/seda/SedaUnitOfWorkTest.java   |    3 +
 .../seda/SedaWaitForTaskAsPropertyTest.java        |    3 +
 .../SedaWaitForTaskCompleteOnCompletionTest.java   |    2 +
 .../seda/SedaWaitForTaskCompleteTest.java          |    3 +
 .../seda/SedaWaitForTaskIfReplyExpectedTest.java   |    3 +
 .../seda/SedaWaitForTaskNewerOnCompletionTest.java |    2 +
 .../component/seda/SedaWaitForTaskNewerTest.java   |    3 +
 .../camel/component/seda/TracingWithDelayTest.java |    2 +
 .../camel/component/stub/StubConsumerTest.java     |   70 ++
 .../camel/component/stub/StubInOnlyTest.java       |    3 +-
 .../apache/camel/component/stub/StubInOutTest.java |   53 +
 .../org/apache/camel/component/stub/StubTest.java  |   63 ++
 .../camel/component/test/TestAnyOrderTest.java     |    2 +
 .../camel/component/test/TestEndpointTest.java     |    2 +
 .../camel/component/test/TestFileSplitTest.java    |    7 +-
 .../apache/camel/component/test/TestFileTest.java  |    7 +-
 .../apache/camel/component/test/TestSedaTest.java  |    2 +
 .../camel/component/timer/TimerAsyncTest.java      |    4 +
 .../camel/component/timer/TimerDelayTest.java      |    2 +
 .../camel/component/timer/TimerEndpointTest.java   |    4 +
 .../camel/component/timer/TimerFiredTimeTest.java  |    2 +
 .../component/timer/TimerGracefulShutdownTest.java |    7 +-
 .../timer/TimerMultipleConsumerStopRouteTest.java  |    2 +
 .../component/timer/TimerMultipleConsumerTest.java |    2 +
 .../camel/component/timer/TimerNameTest.java       |    2 +
 .../component/timer/TimerNegativeDelayTest.java    |    2 +
 .../timer/TimerNegativeNoRepeatCountDelayTest.java |    2 +
 .../timer/TimerReferenceConfigurationTest.java     |    3 +
 .../component/timer/TimerRepeatCountTest.java      |    2 +
 .../camel/component/timer/TimerRestartTest.java    |    2 +
 .../camel/component/timer/TimerRouteTest.java      |    3 +
 .../timer/TimerSuspendCamelContextTest.java        |    2 +
 .../component/timer/TimerWithTimeOptionTest.java   |    9 +
 .../validator/CustomSchemaFactoryFeatureTest.java  |    2 +
 .../validator/FileValidatorRouteTest.java          |    8 +-
 .../component/validator/ValidatorBeanCallTest.java |    7 +-
 .../validator/ValidatorDtdAccessAbstractTest.java  |    5 +-
 .../validator/ValidatorDtdAccessOffTest.java       |    4 +
 .../validator/ValidatorDtdAccessOnTest.java        |    4 +
 .../validator/ValidatorIllegalImportTest.java      |    3 +
 .../ValidatorIncludeEncodingRouteTest.java         |    7 +-
 .../ValidatorIncludeRelativeRouteTest.java         |    2 +
 .../validator/ValidatorIncludeRouteTest.java       |   12 +-
 .../ValidatorResourceResolverFactoryTest.java      |    3 +
 .../component/validator/ValidatorRootPathTest.java |    7 +-
 .../component/validator/ValidatorRouteTest.java    |   16 +-
 .../ValidatorWithResourceResolverRouteTest.java    |    8 +-
 .../camel/component/vm/AbstractVmTestSupport.java  |    4 +-
 .../component/vm/SameVmQueueSizeAndNoSizeTest.java |    4 +
 .../apache/camel/component/vm/VMSplitterTest.java  |    2 +
 .../vm/VmComponentReferenceEndpointTest.java       |    2 +
 .../component/vm/VmConcurrentConsumersTest.java    |    2 +
 .../component/vm/VmDiscardIfNoConsumerTest.java    |    2 +
 .../camel/component/vm/VmInOnlyChainedTest.java    |    2 +
 .../apache/camel/component/vm/VmInOnlyTest.java    |    2 +
 .../camel/component/vm/VmInOutChainedTest.java     |    2 +
 .../component/vm/VmInOutChainedTimeoutTest.java    |    2 +
 .../org/apache/camel/component/vm/VmInOutTest.java |    2 +
 .../camel/component/vm/VmInOutWithErrorTest.java   |    2 +
 .../component/vm/VmMultipleConsumersIssueTest.java |    2 +
 .../vm/VmMultipleConsumersKeepRouteTest.java       |    6 +-
 .../vm/VmMultipleConsumersMultipleContextTest.java |    4 +
 .../vm/VmMultipleConsumersRemoteRouteTest.java     |    6 +-
 .../vm/VmMultipleContextsStartStopTest.java        |    2 +
 .../org/apache/camel/component/vm/VmQueueTest.java |    2 +
 .../component/vm/VmShouldNotUseSameThreadTest.java |    2 +
 .../camel/component/vm/VmTimeoutIssueTest.java     |    3 +
 .../camel/component/vm/VmUseSameQueueTest.java     |    2 +
 .../component/vm/VmWaitForTaskCompleteTest.java    |    3 +
 .../vm/VmWaitForTaskIfReplyExpectedTest.java       |    3 +
 .../camel/component/vm/VmWaitForTaskNewerTest.java |    3 +
 .../camel/component/xslt/InvalidXsltFileTest.java  |    2 +
 .../component/xslt/ManagedXsltOutputBytesTest.java |    2 +
 .../camel/component/xslt/SAXSourceLogBodyTest.java |    3 +
 .../camel/component/xslt/XsltContentCacheTest.java |    9 +-
 .../xslt/XsltCustomErrorListenerTest.java          |    2 +
 .../xslt/XsltCustomizeEntityResolverTest.java      |    3 +
 .../xslt/XsltCustomizeURIResolverTest.java         |    3 +
 .../apache/camel/component/xslt/XsltDTDTest.java   |    3 +
 .../camel/component/xslt/XsltFeatureRouteTest.java |    2 +
 .../camel/component/xslt/XsltFileNotFoundTest.java |    3 +
 .../component/xslt/XsltFromFileExceptionTest.java  |    8 +-
 .../XsltFromHeaderOverrideEndpointUriTest.java     |    2 +
 .../XsltIncludeClasspathDotInDirectoryTest.java    |   11 +-
 .../component/xslt/XsltIncludeClasspathTest.java   |    2 +
 .../xslt/XsltIncludeRelativeFileSchemeTest.java    |    2 +
 .../xslt/XsltIncludeRelativeNestedTest.java        |    2 +
 .../xslt/XsltIncludeRelativeOtherTest.java         |    2 +
 .../component/xslt/XsltIncludeRelativeTest.java    |    2 +
 .../camel/component/xslt/XsltIncludeTest.java      |    2 +
 .../component/xslt/XsltMessageTerminateTest.java   |    2 +
 .../camel/component/xslt/XsltOutputBytesTest.java  |    2 +
 .../camel/component/xslt/XsltOutputDOMTest.java    |    2 +
 .../component/xslt/XsltOutputFileDeleteTest.java   |    2 +
 .../camel/component/xslt/XsltOutputFileTest.java   |    3 +
 .../camel/component/xslt/XsltOutputStringTest.java |    2 +
 .../component/xslt/XsltReferenceParameterTest.java |    6 +-
 .../apache/camel/component/xslt/XsltRouteTest.java |    4 +
 .../component/xslt/XsltRouteXsltWithErrorTest.java |    2 +
 .../apache/camel/component/xslt/XsltSaxonTest.java |    2 +
 .../xslt/XsltTransformingExceptionTest.java        |    3 +
 .../component/xslt/XsltUriResolverFactoryTest.java |    4 +
 .../apache/camel/converter/CamelConverterTest.java |    3 +
 .../camel/converter/CollectionConverterTest.java   |   14 +-
 .../org/apache/camel/converter/ConverterTest.java  |   28 +-
 .../camel/converter/DateTimeConverterTest.java     |    5 +-
 .../camel/converter/DurationConverterTest.java     |    6 +-
 .../apache/camel/converter/EnumConverterTest.java  |    5 +
 .../camel/converter/FallbackPromoteTest.java       |    2 +
 .../camel/converter/FutureConverterTest.java       |    8 +
 .../camel/converter/IOConverterCharsetTest.java    |   25 +-
 .../apache/camel/converter/IOConverterTest.java    |   24 +
 .../converter/InstanceFallbackConverterTest.java   |    5 +
 .../java/org/apache/camel/converter/JaxpTest.java  |   18 +-
 .../apache/camel/converter/NIOConverterTest.java   |   18 +-
 .../camel/converter/ObjectConverterNaNTest.java    |   15 +-
 .../camel/converter/ObjectConverterTest.java       |   35 +-
 .../converter/PrimitiveTypeConverterIssueTest.java |    2 +
 .../PropertyEditorTypeConverterIssueTest.java      |    2 +
 .../apache/camel/converter/SQLConverterTest.java   |    3 +
 .../converter/StaticFallbackConverterTest.java     |    5 +
 .../apache/camel/converter/StringSourceTest.java   |   15 +-
 .../camel/converter/TimePatternConverterTest.java  |   35 +-
 .../converter/TimePatternTypeConversionTest.java   |    5 +
 .../TimerDrivenTimePatternConverterTest.java       |    3 +
 .../camel/converter/TypeConverterAwareTest.java    |    2 +
 .../camel/converter/jaxp/BytesSourceTest.java      |    3 +
 .../camel/converter/jaxp/DomConverterTest.java     |    8 +
 .../camel/converter/jaxp/StAX2SAXSourceTest.java   |    4 +-
 .../camel/converter/jaxp/StaxConverterTest.java    |    5 +
 .../converter/jaxp/StreamSourceConverterTest.java  |    4 +
 .../camel/converter/jaxp/XmlConverterTest.java     |   57 +-
 .../StaticMethodWithExchangeTestConverter.java     |    4 +-
 .../stream/ByteArrayInputStreamCacheTest.java      |    2 +
 .../converter/stream/CachedOutputStreamTest.java   |   14 +-
 .../converter/stream/FileInputStreamCacheTest.java |    2 +
 .../converter/stream/InputStreamCacheTest.java     |    2 +
 .../camel/converter/stream/ReaderCacheTest.java    |    2 +
 .../camel/converter/stream/SourceCacheTest.java    |    2 +
 .../converter/stream/StreamCacheConverterTest.java |   13 +-
 .../converter/stream/StreamSourceCacheTest.java    |    3 +
 .../camel/impl/ActiveMQUuidGeneratorTest.java      |    8 +-
 .../camel/impl/BeanInjectRouteBuilderTest.java     |    2 +
 .../CamelContextAddRestDefinitionsFromXmlTest.java |    8 +-
 ...CamelContextAddRouteDefinitionsFromXmlTest.java |   13 +-
 .../CamelContextSharedProducerServicePoolTest.java |    3 +
 .../apache/camel/impl/CamelContextTrackerTest.java |    6 +-
 .../CamelCustomDefaultThreadPoolProfileTest.java   |    2 +
 ...melPostProcessorHelperConsumePredicateTest.java |    3 +
 ...amelPostProcessorHelperConsumePropertyTest.java |    6 +
 ...ostProcessorHelperSedaConsumePredicateTest.java |    3 +
 .../camel/impl/CamelPostProcessorHelperTest.java   |   24 +
 .../camel/impl/CamelProduceInterfaceTest.java      |    2 +
 .../apache/camel/impl/ConfigurationHelperTest.java |    2 +-
 .../camel/impl/ConsumerCacheZeroCapacityTest.java  |    2 +
 .../impl/CustomHeadersMapFactoryRouteTest.java     |    2 +
 .../org/apache/camel/impl/CustomIdFactoryTest.java |   10 +-
 .../camel/impl/CustomProducerServicePoolTest.java  |    3 +
 .../camel/impl/CustomThreadPoolFactoryTest.java    |    2 +
 .../camel/impl/CustomUnitOfWorkFactoryTest.java    |    2 +
 .../camel/impl/DataFormatContextAwareTest.java     |    2 +
 .../impl/DefaultCamelBeanPostProcessorTest.java    |    7 +-
 ...melContextAllowUseOriginalMessageFalseTest.java |    2 +
 ...amelContextAllowUseOriginalMessageTrueTest.java |    2 +
 .../impl/DefaultCamelContextAutoStartupTest.java   |    5 +
 .../DefaultCamelContextEndpointCacheLimitTest.java |    3 +
 .../impl/DefaultCamelContextEndpointCacheTest.java |    3 +
 ...aultCamelContextLazyLoadTypeConvertersTest.java |    4 +
 .../impl/DefaultCamelContextResolverTest.java      |    1 -
 .../camel/impl/DefaultCamelContextRestartTest.java |    2 +
 .../impl/DefaultCamelContextStopFailureTest.java   |    2 +
 ...lContextSuspendResumeRouteStartupOrderTest.java |    2 +
 .../DefaultCamelContextSuspendResumeRouteTest.java |    2 +
 .../apache/camel/impl/DefaultCamelContextTest.java |   25 +
 ...melContextWithLifecycleStrategyRestartTest.java |    3 +
 .../camel/impl/DefaultClassResolverTest.java       |   17 +-
 .../DefaultComponentReferencePropertiesTest.java   |    9 +
 .../apache/camel/impl/DefaultComponentTest.java    |   19 +
 .../impl/DefaultComponentValidateURITest.java      |    6 +
 .../camel/impl/DefaultConsumerCacheTest.java       |    2 +
 .../camel/impl/DefaultConsumerTemplateTest.java    |   35 +-
 ...ConsumerTemplateWithCustomCacheMaxSizeTest.java |    4 +
 .../camel/impl/DefaultEndpointRegistryTest.java    |   39 +
 .../org/apache/camel/impl/DefaultEndpointTest.java |    3 +
 .../camel/impl/DefaultExchangeHolderTest.java      |    9 +
 .../org/apache/camel/impl/DefaultExchangeTest.java |   15 +
 .../impl/DefaultExecutorServiceManagerTest.java    |   28 +
 .../impl/DefaultExecutorServiceStrategyTest.java   |   19 +
 .../impl/DefaultHeaderFilterStrategyTest.java      |    7 +
 .../camel/impl/DefaultHeadersMapFactoryTest.java   |    8 +-
 .../camel/impl/DefaultInflightRepositoryTest.java  |    2 +
 .../org/apache/camel/impl/DefaultInjectorTest.java |    6 +-
 .../camel/impl/DefaultMessageHeaderTest.java       |   20 +-
 .../camel/impl/DefaultProducerCacheTest.java       |    5 +
 .../impl/DefaultProducerTemplateAsyncTest.java     |   24 +
 ...efaultProducerTemplateNonBlockingAsyncTest.java |    7 +-
 .../camel/impl/DefaultProducerTemplateTest.java    |   16 +
 ...ProducerTemplateWithCustomCacheMaxSizeTest.java |    4 +
 .../apache/camel/impl/DefaultUnitOfWorkTest.java   |   13 +-
 .../camel/impl/DefaultUuidGeneratorTest.java       |    8 +-
 .../camel/impl/DurationRoutePolicyFactoryTest.java |    2 +
 .../impl/DurationRoutePolicyMaxMessagesTest.java   |    2 +
 .../impl/DurationRoutePolicyMaxSecondsTest.java    |    2 +
 .../apache/camel/impl/EmptyProducerCacheTest.java  |    3 +
 .../camel/impl/EndpointConfigurationTest.java      |    1 -
 ...outeEndpointsRemoteRouteSharedEndpointTest.java |    2 +
 ...tRegistryKeepRouteEndpointsRemoteRouteTest.java |    2 +
 .../EndpointRegistryKeepRouteEndpointsTest.java    |    2 +
 .../camel/impl/EndpointShutdownOnceTest.java       |    6 +-
 .../EventDrivenPollingConsumerQueueSizeTest.java   |    7 +-
 .../apache/camel/impl/ExpressionAdapterTest.java   |    3 +
 .../apache/camel/impl/ExpressionSupportTest.java   |    3 +
 .../impl/ExtendedStartupListenerComponentTest.java |    2 +
 .../apache/camel/impl/FileStateRepositoryTest.java |    3 +-
 .../camel/impl/FileWatcherReloadStrategyTest.java  |    4 +
 .../org/apache/camel/impl/FromEndpointTest.java    |    2 +
 .../camel/impl/FromHasNoOutputRouteTest.java       |    2 +
 .../camel/impl/FromMultipleEndpointTest.java       |    2 +
 .../apache/camel/impl/GetRegistryAsTypeTest.java   |    8 +-
 .../GracefulShutdownNoAutoStartOrderClashTest.java |    2 +
 .../camel/impl/GzipDataFormatFileDeleteTest.java   |    7 +-
 .../GzipDataFormatFileUnmarshalDeleteTest.java     |    7 +-
 .../org/apache/camel/impl/GzipDataFormatTest.java  |    3 +
 .../impl/HashMapHeadersMapFactoryRouteTest.java    |    2 +
 .../impl/HeaderFilterStrategyComponentTest.java    |    7 +-
 .../InflightRepositoryBrowseFromRouteTest.java     |    2 +
 .../camel/impl/InflightRepositoryBrowseTest.java   |    2 +
 .../camel/impl/InflightRepositoryRouteTest.java    |    2 +
 ...erceptSendToMockEndpointStrategyCustomTest.java |    2 +
 .../InterceptSendToMockEndpointStrategyTest.java   |    3 +
 .../apache/camel/impl/JavaUuidGeneratorTest.java   |    7 +-
 .../org/apache/camel/impl/JndiRegistryTest.java    |    8 +-
 .../camel/impl/LanguageCamelContextAwareTest.java  |    2 +
 .../impl/LifecycleStrategyFailOnStartupTest.java   |    2 +
 .../camel/impl/LifecycleStrategyServiceTest.java   |    2 +
 .../LimitedPollingConsumerPollStrategyTest.java    |    7 +
 .../camel/impl/LogDebugBodyMaxCharsOffTest.java    |    7 +-
 .../camel/impl/LogDebugBodyMaxCharsTest.java       |    8 +-
 .../apache/camel/impl/LogDebugBodyStreamsTest.java |    7 +
 .../org/apache/camel/impl/MainSupportTest.java     |    4 +
 .../org/apache/camel/impl/MessageSupportTest.java  |    7 +
 .../apache/camel/impl/ModelCamelContextTest.java   |    2 +
 .../camel/impl/MultipleConsumersSupportTest.java   |    3 +
 .../camel/impl/MultipleLifecycleStrategyTest.java  |    2 +
 .../impl/PendingExchangesShutdownGracefulTest.java |    2 +
 ...ndingExchangesTwoRouteShutdownGracefulTest.java |    2 +
 .../impl/PojoProduceInterceptEndpointTest.java     |    7 +-
 .../PojoProduceProxyInterceptEndpointTest.java     |    7 +-
 .../camel/impl/ProducerCacheNonSingletonTest.java  |    2 +
 .../impl/ProxyInstantiationExceptionTest.java      |    2 +
 .../org/apache/camel/impl/RefDataFormatTest.java   |    3 +
 .../RegistryLookupTypeClassCastExceptionTest.java  |    9 +-
 .../java/org/apache/camel/impl/RegistryTest.java   |   16 +-
 .../camel/impl/RemoveRouteStopEndpointTest.java    |    3 +
 .../camel/impl/RouteDirectSuspendResumeTest.java   |    2 +
 .../org/apache/camel/impl/RouteIdFactoryTest.java  |    6 +
 .../impl/RouteMustHaveOutputOnExceptionTest.java   |    3 +
 .../org/apache/camel/impl/RouteNoOutputTest.java   |    7 +-
 .../apache/camel/impl/RoutePolicyCallbackTest.java |    2 +
 .../apache/camel/impl/RoutePolicyFactoryTest.java  |    2 +
 .../org/apache/camel/impl/RoutePolicyTest.java     |    9 +
 .../org/apache/camel/impl/RouteRemove2Test.java    |    2 +
 .../org/apache/camel/impl/RouteRemoveTest.java     |    3 +
 .../apache/camel/impl/RouteSedaStopStartTest.java  |    2 +
 .../camel/impl/RouteSedaSuspendResumeTest.java     |    2 +
 .../camel/impl/RouteSuspendResumeWarmUpTest.java   |    2 +
 .../impl/RouteWithMistypedComponentNameTest.java   |    3 +
 .../camel/impl/RuntimeEndpointRegistryTest.java    |    2 +
 .../impl/ScheduledPollConsumerBackoffTest.java     |    3 +
 .../impl/ScheduledPollConsumerGreedyTest.java      |    3 +
 .../camel/impl/ScheduledPollConsumerTest.java      |    4 +
 ...edPollEndpointConfigureConsumerRestartTest.java |    2 +
 .../camel/impl/SerializationDataFormatTest.java    |    2 +
 .../org/apache/camel/impl/ServicePoolTest.java     |   18 +-
 .../ShutdownGracefulNoAutoStartedRoutesTest.java   |    2 +
 .../impl/ShutdownGracefulTimeoutTriggerTest.java   |    2 +
 ...ownStrategyNotSuppressLoggingOnTimeoutTest.java |    2 +
 ...utdownStrategySuppressLoggingOnTimeoutTest.java |    2 +
 .../org/apache/camel/impl/SimpleRegistryTest.java  |   16 +-
 .../SimpleShutdownGracefulNoAtuoStartedTest.java   |    2 +
 .../camel/impl/SimpleShutdownGracefulTest.java     |    2 +
 .../apache/camel/impl/SimpleUuidGeneratorTest.java |    7 +-
 .../apache/camel/impl/StartAndStopRoutesTest.java  |    2 +
 .../camel/impl/StartStopAndShutdownRouteTest.java  |    2 +
 .../StartupListenerComponentFromRegistryTest.java  |    2 +
 .../camel/impl/StartupListenerComponentTest.java   |    2 +
 .../org/apache/camel/impl/StartupListenerTest.java |    3 +
 .../camel/impl/StopRouteAbortAfterTimeoutTest.java |    3 +
 .../apache/camel/impl/StringDataFormatTest.java    |   14 +-
 .../camel/impl/TwoRouteSuspendResumeTest.java      |    2 +
 .../camel/impl/TypeConverterAllowNullTest.java     |    6 +-
 .../TypeConverterRegistryMissesThenAddTest.java    |    6 +-
 .../impl/TypeConverterRegistryPerformanceTest.java |    2 +
 ...TypeConverterRegistryStatisticsEnabledTest.java |    2 +
 .../camel/impl/TypeConverterRegistryTest.java      |   11 +-
 .../camel/impl/VetoCamelContextStartTest.java      |    2 +
 .../camel/impl/ZipDataFormatFileDeleteTest.java    |    7 +-
 .../impl/ZipDataFormatFileUnmarshalDeleteTest.java |    7 +-
 .../org/apache/camel/impl/ZipDataFormatTest.java   |    7 +
 .../apache/camel/impl/cloud/LoadBalancerTest.java  |    1 -
 .../camel/impl/cloud/ServiceRegistryTest.java      |   69 +-
 .../camel/impl/converter/TypeConvertersTest.java   |    2 +
 .../impl/transformer/TransformerContractTest.java  |    1 +
 .../impl/transformer/TransformerRouteTest.java     |    5 +
 .../camel/impl/validator/ValidatorRouteTest.java   |    4 +
 .../verifier/DefaultComponentVerifierTest.java     |    9 +-
 .../org/apache/camel/issues/AdviceWithCBRTest.java |    3 +
 ...viceWithContextScopedErrorHandlerIssueTest.java |    2 +
 ...nterceptSendToEndpointWithLoadbalancerTest.java |    2 +
 .../camel/issues/AdviceWithInterceptTest.java      |    2 +
 .../issues/AdviceWithInvalidConfiguredTest.java    |    3 +
 .../apache/camel/issues/AdviceWithIssueTest.java   |    7 +
 .../camel/issues/AdviceWithOnCompletionTest.java   |    2 +
 .../AdviceWithOnExceptionAndInterceptTest.java     |    2 +
 .../AdviceWithOnExceptionMultipleIssueTest.java    |    4 +
 .../issues/AdviceWithOnExceptionRemoveTest.java    |    2 +
 .../camel/issues/AdviceWithOnExceptionTest.java    |    2 +
 .../apache/camel/issues/AdviceWithPolicyTest.java  |    2 +
 .../camel/issues/AdviceWithRoutePolicyTest.java    |    3 +
 ...AdviceWithRouteScopedErrorHandlerIssueTest.java |    2 +
 .../issues/AdviceWithStartTargetIssueTest.java     |    2 +
 .../camel/issues/AdviceWithTransactedTest.java     |    2 +
 .../AdviceWithTwoRoutesOnExceptionIssueTest.java   |    2 +
 .../camel/issues/AdviceWithUrlIssueTest.java       |    3 +
 .../issues/AdviceWithWeaveByToUriCBRTest.java      |    2 +
 .../camel/issues/AdviceWithWeaveByTypeCBRTest.java |    2 +
 .../AggregatorWithBatchConsumingIssueTest.java     |    2 +
 .../apache/camel/issues/AmahDeadLetterTest.java    |    2 +
 .../camel/issues/CBRConcurrencyIssueTest.java      |    3 +
 .../apache/camel/issues/CBRContainsIssueTest.java  |    7 +
 .../issues/CBRCustomPredicateAsFilterTest.java     |    2 +
 .../CacheInputStreamInDeadLetterIssue520Test.java  |    4 +
 .../apache/camel/issues/Camel4857UriIssueTest.java |    6 +-
 .../camel/issues/ChangeHeaderCaseIssueTest.java    |    2 +
 .../CharlesSplitAndTryCatchRollbackIssueTest.java  |    5 +
 ...CharlesSplitUseBeanAsErrorHandlerIssueTest.java |    3 +
 .../issues/ChoiceEndOrEndChoiceIssueTest.java      |    4 +
 .../issues/ChoicePredicateSimpleHeaderTest.java    |    5 +
 .../camel/issues/ComponentUseRawUriTest.java       |    5 +-
 .../issues/ConsumerTemplateSedaQueueIssueTest.java |    2 +
 ...tScopedOnExceptionErrorHandlerRefIssueTest.java |    2 +
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |    3 +
 ...ScopedOnExceptionMultipleRouteBuildersTest.java |    3 +
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |    2 +
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |    3 +
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |    2 +
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |    3 +
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |    2 +
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |    3 +
 .../org/apache/camel/issues/DavidSiefertTest.java  |    3 +
 .../issues/DoCatchCaughExceptionIssueTest.java     |    2 +
 .../DynamicRouterConvertBodyToIssueTest.java       |    2 +
 .../issues/DynamicRouterWithInterceptorTest.java   |    3 +
 .../issues/EndpointWithRawUriParameterTest.java    |    4 +
 .../camel/issues/ErrorHandlerAdviceIssueTest.java  |    2 +
 .../camel/issues/ExceptionCamel4022Test.java       |    2 +
 .../camel/issues/ExceptionPolicyIssueTest.java     |    2 +
 .../org/apache/camel/issues/ExceptionTest.java     |    5 +
 ...tionThrownFromOnExceptionNoEndlessLoopTest.java |    2 +
 .../issues/ExceptionThrownFromOnExceptionTest.java |    7 +
 .../camel/issues/FilePollingConsumerIssueTest.java |    7 +-
 .../issues/FileSplitStreamingWithChoiceTest.java   |    7 +-
 .../issues/FilterCustomPredicateAsFilterTest.java  |    2 +
 .../org/apache/camel/issues/GertJBIIssueTest.java  |    3 +
 .../InterceptCustomPredicateAsFilterTest.java      |    2 +
 .../apache/camel/issues/InterceptFromLogTest.java  |    2 +
 .../InterceptFromPredicateProceedAndStopTest.java  |    7 +
 .../java/org/apache/camel/issues/Issue170Test.java |    2 +
 .../java/org/apache/camel/issues/Issue3Test.java   |    2 +
 .../MessageWithAttachmentRedeliveryIssueTest.java  |    3 +
 .../camel/issues/MethodClassByTypeIssueTest.java   |    3 +
 .../camel/issues/MockExepctedHeadersIssueTest.java |    3 +
 .../camel/issues/MockValueBuilderIssueTest.java    |    4 +
 ...icastAggregationStrategyThrowExceptionTest.java |    2 +
 ...lelStopOnExceptionWithOnExceptionIssueTest.java |    3 +
 ...thAggregationStrategyThrowingExceptionTest.java |    2 +
 .../MulticastPipelineAggregateIssueTest.java       |    2 +
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |    2 +
 .../issues/MulticastSingleAggregateIssueTest.java  |    2 +
 ...astStopOnExceptionWithOnExceptionIssueTest.java |    5 +
 .../issues/MulticastWithOnExceptionIssueTest.java  |    5 +
 .../MultipleErrorHandlerOnExceptionIssueTest.java  |    3 +
 .../org/apache/camel/issues/MultipleFromTest.java  |    2 +
 .../org/apache/camel/issues/NeilSplitterTest.java  |    9 +-
 ...derExactlyDoneSplitterWhereSentToIssueTest.java |    2 +
 ...tifyBuilderOnFailureShutdownCamelIssueTest.java |    2 +
 .../apache/camel/issues/OnCompletionIssueTest.java |    2 +
 .../OnExceptionBeforeErrorHandlerIssueTest.java    |    4 +
 ...OnExceptionContinuedNoFailureProcessorTest.java |    2 +
 .../OnExceptionErrorHandlerRefIssueTest.java       |    2 +
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |    3 +
 .../OnExceptionHandledNoFailureProcessorTest.java  |    2 +
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |    2 +
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |    3 +
 ...nExceptionNotHandledNoFailureProcessorTest.java |    2 +
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |    2 +
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |    3 +
 .../camel/issues/OnExceptionProcessIssueTest.java  |    2 +
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |    2 +
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |    3 +
 .../camel/issues/OnExceptionWithTwoBeansTest.java  |    3 +
 .../issues/PropertiesAvailableEverywhereTest.java  |    2 +
 .../camel/issues/ProxyReturnNullIssueTest.java     |    3 +
 .../RecipientListDirectNoConsumerIssueTest.java    |    4 +
 .../RecipientListErrorHandlingIssueTest.java       |    3 +
 ...thAggregationStrategyThrowingExceptionTest.java |    2 +
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |    2 +
 ...eOriginalMessageEndpointExceptionIssueTest.java |    7 +-
 .../RecipientListUseOriginalMessageIssueTest.java  |    7 +-
 .../issues/RecipientListWithInterceptorTest.java   |    3 +
 ...olicyOnExceptionWhileRedeliveringIssueTest.java |    2 +
 .../camel/issues/RegExPredicateIssueTest.java      |    3 +
 ...etryRouteScopedUntilRecipientListIssueTest.java |    9 +
 .../RetryWhilePredicateExpressionIssueTest.java    |    2 +
 .../RetryWhileSimpleExpressionIssueTest.java       |    2 +
 .../apache/camel/issues/RomeksExceptionTest.java   |    3 +
 .../RouteScopedErrorHandlerAndOnExceptionTest.java |    3 +
 ...ScopedOnExceptionMultipleRouteBuildersTest.java |    3 +
 ...eptionWithInterceptSendToEndpointIssueTest.java |    2 +
 ...erceptSendToEndpointIssueWithPredicateTest.java |    2 +
 .../apache/camel/issues/RouteWithCustomIdTest.java |    2 +
 .../camel/issues/RoutingSlipMemoryLeakTest.java    |    7 +-
 .../issues/RoutingSlipWithInterceptorTest.java     |    3 +
 ...RouteAndContextScopedErrorHandlerIssueTest.java |    2 +
 .../camel/issues/SedaFileIdempotentIssueTest.java  |    7 +-
 .../issues/SentExchangeEventNotifierIssueTest.java |    4 +
 .../SentExchangeEventNotifierTwoIssueTest.java     |    4 +
 .../camel/issues/ServicePoolAwareLeakyTest.java    |    2 +
 .../camel/issues/SetBodyTryCatchIssueTest.java     |    2 +
 .../camel/issues/SetHeaderInDoCatchIssueTest.java  |    4 +
 .../apache/camel/issues/SetHeaderIssueTest.java    |    8 +-
 .../camel/issues/SplitContinuedLogIssueTest.java   |    3 +
 .../camel/issues/SplitListListIssueTest.java       |    2 +
 .../camel/issues/SplitPropertiesFileIssueTest.java |    7 +-
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |    2 +
 .../issues/SplitStopOnExceptionIssueTest.java      |    2 +
 .../SplitWithCustomAggregationStrategyTest.java    |    2 +
 .../camel/issues/SplitWithInterceptorTest.java     |    3 +
 .../issues/SplitterCorrelationIdIssueTest.java     |    2 +
 .../camel/issues/SplitterParallelIssueTest.java    |    2 +
 ...thAggregationStrategyThrowingExceptionTest.java |    2 +
 ...rParallelWithIteratorThrowingExceptionTest.java |    3 +
 .../SplitterThrowExceptionInExpressionTest.java    |    2 +
 .../SplitterThrowExceptionInExpressionTwoTest.java |    2 +
 ...terUsingBeanReturningCloseableIteratorTest.java |    2 +
 .../SplitterUsingBeanReturningMessageTest.java     |    2 +
 .../camel/issues/StopCamelFromRouteTest.java       |    6 +-
 .../camel/issues/StopRouteFromRouteTest.java       |    6 +-
 .../issues/StopRouteImpactsErrorHandlerTest.java   |    2 +
 ...dNotStopContextScopedErrorHandlerIssueTest.java |    2 +
 ...uldNotStopRouteScopedErrorHandlerIssueTest.java |    2 +
 ...ryCatchInterceptSendToAllEndpointIssueTest.java |    2 +
 ...ThreadsRejectedExecutionWithDeadLetterTest.java |    3 +
 .../issues/TimerAndErrorHandlerIssueTest.java      |    2 +
 .../TransactedPropertyPlaceholderIssueTest.java    |    2 +
 .../TryCatchFinallyOnExceptionIssueTest.java       |    2 +
 .../camel/issues/TryCatchSetHeaderIssueTest.java   |    3 +
 .../camel/issues/TryCatchWithSplitIssueTest.java   |    3 +
 .../TryCatchWithSplitNotHandledIssueTest.java      |    2 +
 ...erceptSendToEndpointIssueWithPredicateTest.java |    2 +
 .../apache/camel/issues/TwoTimerWithJMXIssue.java  |    2 +-
 .../issues/TypeConverterConcurrencyIssueTest.java  |    2 +
 .../apache/camel/issues/XPathSplitStreamTest.java  |    7 +-
 .../language/BeanAnnotationParameterTest.java      |    5 +
 .../language/BeanAnnotationParameterTwoTest.java   |    5 +
 .../language/BeanLanguageInvalidOGNLTest.java      |    2 +
 .../BeanLanguageMethodMissingParenthesisTest.java  |    4 +
 .../camel/language/BeanLanguageOGNLTest.java       |    2 +
 ...LWithDotInParameterPropertyPlaceholderTest.java |    2 +
 .../BeanLanguageOGNLWithDotInParameterTest.java    |    2 +
 .../java/org/apache/camel/language/BeanTest.java   |    9 +
 .../ConstantLanguageBinaryResourceTest.java        |    2 +
 .../org/apache/camel/language/ConstantTest.java    |    3 +
 .../camel/language/FileLanguageExtSingleTest.java  |    2 +
 .../apache/camel/language/FileLanguageTest.java    |   15 +
 .../java/org/apache/camel/language/HeaderTest.java |    4 +
 .../apache/camel/language/LanguageServiceTest.java |    3 +
 .../apache/camel/language/NoSuchLanguageTest.java  |    2 +
 .../PropertyInjectAnnotationParameterTest.java     |    4 +
 .../org/apache/camel/language/PropertyTest.java    |    4 +
 .../apache/camel/language/RefPredicateTest.java    |    3 +
 .../java/org/apache/camel/language/RefTest.java    |    4 +
 .../camel/language/SimpleLanguageRouteTest.java    |    2 +
 .../SimpleLanguageTransformRandomTest.java         |    2 +
 .../camel/language/SimpleOgnlMapIssueTest.java     |    3 +
 ...okenPairIteratorSplitChoicePerformanceTest.java |    5 +-
 .../camel/language/TokenPairPredicateTest.java     |    7 +-
 .../TokenXMLPairMultiNamespaceSplitTest.java       |    3 +
 .../TokenXMLPairNamespaceMultilineSplitTest.java   |    3 +
 .../language/TokenXMLPairNamespaceSplitTest.java   |    8 +-
 .../org/apache/camel/language/TokenizerTest.java   |   27 +
 .../apache/camel/language/XMLTokenSplitTest.java   |    8 +-
 .../language/XPathAnotherRouteConcurrentTest.java  |    2 +
 .../camel/language/XPathFromFileExceptionTest.java |    8 +-
 .../apache/camel/language/XPathFunctionTest.java   |   10 +-
 .../camel/language/XPathOutFunctionTest.java       |    9 +-
 .../language/XPathRouteConcurrentBigTest.java      |    2 +
 .../camel/language/XPathRouteConcurrentTest.java   |    6 +
 .../language/XPathSplitChoicePerformanceTest.java  |    5 +-
 .../java/org/apache/camel/language/XPathTest.java  |    4 +
 .../simple/SimpleBackwardsCompatibleTest.java      |    5 +
 .../simple/SimpleChangeFunctionTokensTest.java     |   10 +-
 .../camel/language/simple/SimpleDecHeaderTest.java |    2 +
 .../camel/language/simple/SimpleIncHeaderTest.java |    2 +
 .../SimpleMessageHistoryNotDetailedTest.java       |    2 +
 .../language/simple/SimpleMessageHistoryTest.java  |    2 +
 .../camel/language/simple/SimpleOperatorTest.java  |   42 +
 .../language/simple/SimpleOverrideMethodTest.java  |    2 +
 .../simple/SimpleParserExpressionInvalidTest.java  |    6 +
 .../simple/SimpleParserExpressionTest.java         |   22 +
 .../simple/SimpleParserPredicateInvalidTest.java   |    8 +
 .../language/simple/SimpleParserPredicateTest.java |   20 +
 .../simple/SimpleParserRegexpPredicateTest.java    |    2 +
 .../simple/SimplePropertiesNestedTest.java         |    2 +
 .../language/simple/SimpleResourceDynamicTest.java |   48 +
 .../SimpleRouteExpressionAsPredicateTest.java      |    2 +
 .../simple/SimpleSetHeaderPredicateTest.java       |    4 +
 .../apache/camel/language/simple/SimpleTest.java   |  132 +++
 .../language/simple/SimpleWhiteSpaceTest.java      |    7 +
 .../language/tokenizer/TokenizeLanguageTest.java   |    9 +
 .../tokenizer/TokenizeWrapLanguageTest.java        |    9 +
 .../tokenizer/XMLTokenizeLanguageGroupingTest.java |    9 +
 .../XMLTokenizeLanguageStreamingFileTest.java      |    7 +-
 .../tokenizer/XMLTokenizeLanguageTest.java         |    9 +
 .../XMLTokenizeWrapLanguageGroupingTest.java       |   10 +
 .../tokenizer/XMLTokenizeWrapLanguageTest.java     |   10 +
 .../test/java/org/apache/camel/main/MainTest.java  |    8 +-
 .../java/org/apache/camel/main/MainVetoTest.java   |    6 +-
 .../camel/management/AddEventNotifierTest.java     |    5 +-
 .../camel/management/BacklogDebuggerTest.java      |   10 +
 .../camel/management/BacklogTracerFilterTest.java  |    3 +
 .../management/BacklogTracerIdOnAllNodesTest.java  |    3 +
 .../management/BacklogTracerPatternRouteTest.java  |    3 +
 .../camel/management/BacklogTracerPatternTest.java |    3 +
 .../management/BacklogTracerStreamCachingTest.java |    3 +
 .../apache/camel/management/BacklogTracerTest.java |    9 +
 .../org/apache/camel/management/BigRouteTest.java  |    2 +
 .../management/CamelChoiceWithManagementTest.java  |    8 +-
 .../management/CamelContextDisableJmxTest.java     |    6 +-
 .../DualManagedThreadPoolProfileTest.java          |    2 +
 .../DualManagedThreadPoolWithIdTest.java           |    2 +
 .../camel/management/EndpointCompletionTest.java   |    4 +-
 .../camel/management/EventNotifierEventsTest.java  |    7 +-
 .../EventNotifierExchangeCompletedTest.java        |    5 +-
 .../EventNotifierExchangeSentParallelTest.java     |    2 +
 .../management/EventNotifierExchangeSentTest.java  |    7 +-
 .../EventNotifierFailureHandledEventsTest.java     |    7 +-
 .../EventNotifierRedeliveryEventsTest.java         |    6 +-
 ...ventNotifierServiceStoppingFailedEventTest.java |    5 +-
 .../management/ExceptionWithManagementTest.java    |    2 +
 .../JmxInstrumentationCustomMBeanTest.java         |    6 +
 ...mxInstrumentationDisableOnCamelContextTest.java |    3 +
 .../management/JmxInstrumentationDisableTest.java  |    2 +
 ...ationOnlyRegisterProcessorWithCustomIdTest.java |    8 +-
 .../JmxInstrumentationUsingDefaultsTest.java       |   12 +-
 .../JmxInstrumentationUsingPlatformMBSTest.java    |    8 +-
 .../JmxInstrumentationUsingPropertiesTest.java     |    8 +-
 .../JmxInstrumentationWithConnectorTest.java       |   13 +-
 .../JmxNotificationEventNotifierTest.java          |    3 +
 .../camel/management/JmxRecipientListTest.java     |    3 +
 .../org/apache/camel/management/LoadTimerTest.java |    2 +
 .../apache/camel/management/LoadTripletTest.java   |    7 +-
 .../camel/management/LoggingEventNotifierTest.java |    3 +
 .../ManagedBrowsableEndpointAsXmlFileTest.java     |    7 +-
 .../ManagedBrowsableEndpointAsXmlTest.java         |    9 +
 .../ManagedBrowsableEndpointEmptyTest.java         |    2 +
 .../management/ManagedBrowsableEndpointTest.java   |    2 +
 .../apache/camel/management/ManagedCBRTest.java    |    2 +
 .../ManagedCamelContextAutoStartupTest.java        |    2 +
 .../ManagedCamelContextDumpRoutesAsXmlTest.java    |    2 +
 .../ManagedCamelContextDumpStatsAsXmlTest.java     |    3 +
 .../ManagedCamelContextEmptyRouteTest.java         |    2 +
 .../ManagedCamelContextNewProxyTest.java           |    2 +
 .../ManagedCamelContextPropertiesTest.java         |    2 +
 .../management/ManagedCamelContextRestartTest.java |    7 +-
 .../ManagedCamelContextSuspendResumeTest.java      |    2 +
 .../ManagedCamelContextSuspendStartTest.java       |    2 +
 .../camel/management/ManagedCamelContextTest.java  |   14 +
 .../management/ManagedCamelContextTracerTest.java  |    2 +
 ...ManagedCamelContextUpdateRoutesFromXmlTest.java |    3 +
 ...RoutesWithPropertyPlaceholdersFromXmlPTest.java |    4 +
 .../ManagedCanekContextExchangeStatisticsTest.java |    2 +
 .../apache/camel/management/ManagedChoiceTest.java |    2 +
 .../ManagedCircuitBreakerLoadBalancerTest.java     |    3 +
 .../camel/management/ManagedComponentTest.java     |    4 +
 .../management/ManagedConsumerCacheHitsTest.java   |    3 +
 .../camel/management/ManagedConsumerCacheTest.java |    3 +
 .../camel/management/ManagedConvertBodyTest.java   |    2 +
 .../camel/management/ManagedCustomBeanTest.java    |    3 +
 .../management/ManagedCustomComponentNameTest.java |    3 +
 .../management/ManagedCustomLoadBalancerTest.java  |    2 +
 .../camel/management/ManagedCustomPolicyTest.java  |    3 +
 .../management/ManagedCustomProcessorTest.java     |    2 +
 .../camel/management/ManagedDataFormatTest.java    |    3 +
 .../camel/management/ManagedDelayerTest.java       |    2 +
 .../management/ManagedDualCamelContextTest.java    |    3 +
 .../camel/management/ManagedDuplicateIdTest.java   |    2 +
 .../camel/management/ManagedDynamicRouterTest.java |    2 +
 .../management/ManagedEndpointExplainTest.java     |    2 +
 .../management/ManagedEndpointRegistryTest.java    |    3 +
 .../camel/management/ManagedEndpointTest.java      |    2 +
 .../ManagedEndpointUtilizationStatisticsTest.java  |    2 +
 .../camel/management/ManagedEnricherTest.java      |    2 +
 .../management/ManagedErrorHandlerOptionsTest.java |    3 +
 .../ManagedErrorHandlerRedeliveryTest.java         |    3 +
 .../camel/management/ManagedErrorHandlerTest.java  |    3 +
 .../ManagedFailoverLoadBalancerTest.java           |    3 +
 .../management/ManagedFileIdempotentClearTest.java |    8 +-
 .../ManagedFileIdempotentConsumerTest.java         |    8 +-
 .../ManagedFileWatcherReloadStrategyTest.java      |    2 +
 .../apache/camel/management/ManagedFilterTest.java |    2 +
 .../ManagedFromRestGetEmbeddedRouteTest.java       |    2 +
 .../camel/management/ManagedFromRestGetTest.java   |    2 +
 .../management/ManagedFromRestPlaceholderTest.java |    3 +
 .../management/ManagedInflightRepositoryTest.java  |    2 +
 .../management/ManagedInflightStatisticsTest.java  |    3 +
 .../management/ManagedInlinedProcessorTest.java    |    2 +
 .../camel/management/ManagedInterceptFromTest.java |    2 +
 .../camel/management/ManagedInterceptTest.java     |    2 +
 .../management/ManagedListComponentsTest.java      |    2 +
 .../camel/management/ManagedLoadBalancerTest.java  |    2 +
 .../camel/management/ManagedLogEndpointTest.java   |    6 +-
 .../apache/camel/management/ManagedLoopTest.java   |    2 +
 .../camel/management/ManagedMarshalTest.java       |    2 +
 .../ManagedMemoryIdempotentClearTest.java          |    9 +-
 .../ManagedMemoryIdempotentConsumerTest.java       |    9 +-
 .../camel/management/ManagedMulticastTest.java     |    2 +
 .../management/ManagedNamePatternFixedTest.java    |    2 +
 .../ManagedNamePatternIncludeHostNameTest.java     |    2 +
 .../ManagedNamePatternJvmSystemPropertyTest.java   |   11 +-
 .../camel/management/ManagedNamePatternTest.java   |    2 +
 .../management/ManagedNonManagedServiceTest.java   |    4 +
 .../camel/management/ManagedPollEnricherTest.java  |    2 +
 .../camel/management/ManagedProcessTest.java       |    2 +
 ...gedProducerRecipientListRegisterAlwaysTest.java |    3 +
 .../ManagedProducerRecipientListTest.java          |    3 +
 ...edProducerRouteAddRemoveRegisterAlwaysTest.java |    3 +
 .../camel/management/ManagedProducerTest.java      |    3 +
 .../management/ManagedRandomLoadBalancerTest.java  |    2 +
 .../camel/management/ManagedRecipientListTest.java |    2 +
 .../management/ManagedRedeliverRouteOnlyTest.java  |    2 +
 .../camel/management/ManagedRedeliverTest.java     |    2 +
 .../camel/management/ManagedRefProducerTest.java   |    3 +
 .../ManagedRegisterCamelContextTest.java           |    2 +
 .../management/ManagedRegisterEndpointTest.java    |    2 +
 .../ManagedRegisterExchangeStatisticsTest.java     |    2 +
 .../camel/management/ManagedRegisterRouteTest.java |    3 +
 .../management/ManagedRegisterTwoRoutesTest.java   |    3 +
 .../ManagedRemoveRouteAggregateThreadPoolTest.java |    3 +
 .../camel/management/ManagedResequencerTest.java   |    2 +
 .../ManagedResetIncludeProcessorsTest.java         |    3 +
 .../management/ManagedResetIncludeRoutesTest.java  |    3 +
 .../camel/management/ManagedResourceTest.java      |   18 +-
 .../camel/management/ManagedRestRegistryTest.java  |    3 +
 .../ManagedRoundRobinLoadBalancerTest.java         |    2 +
 .../management/ManagedRouteAddFromRouteTest.java   |    2 +
 .../management/ManagedRouteAddRemoveTest.java      |   13 +-
 ...outeAddSecondRouteNotRegisterNewRoutesTest.java |    2 +
 .../management/ManagedRouteAddSecondRouteTest.java |    2 +
 .../management/ManagedRouteAutoStartupTest.java    |    2 +
 .../management/ManagedRouteContextTracerTest.java  |    2 +
 .../ManagedRouteDirectWhileIssueLeakTest.java      |    3 +
 .../ManagedRouteDumpRouteAsXmlPlaceholderTest.java |    3 +
 .../management/ManagedRouteDumpRouteAsXmlTest.java |    4 +
 ...DumpStatsAsXmlAndResetWithCustomDomainTest.java |    2 +
 ...ManagedRouteDumpStatsAsXmlCustomDomainTest.java |    2 +
 .../management/ManagedRouteDumpStatsAsXmlTest.java |    3 +
 .../management/ManagedRouteGetPropertiesTest.java  |    3 +
 .../management/ManagedRouteLoadstatisticsTest.java |    4 +
 .../management/ManagedRouteNoAutoStartupTest.java  |    3 +
 .../ManagedRoutePerformanceCounterTest.java        |    3 +
 ...edRouteRemoveContextScopedErrorHandlerTest.java |    3 +
 ...emoveRouteAndContextScopedErrorHandlerTest.java |    4 +
 ...agedRouteRemoveRouteScopedErrorHandlerTest.java |    3 +
 .../camel/management/ManagedRouteRemoveTest.java   |    8 +-
 ...edRouteRemoveWireTapExplicitThreadPoolTest.java |    3 +
 .../management/ManagedRouteRemoveWireTapTest.java  |    3 +
 .../camel/management/ManagedRouteRestartTest.java  |    3 +
 .../ManagedRouteShutdownAndStartTest.java          |    8 +-
 .../ManagedRouteStopAndStartCleanupTest.java       |    3 +
 .../management/ManagedRouteStopAndStartTest.java   |    8 +-
 .../camel/management/ManagedRouteStopTest.java     |    3 +
 .../ManagedRouteStopUsingMBeanAPITest.java         |    3 +
 .../ManagedRouteStopWithAbortAfterTimeoutTest.java |    3 +
 .../ManagedRouteSuspendAndResumeTest.java          |    8 +-
 .../ManagedRouteUpdateRouteFromXmlTest.java        |    5 +
 .../ManagedRouteWithOnExceptionTest.java           |   13 +-
 .../camel/management/ManagedRoutingSlipTest.java   |    2 +
 .../management/ManagedRuntimeCamelCatalogTest.java |    2 +
 .../camel/management/ManagedSanitizeTest.java      |    2 +
 .../ManagedScheduledPollConsumerTest.java          |    3 +
 .../camel/management/ManagedSedaEndpointTest.java  |    2 +
 .../management/ManagedSedaRouteRemoveTest.java     |    3 +
 .../ManagedSendDynamicProcessorTest.java           |    2 +
 .../camel/management/ManagedSendProcessorTest.java |    2 +
 .../management/ManagedServiceUrlPathTest.java      |    7 +-
 ...ManagedSetAndRemoveHeaderAndPropertiesTest.java |    3 +
 .../management/ManagedShutdownStrategyTest.java    |    3 +
 .../camel/management/ManagedSplitterTest.java      |    2 +
 .../management/ManagedStatisticsDisabledTest.java  |    3 +
 .../management/ManagedStatisticsLevelOffTest.java  |    3 +
 .../ManagedStatisticsLevelRoutesOnlyTest.java      |    3 +
 .../camel/management/ManagedStatisticsTest.java    |    3 +
 .../ManagedStatisticsWithSplitterTest.java         |    2 +
 .../management/ManagedStickyLoadBalancerTest.java  |    2 +
 .../ManagedStreamCachingStrategyTest.java          |    3 +
 .../management/ManagedSuspendedServiceTest.java    |    8 +-
 .../management/ManagedThreadPoolProfileTest.java   |    2 +
 .../camel/management/ManagedThreadPoolTest.java    |    2 +
 .../management/ManagedThreadPoolWithIdTest.java    |    2 +
 .../camel/management/ManagedThreadsTest.java       |    2 +
 .../camel/management/ManagedThrottlerTest.java     |   11 +-
 .../ManagedThrottlingInflightRoutePolicyTest.java  |    3 +
 .../apache/camel/management/ManagedTimerTest.java  |    3 +
 .../management/ManagedTopicLoadBalancerTest.java   |    2 +
 .../camel/management/ManagedTracerOptionsTest.java |    2 +
 .../management/ManagedTransformerRegistryTest.java |    2 +
 .../ManagedTypeConverterRegistryTest.java          |    3 +
 .../camel/management/ManagedUnmarshalTest.java     |    2 +
 .../ManagedUnregisterCamelContextTest.java         |    3 +
 .../management/ManagedUnregisterComponentTest.java |    3 +
 .../management/ManagedUnregisterConsumerTest.java  |    3 +
 .../management/ManagedUnregisterEndpointTest.java  |    2 +
 .../management/ManagedUnregisterProcessorTest.java |    3 +
 .../management/ManagedUnregisterProducerTest.java  |    3 +
 .../management/ManagedUnregisterRouteTest.java     |    2 +
 .../management/ManagedValidatorRegistryTest.java   |    2 +
 .../ManagedWeightedLoadBalancerTest.java           |    2 +
 .../camel/management/ManagedWireTapTest.java       |    2 +
 .../management/MultiInstanceProcessorTest.java     |    4 +
 .../MultipleEventNotifierEventsTest.java           |    6 +-
 .../camel/management/PublishEventNotifierTest.java |    3 +
 .../PublishEventNotifierToRouteTest.java           |    3 +
 .../camel/management/RemoveEventNotifierTest.java  |    5 +-
 .../management/RemoveRouteDefinitionTest.java      |    5 +
 ...nagedCamelContextAutoAssignedNameClashTest.java |    7 +-
 .../TwoManagedCamelContextClashTest.java           |    9 +-
 .../management/TwoManagedCamelContextTest.java     |    7 +-
 .../management/TwoManagedNamePatternTest.java      |    7 +-
 .../apache/camel/model/ChoiceDefinitionTest.java   |   11 +
 .../model/GatherAllStaticEndpointUrisTest.java     |    2 +
 .../model/GenerateXmFromCamelContextTest.java      |    3 +
 .../org/apache/camel/model/GenerateXmlTest.java    |    3 +
 .../apache/camel/model/LoadRestFromXmlTest.java    |    2 +
 .../apache/camel/model/LoadRouteFromXmlTest.java   |    2 +
 .../model/LoadRouteFromXmlWithInterceptTest.java   |    2 +
 .../model/LoadRouteFromXmlWithNamespaceTest.java   |    2 +
 .../model/LoadRouteFromXmlWithOnExceptionTest.java |    2 +
 .../model/LoadRouteFromXmlWithPolicyTest.java      |    2 +
 .../apache/camel/model/ModelSanityCheckerTest.java |    7 +-
 .../camel/model/ProcessDefinitionSetBodyTest.java  |    2 +
 .../camel/model/ProcessorDefinitionHelperTest.java |    2 +
 .../model/ProcessorTypeConfigurationTest.java      |    2 +
 .../org/apache/camel/model/RouteGroupTest.java     |    2 +
 .../apache/camel/model/RoutePropertiesTest.java    |    3 +
 .../model/StartingRoutesErrorReportedTest.java     |    6 +
 .../java/org/apache/camel/model/XmlParseTest.java  |   47 +
 .../org/apache/camel/model/XmlRestParseTest.java   |    2 +
 .../apache/camel/model/XmlRestParseToDTest.java    |    2 +
 .../org/apache/camel/model/XmlRouteGroupTest.java  |    3 +
 .../apache/camel/model/XmlRoutePropertiesTest.java |    4 +
 .../org/apache/camel/model/XmlTestSupport.java     |    2 +-
 .../camel/processor/AOPAfterFinallyTest.java       |    3 +
 .../org/apache/camel/processor/AOPAfterTest.java   |    2 +
 .../camel/processor/AOPAroundFinallyTest.java      |    3 +
 .../org/apache/camel/processor/AOPAroundTest.java  |    2 +
 .../org/apache/camel/processor/AOPBeforeTest.java  |    2 +
 .../apache/camel/processor/AOPNestedRouteTest.java |    2 +
 .../apache/camel/processor/AsyncLoopCopyTest.java  |    2 +
 .../org/apache/camel/processor/AsyncLoopTest.java  |   12 +-
 .../BatchResequencerAllowDuplicatesTest.java       |    2 +
 .../processor/BatchResequencerJMSPriorityTest.java |    2 +
 .../BatchResequencerWithDuplicateTest.java         |    3 +
 .../processor/BeanCachedProcessorGlobalTest.java   |   42 +
 .../camel/processor/BeanCachedProcessorTest.java   |  101 ++
 .../BeanInvocationThrowsExceptionTest.java         |    3 +
 .../BeanOgnMethodWithXPathInjectionTest.java       |    3 +
 .../BeanProcessorSpecializedMessageTest.java       |    2 +
 .../camel/processor/BeanRecipientListTest.java     |    7 +-
 .../processor/BeanRecipientListTimeoutTest.java    |    4 +-
 .../org/apache/camel/processor/BeanRouteTest.java  |    9 +-
 .../camel/processor/BeanWithExceptionTest.java     |    8 +-
 .../processor/BeanWithXPathInjectionTest.java      |    3 +
 .../camel/processor/CBRHeaderPredicateTest.java    |    2 +
 .../CBRPredicateBeanThrowExceptionTest.java        |    3 +
 .../processor/CBRSimplePredicateEmptyBodyTest.java |    2 +
 .../apache/camel/processor/CBRSimpleTypeTest.java  |    2 +
 .../processor/CBRWhenUnmarshalEndChoiceTest.java   |    2 +
 .../camel/processor/CBRWithLoadBalancerTest.java   |    4 +
 .../camel/processor/CBRWithMulticastTest.java      |    4 +
 .../camel/processor/CBRWithRecipientListTest.java  |    4 +
 .../apache/camel/processor/CBRWithWireTapTest.java |    4 +
 .../processor/Camel715ThreadProcessorTest.java     |    4 +-
 .../CamelContextLogExhaustedMessageBodyTest.java   |    2 +
 .../org/apache/camel/processor/ChannelTest.java    |    7 +-
 .../apache/camel/processor/ChoiceAsyncTest.java    |    9 +-
 .../processor/ChoiceCompoundPredicateTest.java     |    7 +
 .../apache/camel/processor/ChoiceNoActionTest.java |    3 +
 .../camel/processor/ChoiceNoErrorHandlerTest.java  |    2 +
 .../org/apache/camel/processor/ChoiceTest.java     |   10 +-
 .../processor/ChoiceWhenBeanExpressionTest.java    |    8 +-
 .../ChoiceWhenBeanExpressionWithExceptionTest.java |    8 +-
 .../processor/ChoiceWhenNotPredicateTest.java      |    4 +
 .../apache/camel/processor/ChoiceWithEndTest.java  |    5 +
 .../camel/processor/ChoiceWithTranfromTest.java    |    2 +
 .../CircuitBreakerLoadBalancerInvalidTest.java     |    2 +
 .../processor/CircuitBreakerLoadBalancerTest.java  |   16 +-
 .../ClaimCheckEipGetAndRemoveSetTest.java          |    2 +
 .../camel/processor/ClaimCheckEipGetSetTest.java   |    2 +
 .../processor/ClaimCheckEipPushPopBodyTest.java    |    2 +
 .../ClaimCheckEipPushPopExcludeBodyTest.java       |    2 +
 .../ClaimCheckEipPushPopHeadersPatternTest.java    |    2 +
 .../processor/ClaimCheckEipPushPopHeadersTest.java |    2 +
 .../ClaimCheckEipPushPopRemoveHeaderTest.java      |    2 +
 .../camel/processor/ClaimCheckEipPushPopTest.java  |    2 +
 .../org/apache/camel/processor/ClaimCheckTest.java |    2 +
 .../processor/ComposedMessageProcessorTest.java    |    3 +
 .../apache/camel/processor/ConvertBodyTest.java    |   11 +
 .../apache/camel/processor/CorrectRouteIdTest.java |    2 +
 .../CreateRouteWithNonExistingEndpointTest.java    |    7 +-
 .../CustomConsumerExceptionHandlerTest.java        |    2 +
 .../camel/processor/CustomLoadBalanceTest.java     |    7 +-
 .../processor/CustomProcessorFactoryTest.java      |    3 +
 .../camel/processor/CustomRoutePolicyTest.java     |    2 +
 .../processor/CustomScheduledRoutePolicyTest.java  |    2 +
 .../camel/processor/DataFormatFactoryTest.java     |    2 +
 .../camel/processor/DataFormatServiceTest.java     |    3 +
 .../org/apache/camel/processor/DataFormatTest.java |    3 +
 .../DeadLetterChannelAlwaysHandledTest.java        |    2 +
 ...ChannelBuilderWithInvalidDeadLetterUriTest.java |    3 +
 .../DeadLetterChannelCatchThrowableTest.java       |    2 +
 ...dLetterChannelExceptionCausePropagatedTest.java |    2 +
 .../DeadLetterChannelFailureRouteIdTest.java       |    2 +
 .../DeadLetterChannelHandleNewExceptionTest.java   |    3 +
 .../DeadLetterChannelHandledExampleTest.java       |    3 +
 ...etterChannelLogExhaustedMessageHistoryTest.java |    2 +
 ...nnelLogExhaustedMessageHistoryWithBodyTest.java |    2 +
 .../DeadLetterChannelNewExceptionTest.java         |    2 +
 .../DeadLetterChannelNoRedeliveryTest.java         |    2 +
 ...DeadLetterChannelNotHandleNewExceptionTest.java |    2 +
 ...adLetterChannelOnExceptionOnRedeliveryTest.java |    8 +-
 .../processor/DeadLetterChannelOnPrepareTest.java  |    2 +
 .../DeadLetterChannelOnRedeliveryTest.java         |    8 +-
 ...dLetterChannelPropagateCausedExceptionTest.java |    6 +
 ...etterChannelRedeliverWithDelayBlockingTest.java |    2 +
 ...LetterChannelRedeliveringWhileShutdownTest.java |    2 +
 ...eadLetterChannelRedeliveryDelayPatternTest.java |    3 +
 .../processor/DeadLetterChannelRedeliveryTest.java |    4 +
 .../DeadLetterChannelRestartFromBeginningTest.java |    2 +
 .../processor/DeadLetterChannelSetHeaderTest.java  |    2 +
 .../camel/processor/DeadLetterChannelTest.java     |    9 +-
 .../DeadLetterChannelUnmarshalSetHeaderTest.java   |    2 +
 .../DeadLetterChannelUseOriginalInBodyTest.java    |    3 +
 ...LetterChannelUseOriginalInBodyWithFileTest.java |    7 +-
 ...tConsumerBridgeErrorHandlerOnExceptionTest.java |    2 +
 ...ltConsumerBridgeErrorHandlerRedeliveryTest.java |    2 +
 .../DefaultConsumerBridgeErrorHandlerTest.java     |    2 +
 .../DefaultErrorHandlerCatchThrowableTest.java     |    2 +
 .../DefaultErrorHandlerFailureRouteIdTest.java     |    2 +
 ...ErrorHandlerLogExhaustedMessageHistoryTest.java |    2 +
 .../DefaultErrorHandlerOnExceptionTest.java        |    3 +
 .../DefaultErrorHandlerOnExceptionTraceTest.java   |    3 +
 .../DefaultErrorHandlerOnPrepareTest.java          |    2 +
 .../DefaultErrorHandlerRedeliveryTest.java         |    4 +
 .../camel/processor/DefaultErrorHandlerTest.java   |    4 +
 ...cheduledPollConsumerBridgeErrorHandlerTest.java |    2 +
 .../DefinitionPolicyPerProcessorTest.java          |    2 +
 .../camel/processor/DelayInterceptorTest.java      |    2 +
 .../camel/processor/DelayerAsyncDelayedTest.java   |    3 +
 .../camel/processor/DelayerPerRouteTest.java       |    2 +
 .../org/apache/camel/processor/DelayerTest.java    |    5 +
 .../camel/processor/DelayerWhileShutdownTest.java  |    2 +
 .../org/apache/camel/processor/DetourTest.java     |    3 +
 .../processor/DoTryCatchWithSplitterTest.java      |    2 +
 .../DoubleLoadBalancerMisconfigurationTest.java    |    4 +
 .../apache/camel/processor/DualPipelineTest.java   |    2 +
 .../apache/camel/processor/DynamicRouter2Test.java |    2 +
 .../apache/camel/processor/DynamicRouter3Test.java |    2 +
 .../apache/camel/processor/DynamicRouter4Test.java |    2 +
 .../processor/DynamicRouterAnnotationTest.java     |    2 +
 .../DynamicRouterExchangeHeaders2Test.java         |    2 +
 .../DynamicRouterExchangeHeadersTest.java          |    2 +
 .../DynamicRouterExchangePropertiesTest.java       |    2 +
 .../processor/DynamicRouterOnExceptionTest.java    |    4 +
 .../apache/camel/processor/DynamicRouterTest.java  |    2 +
 ...amicRouterThrowExceptionFromExpressionTest.java |    2 +
 ...point2MustBeStartedBeforeSendProcessorTest.java |    5 +
 ...dpointMustBeStartedBeforeSendProcessorTest.java |    5 +
 .../camel/processor/EnrichSubUnitOfWorkTest.java   |    3 +
 ...HandlerOnExceptionRedeliveryAndHandledTest.java |    2 +
 .../camel/processor/ErrorHandlerSupportTest.java   |   10 +-
 .../apache/camel/processor/ErrorHandlerTest.java   |    3 +
 .../processor/ErrorHandlerWrappedEachNodeTest.java |    2 +
 .../processor/EvaluateExpressionProcessorTest.java |    3 +
 .../EventNotifierExchangeSentExampleTest.java      |    2 +
 .../processor/ExceptionHandlerStreamCacheTest.java |   10 +-
 .../processor/ExchangeCreatedTimestampTest.java    |    2 +
 .../processor/ExchangeIdempotentConsumerTest.java  |    7 +-
 .../processor/FailOverAllFailedExceptionTest.java  |    7 +-
 .../FailOverLoadBalanceAutoStartupFalseTest.java   |    2 +
 .../FailOverLoadBalanceMultipleExceptionTest.java  |    7 +-
 ...verLoadBalanceNotInheritedErrorHandlerTest.java |    2 +
 .../camel/processor/FailOverLoadBalanceTest.java   |    8 +-
 .../FailOverLoadBalanceWithRedeliveryTest.java     |    2 +
 ...lOverLoadBalanceWrappedExceptionNoLuckTest.java |    7 +-
 .../FailOverLoadBalanceWrappedExceptionTest.java   |    7 +-
 .../FailOverLoadBalancerSetFaultTest.java          |    2 +
 .../processor/FailOverNotCatchedExceptionTest.java |    7 +-
 ...overLoadBalancerBreakoutDuringShutdownTest.java |    2 +
 .../FailoverMaximumFailoverAttemptsTest.java       |    2 +
 .../processor/FailoverRoundRobinGoodBadTest.java   |    2 +
 .../processor/FailoverRoundRobinStickyTest.java    |    2 +
 .../camel/processor/FailoverRoundRobinTest.java    |    2 +
 .../apache/camel/processor/FailoverStickyTest.java |    2 +
 .../camel/processor/FaultRetryRouteTest.java       |    7 +-
 .../org/apache/camel/processor/FaultRouteTest.java |    8 +-
 .../camel/processor/FileIdempotentClearTest.java   |    7 +-
 .../FileIdempotentConsumerLoadStoreTest.java       |    7 +-
 .../processor/FileIdempotentConsumerTest.java      |    7 +-
 .../camel/processor/FileIdempotentRemoveTest.java  |    7 +-
 .../processor/FileIdempotentTrunkStoreTest.java    |    7 +-
 .../processor/FileRollbackOnCompletionTest.java    |    6 +-
 .../camel/processor/FilterBeforeSplitTest.java     |    3 +
 .../camel/processor/FilterNotMatchedTest.java      |    3 +
 .../org/apache/camel/processor/FilterNotTest.java  |    3 +
 .../org/apache/camel/processor/FilterTest.java     |    3 +
 .../camel/processor/FlipRoutePolicyTest.java       |    2 +
 .../apache/camel/processor/FromToInOutTest.java    |    2 +
 .../camel/processor/GenericXmlTokenizeTest.java    |    3 +
 .../camel/processor/HandleFaultPerRouteTest.java   |    2 +
 .../processor/IdempotentConsumerAsyncTest.java     |    9 +-
 .../IdempotentConsumerCompletionEagerTest.java     |    8 +-
 .../IdempotentConsumerConcurrentTest.java          |   10 +-
 .../camel/processor/IdempotentConsumerDslTest.java |    2 +
 .../processor/IdempotentConsumerEagerTest.java     |   11 +-
 .../IdempotentConsumerNoMessageIdTest.java         |    7 +-
 .../IdempotentConsumerRemoveOnFailureTest.java     |    7 +-
 .../IdempotentConsumerRepoExceptionTest.java       |    2 +
 .../camel/processor/IdempotentConsumerTest.java    |   12 +-
 ...dempotentConsumerUsingCustomRepositoryTest.java |    7 +-
 .../processor/InheritErrorHandlerDefaultTest.java  |    2 +
 .../processor/InheritErrorHandlerFalseTest.java    |    2 +
 .../processor/InheritErrorHandlerTrueTest.java     |    2 +
 .../camel/processor/InlinedProcessorIdTest.java    |    2 +
 .../org/apache/camel/processor/JoinRoutesTest.java |    7 +-
 .../camel/processor/LanguageBuilderTest.java       |    2 +
 .../processor/LogEipPropagateExceptionTest.java    |    3 +
 .../apache/camel/processor/LogProcessorTest.java   |    6 +
 .../LogProcessorWithProvidedLoggerTest.java        |    4 +-
 .../apache/camel/processor/LogPropertiesTest.java  |    2 +
 .../apache/camel/processor/LoopCopyErrorTest.java  |    2 +
 .../org/apache/camel/processor/LoopCopyTest.java   |    2 +
 .../apache/camel/processor/LoopDoWhileTest.java    |    3 +
 .../apache/camel/processor/LoopExceptionTest.java  |    2 +
 .../org/apache/camel/processor/LoopNoCopyTest.java |    2 +
 .../java/org/apache/camel/processor/LoopTest.java  |   12 +-
 .../camel/processor/LoopWithAggregatorTest.java    |    2 +
 .../org/apache/camel/processor/MDCAsyncTest.java   |    5 +-
 .../processor/MDCOnCompletionOnCompletionTest.java |    2 +
 .../camel/processor/MDCOnCompletionTest.java       |    3 +
 .../org/apache/camel/processor/MDCResetTest.java   |    3 +
 .../java/org/apache/camel/processor/MDCTest.java   |    3 +
 .../org/apache/camel/processor/MDCWireTapTest.java |    2 +
 .../camel/processor/MarkRollbackOnlyTest.java      |    2 +
 .../processor/MessageHistoryCopyExchangeTest.java  |    2 +
 .../processor/MessageHistoryDumpRoutingTest.java   |    2 +
 .../apache/camel/processor/MethodFilterTest.java   |    3 +
 .../MultiCastParallelAndStreamCachingTest.java     |    8 +
 .../MultiCastStreamCachingInSubRouteTest.java      |    3 +
 .../MultiErrorHandlerInRouteNotHandledTest.java    |    4 +
 .../processor/MultiErrorHandlerInRouteTest.java    |    4 +
 .../processor/MulticastCompletedPropertyTest.java  |    2 +
 .../MulticastCopyOfSplitSubUnitOfWorkTest.java     |    3 +
 .../apache/camel/processor/MulticastDslTest.java   |    2 +
 .../MulticastFineGrainedErrorHandlingTest.java     |    3 +
 .../MulticastGroupedExchangeExceptionTest.java     |    5 +-
 .../MulticastKeepOriginalMessageUnchangedTest.java |    2 +
 .../camel/processor/MulticastNoOnPrepareTest.java  |    2 +
 .../processor/MulticastNoStopOnExceptionTest.java  |    3 +
 .../camel/processor/MulticastOnPrepareTest.java    |    2 +
 .../MulticastParallelAllTimeoutAwareTest.java      |    4 +-
 .../MulticastParallelFailureEndpointTest.java      |    3 +
 ...ticastParallelFineGrainedErrorHandlingTest.java |    3 +
 .../MulticastParallelLastTimeoutTest.java          |    2 +
 .../MulticastParallelMiddleTimeoutTest.java        |    2 +
 .../MulticastParallelNoStopOnExceptionTest.java    |   12 +-
 .../MulticastParallelStopOnExceptionTest.java      |   12 +-
 .../processor/MulticastParallelStreamingTest.java  |    3 +
 .../MulticastParallelStreamingTimeoutTest.java     |    2 +
 .../MulticastParallelStreamingTwoTimeoutTest.java  |    2 +
 .../processor/MulticastParallelStressTest.java     |    4 +
 .../camel/processor/MulticastParallelTest.java     |    3 +
 .../processor/MulticastParallelTimeout2Test.java   |    2 +
 .../processor/MulticastParallelTimeout3Test.java   |    2 +
 .../MulticastParallelTimeoutAwareTest.java         |    4 +-
 .../processor/MulticastParallelTimeoutTest.java    |    2 +
 .../MulticastParallelTwoTimeoutMiddleTest.java     |    2 +
 .../processor/MulticastParallelTwoTimeoutTest.java |    2 +
 .../camel/processor/MulticastPipelineTest.java     |    5 +
 .../camel/processor/MulticastRedeliverTest.java    |    4 +
 ...castStopOnExceptionLastWithOnExceptionTest.java |    2 +
 .../processor/MulticastStopOnExceptionTest.java    |    3 +
 ...ulticastStopOnExceptionWithOnExceptionTest.java |    3 +
 .../processor/MulticastStreamCachingTest.java      |    7 +-
 .../processor/MulticastSubUnitOfWorkTest.java      |    4 +
 .../org/apache/camel/processor/MulticastTest.java  |    7 +-
 .../camel/processor/MulticastUnitOfWorkTest.java   |    2 +
 .../processor/MulticastWithOnExceptionTest.java    |    3 +
 .../apache/camel/processor/NavigateRouteTest.java  |    2 +
 .../camel/processor/NestedChoiceIssueTest.java     |    4 +
 .../processor/NewProcessorAndServiceTest.java      |    2 +
 .../apache/camel/processor/NoErrorHandlerTest.java |    8 +-
 .../org/apache/camel/processor/NormalizerTest.java |    2 +
 ...deliveryWhileStoppingDeadLetterChannelTest.java |    2 +
 .../NotAllowRedeliveryWhileStoppingTest.java       |    2 +
 ...letionAndInterceptAndOnExceptionGlobalTest.java |    3 +
 .../OnCompletionAndInterceptGlobalTest.java        |    3 +
 .../processor/OnCompletionAndInterceptTest.java    |    3 +
 .../camel/processor/OnCompletionAsyncTest.java     |    6 +
 .../camel/processor/OnCompletionContainsTest.java  |    2 +
 .../OnCompletionGlobalCustomPoolTest.java          |    9 +-
 .../camel/processor/OnCompletionGlobalTest.java    |    3 +
 .../processor/OnCompletionGlobalTraceTest.java     |    3 +
 .../OnCompletionInvalidConfiguredTest.java         |    2 +
 .../camel/processor/OnCompletionModeTest.java      |    3 +
 .../OnCompletionMoreGlobalRouteCompletionTest.java |    4 +
 .../processor/OnCompletionMoreGlobalTest.java      |    3 +
 .../processor/OnCompletionOnCompleteOnlyTest.java  |    2 +
 .../processor/OnCompletionOnFailureOnlyTest.java   |    2 +
 .../OnCompletionParallelProcessingTest.java        |    2 +
 ...ompletionRouteScopeOverrideGlobalScopeTest.java |    3 +
 .../processor/OnCompletionShouldBeLastTest.java    |    2 +
 .../OnCompletionShutdownProcessorTest.java         |    2 +
 .../apache/camel/processor/OnCompletionTest.java   |    3 +
 .../processor/OnCompletionUseOriginalBodyTest.java |    2 +
 .../camel/processor/OnCompletionWhenTest.java      |    3 +
 .../processor/OnExceptionContinueToRouteTest.java  |    2 +
 .../camel/processor/PipelineConcurrentTest.java    |    2 +
 .../apache/camel/processor/PipelineMEPTest.java    |    3 +
 .../camel/processor/PipelineStepWithEventTest.java |    2 +
 .../org/apache/camel/processor/PipelineTest.java   |   11 +-
 .../camel/processor/PolicyPerProcessorTest.java    |    2 +
 .../apache/camel/processor/PolicyPerRouteTest.java |    2 +
 .../ProcessorMutateExchangeRedeliverTest.java      |    3 +
 .../ProducerTemplateDisableEventNotifierTest.java  |    2 +
 .../RandomLoadBalanceJavaDSLBuilderTest.java       |    3 +
 .../camel/processor/RandomLoadBalanceTest.java     |    7 +-
 .../RecipeientListWithSimpleExpressionTest.java    |    8 +-
 .../RecipientListAggregationStrategyTest.java      |    2 +
 .../processor/RecipientListBeanOnPrepareTest.java  |    2 +
 .../RecipientListBeanSubUnitOfWorkTest.java        |    3 +
 .../camel/processor/RecipientListBeanTest.java     |    3 +
 ...pientListContextScopedOnExceptionIssueTest.java |    3 +
 .../RecipientListDoNotStopOnExceptionTest.java     |    2 +
 ...istExchangePropertyAggregationStrategyTest.java |    2 +
 .../RecipientListExchangePropertyTest.java         |    2 +
 .../RecipientListFineGrainedErrorHandlingTest.java |    5 +
 .../processor/RecipientListFunctionalTest.java     |    2 +
 .../RecipientListIgnoreInvalidEndpointsTest.java   |    4 +-
 ...cipientListInvalidEndpointErrorHandlerTest.java |    2 +
 ...tInvalidEndpointIgnoreInvalidEndpointsTest.java |    2 +
 .../camel/processor/RecipientListLeakTest.java     |    2 +
 .../camel/processor/RecipientListMEPTest.java      |    3 +
 .../processor/RecipientListMEPWithRawTest.java     |    2 +
 .../camel/processor/RecipientListNoCacheTest.java  |    2 +
 .../processor/RecipientListNoErrorHandlerTest.java |    2 +
 .../processor/RecipientListOnPrepareTest.java      |    2 +
 ...ntListParallelAggregateThreadPoolIssueTest.java |    2 +
 ...ntListParallelFineGrainedErrorHandlingTest.java |    4 +
 ...ParallelStopOnExceptionWithOnExceptionTest.java |    2 +
 .../RecipientListParallelStreamingTest.java        |    2 +
 .../camel/processor/RecipientListParallelTest.java |    2 +
 .../RecipientListParallelTimeoutTest.java          |    2 +
 .../processor/RecipientListRedeliverTest.java      |    4 +
 .../processor/RecipientListReturnValueTest.java    |    3 +
 .../RecipientListStopOnExceptionTest.java          |    2 +
 ...ientListStopOnExceptionWithOnExceptionTest.java |    2 +
 .../processor/RecipientListSubUnitOfWorkTest.java  |    3 +
 .../apache/camel/processor/RecipientListTest.java  |    2 +
 ...ipientListThrowExceptionFromExpressionTest.java |    2 +
 .../RecipientListThrowExceptionSubRouteTest.java   |    3 +
 .../RecipientListWithArrayHeaderTest.java          |    2 +
 .../processor/RecipientListWithDelimiterTest.java  |    4 +
 ...RecipientListWithStringDelimitedHeaderTest.java |    2 +
 ...cipientListWithStringDelimitedPropertyTest.java |    2 +
 .../camel/processor/RedeliverToSubRouteTest.java   |    2 +
 .../RedeliverWithExceptionAndFaultTest.java        |    4 +
 ...tterErrorHandlerNoRedeliveryOnShutdownTest.java |    2 +
 .../RedeliveryErrorHandlerBlockedDelayTest.java    |    2 +
 ...veryErrorHandlerBreakoutDuringShutdownTest.java |    2 +
 .../RedeliveryErrorHandlerLogHandledTest.java      |    8 +
 ...veryErrorHandlerNoRedeliveryOnShutdownTest.java |    2 +
 .../RedeliveryErrorHandlerNonBlockedDelayTest.java |    2 +
 ...ErrorHandlerNonBlockedRedeliveryHeaderTest.java |    2 +
 .../RedeliveryOnExceptionBlockedDelayTest.java     |    2 +
 .../RedeliveryPolicyDelayPatternTest.java          |    6 +-
 .../RedeliveryPolicyPerExceptionTest.java          |    8 +-
 ...StacksNeededDuringRoutingSendProcessorTest.java |    2 +
 .../ReduceStacksNeededDuringRoutingTest.java       |    2 +
 .../org/apache/camel/processor/RegExRouteTest.java |    2 +
 .../apache/camel/processor/RemoveHeaderTest.java   |    7 +-
 .../camel/processor/RemoveHeadersExcludeTest.java  |    3 +
 .../apache/camel/processor/RemoveHeadersTest.java  |    3 +
 .../RemovePropertiesWithExclusionTest.java         |    7 +-
 .../RemovePropertiesWithoutExclusionTest.java      |    7 +-
 .../apache/camel/processor/RemovePropertyTest.java |    7 +-
 ...ResequenceStreamIgnoreInvalidExchangesTest.java |    5 +
 ...equenceStreamNotIgnoreInvalidExchangesTest.java |    5 +
 .../ResequenceStreamRejectOldExchangesTest.java    |    5 +
 .../apache/camel/processor/ResequencerTest.java    |   13 +-
 .../camel/processor/RollbackCustomMessageTest.java |    2 +
 .../processor/RollbackDefaultErrorHandlerTest.java |    4 +
 .../processor/RollbackDefaultMessageTest.java      |    2 +
 .../org/apache/camel/processor/RollbackTest.java   |    4 +
 .../camel/processor/RoundRobinLoadBalanceTest.java |    8 +-
 .../camel/processor/RouteAutoStartupTest.java      |    7 +
 .../camel/processor/RouteAwareRouteTest.java       |    2 +
 .../processor/RouteAwareSynchronizationTest.java   |    2 +
 .../camel/processor/RouteContextProcessorTest.java |    2 +
 .../camel/processor/RouteFormattedUriTest.java     |    7 +-
 .../org/apache/camel/processor/RouteIdTest.java    |    3 +
 .../camel/processor/RouteMEPOptionalOutTest.java   |    6 +
 .../camel/processor/RouteNoAutoStartupTest.java    |    3 +
 .../camel/processor/RoutePerformanceCountTest.java |    2 +
 .../camel/processor/RoutePerformanceTest.java      |    3 +
 .../camel/processor/RoutePoliciesRefTest.java      |    2 +
 .../apache/camel/processor/RoutePoliciesTest.java  |    2 +
 .../processor/RouteServicesStartupOrderTest.java   |    2 +
 .../RouteShutdownNotReverseOrderTest.java          |    2 +
 .../processor/RouteShutdownReverseOrderTest.java   |    2 +
 .../processor/RouteStartupOrderClashTest.java      |    2 +
 .../RouteStartupOrderDirectReverseTest.java        |    2 +
 .../processor/RouteStartupOrderDirectTest.java     |    2 +
 .../processor/RouteStartupOrderSimpleTest.java     |    2 +
 ...StartupOrderSuspendResumeNoAutoStartupTest.java |    3 +
 .../RouteStartupOrderSuspendResumeTest.java        |    2 +
 .../camel/processor/RouteStartupOrderTest.java     |    2 +
 .../RouteStartupOrderWithDefaultTest.java          |    2 +
 .../org/apache/camel/processor/RouteStopTest.java  |    5 +
 .../processor/RouteTopLevelMisconfiguredTest.java  |    4 +
 ...RouteWithConstantFieldFromExchangeFailTest.java |    7 +-
 .../RouteWithConstantFieldFromExchangeTest.java    |    2 +
 ...utingSlipContextScopedOnExceptionIssueTest.java |    3 +
 .../apache/camel/processor/RoutingSlipDslTest.java |    2 +
 .../processor/RoutingSlipInOutAndInOnlyTest.java   |    3 +
 .../camel/processor/RoutingSlipNoCacheTest.java    |    2 +
 .../processor/RoutingSlipNoErrorHandlerTest.java   |    2 +
 .../RoutingSlipNoSuchEndpointExceptionTest.java    |    3 +
 .../camel/processor/RoutingSlipRedeliverTest.java  |    4 +
 ...outingSlipThrowExceptionFromExpressionTest.java |    2 +
 .../apache/camel/processor/SagaFailuresTest.java   |    5 +
 .../apache/camel/processor/SagaOptionsTest.java    |    4 +
 .../camel/processor/SagaPropagationTest.java       |    7 +
 .../java/org/apache/camel/processor/SagaTest.java  |    3 +
 .../apache/camel/processor/SagaTimeoutTest.java    |    3 +
 .../camel/processor/SamplingThrottlerTest.java     |    6 +
 .../apache/camel/processor/ScriptExternalTest.java |    7 +-
 .../org/apache/camel/processor/ScriptTest.java     |    7 +-
 .../processor/SendExchangePatternOptionTest.java   |    3 +
 .../camel/processor/SendToNoErrorHandlerTest.java  |    2 +
 .../processor/SendToNonExistingEndpointTest.java   |    2 +
 .../camel/processor/SetBodyProcessorTest.java      |    3 +
 .../camel/processor/SetExchangePatternTest.java    |   11 +
 .../org/apache/camel/processor/SetHeaderTest.java  |    2 +
 .../SetHeaderUsingDslExpressionsTest.java          |   13 +-
 .../apache/camel/processor/SetPropertyTest.java    |    7 +-
 .../processor/ShutdownCompleteAllTasksTest.java    |    7 +-
 .../ShutdownCompleteCurrentTaskOnlyTest.java       |    7 +-
 .../apache/camel/processor/ShutdownDeferTest.java  |    7 +-
 .../camel/processor/ShutdownNotDeferTest.java      |    7 +-
 .../ShutdownSedaAndDirectEndpointTest.java         |    2 +
 .../apache/camel/processor/SimpleDirectTest.java   |    2 +
 .../camel/processor/SimpleMockSampleTest.java      |    3 +
 .../org/apache/camel/processor/SimpleMockTest.java |    3 +
 .../processor/SimpleProcessorIdAwareTest.java      |    2 +
 .../camel/processor/SimpleProcessorTest.java       |    2 +
 .../processor/SimpleProcessorTraceableTest.java    |    2 +
 .../camel/processor/SimpleResultTypeRouteTest.java |    3 +
 .../camel/processor/SimpleTryCatchFinallyTest.java |    2 +
 .../camel/processor/SimpleTryFinallyTest.java      |    2 +
 .../SimpleTryThrowExceptionFinallyTest.java        |    2 +
 .../org/apache/camel/processor/SimulatorTest.java  |    3 +
 .../org/apache/camel/processor/SortBodyTest.java   |    2 +
 .../apache/camel/processor/SortExpressionTest.java |    3 +
 .../camel/processor/SplitAggregateInOutTest.java   |    2 +
 .../camel/processor/SplitCustomExpressionTest.java |    2 +
 .../camel/processor/SplitGroupMultiLinesTest.java  |    2 +
 .../camel/processor/SplitGroupMultiXmlTest.java    |    7 +-
 .../processor/SplitGroupMultiXmlTokenTest.java     |    7 +-
 .../camel/processor/SplitGroupSkipFirstTest.java   |    3 +
 .../SplitGroupWrappedMultiXmlTokenTest.java        |    7 +-
 .../camel/processor/SplitIteratorNullTest.java     |    2 +
 .../camel/processor/SplitParallelTimeoutTest.java  |    4 +-
 .../processor/SplitRefCustomExpressionTest.java    |    2 +
 ...ubUnitOfWorkStopOnExceptionAndParallelTest.java |    3 +
 .../SplitSubUnitOfWorkStopOnExceptionTest.java     |    3 +
 .../camel/processor/SplitSubUnitOfWorkTest.java    |    3 +
 .../processor/SplitTokenizerGroupDynamicTest.java  |    3 +
 .../camel/processor/SplitTokenizerGroupTest.java   |    3 +
 .../processor/SplitTokenizerNamespaceTest.java     |    3 +
 .../apache/camel/processor/SplitTokenizerTest.java |    8 +
 .../processor/SplitTokenizerXmlMultilineTest.java  |    3 +
 .../camel/processor/SplitTwoSubUnitOfWorkTest.java |    3 +
 .../apache/camel/processor/SplitWithEndTest.java   |    3 +
 .../camel/processor/SplitterCollateTest.java       |    2 +
 .../processor/SplitterCompletedPropertyTest.java   |    3 +
 .../camel/processor/SplitterMethodCallTest.java    |    2 +
 .../SplitterNoAggregationStrategyTest.java         |    3 +
 .../processor/SplitterNoStopOnExceptionTest.java   |    3 +
 .../camel/processor/SplitterNullBodyTest.java      |    7 +
 .../camel/processor/SplitterOnCompletionTest.java  |    3 +
 .../processor/SplitterOnPrepareExceptionTest.java  |    2 +
 .../camel/processor/SplitterOnPrepareTest.java     |    2 +
 .../processor/SplitterParallelAggregateTest.java   |    4 +
 .../processor/SplitterParallelBigFileTest.java     |    7 +-
 .../SplitterParallelNoStopOnExceptionTest.java     |   12 +-
 .../SplitterParallelStopOnExceptionTest.java       |   12 +-
 ...ParallelStopOnExceptionWithOnExceptionTest.java |    5 +
 .../apache/camel/processor/SplitterPojoTest.java   |    3 +
 .../processor/SplitterPropertyContinuedTest.java   |    2 +
 ...SplitterShareUnitOfWorkCompletionAwareTest.java |    2 +
 .../apache/camel/processor/SplitterSkipTest.java   |    4 +
 .../processor/SplitterStopOnExceptionTest.java     |    3 +
 ...SplitterStopOnExceptionWithOnExceptionTest.java |    5 +
 .../camel/processor/SplitterStreamCacheTest.java   |    3 +
 .../SplitterStreamCachingInSubRouteTest.java       |    4 +
 .../SplitterStreamingErrorHandlingTest.java        |    3 +
 ...rStreamingStopOnExceptionErrorHandlingTest.java |    3 +
 .../processor/SplitterStreamingUoWIssueTest.java   |    8 +-
 .../SplitterStreamingWithErrorHandlerTest.java     |    2 +
 .../org/apache/camel/processor/SplitterTest.java   |   12 +
 .../SplitterThrowExceptionFromExpressionTest.java  |    2 +
 .../camel/processor/SplitterUoWIssueTest.java      |    8 +-
 .../processor/SplitterUseOriginalLoopTest.java     |    2 +
 ...litterUseOriginalNotPropagateExceptionTest.java |    2 +
 .../processor/SplitterWireTapStreamCacheTest.java  |    7 +-
 .../SplitterWithCustomThreadPoolExecutorTest.java  |    2 +
 .../processor/SplitterWithDualMulticastTest.java   |    2 +
 .../camel/processor/SplitterWithMulticastTest.java |    2 +
 .../SplitterWithScannerIoExceptionTest.java        |    2 +
 .../camel/processor/SplitterWithXqureyTest.java    |    2 +
 .../camel/processor/StickyLoadBalanceTest.java     |    7 +-
 .../StreamCachingCustomShouldSpoolRuleTest.java    |    7 +-
 .../camel/processor/StreamCachingInOutTest.java    |    2 +
 .../processor/StreamCachingOnlyRouteTest.java      |    3 +
 .../camel/processor/StreamCachingPerRouteTest.java |    3 +
 .../processor/StreamCachingRecipientListTest.java  |    2 +
 .../processor/StreamCachingRoutingSlipTest.java    |    2 +
 .../processor/StreamCachingXPathRouteTest.java     |    2 +
 .../camel/processor/StreamResequencerTest.java     |    5 +
 .../StreamSourceContentBasedRouterTest.java        |    8 +-
 .../ThreadsCoreAndMaxPoolInvalidTest.java          |    2 +
 .../ThreadsCoreAndMaxPoolKeepAliveTimeTest.java    |    2 +
 .../camel/processor/ThreadsCoreAndMaxPoolTest.java |    3 +
 .../camel/processor/ThreadsCorePoolTest.java       |    3 +
 .../apache/camel/processor/ThreadsDefaultTest.java |    2 +
 .../camel/processor/ThreadsInvalidConfigTest.java  |    9 +
 .../camel/processor/ThreadsMaxQueueSizeTest.java   |    3 +
 .../processor/ThreadsRejectedExecutionTest.java    |    8 +
 .../camel/processor/ThreadsRejectedPolicyTest.java |    3 +
 .../camel/processor/ThreadsRequestReplyTest.java   |    2 +
 .../processor/ThreadsZeroInCoreAndMaxPoolTest.java |    3 +
 .../ThrottlerAsyncDelayedCallerRunsTest.java       |    2 +
 .../camel/processor/ThrottlerAsyncDelayedTest.java |    3 +
 .../apache/camel/processor/ThrottlerDslTest.java   |    2 +
 .../processor/ThrottlerInvalidConfiguredTest.java  |    2 +
 .../camel/processor/ThrottlerMethodCallTest.java   |    2 +
 .../camel/processor/ThrottlerNullEvalTest.java     |    5 +
 .../org/apache/camel/processor/ThrottlerTest.java  |    9 +-
 .../processor/ThrottlerThreadPoolProfileTest.java  |    2 +
 .../camel/processor/ThrottlingGroupingTest.java    |    8 +-
 .../ThrottlingInflightRoutePolicyTest.java         |    2 +
 .../camel/processor/ThroughPutLoggerTest.java      |    6 +-
 .../camel/processor/ThrowExceptionMessageTest.java |    2 +
 .../processor/ThrowExceptionNullMessageTest.java   |    2 +
 .../apache/camel/processor/ThrowExceptionTest.java |    2 +
 .../apache/camel/processor/ToDynamicEmptyTest.java |    3 +
 .../camel/processor/ToDynamicIgnoreTest.java       |    3 +
 ...DynamicLanguageSimpleAndXPathAndHeaderTest.java |    2 +
 .../ToDynamicLanguageSimpleAndXPathTest.java       |    2 +
 .../processor/ToDynamicLanguageXPathTest.java      |    2 +
 .../camel/processor/ToDynamicRawAndXPathTest.java  |    2 +
 .../apache/camel/processor/ToDynamicRawTest.java   |    2 +
 .../processor/ToDynamicSendDynamicAwareTest.java   |    2 +
 .../org/apache/camel/processor/ToDynamicTest.java  |    3 +
 .../camel/processor/ToEndpointPropertyTest.java    |   10 +
 .../camel/processor/TopicLoadBalanceTest.java      |    8 +-
 .../apache/camel/processor/TraceDelayerTest.java   |    2 +
 .../camel/processor/TraceInterceptorTest.java      |    2 +
 .../camel/processor/TracePerRouteManualTest.java   |    2 +
 .../apache/camel/processor/TracePerRouteTest.java  |    2 +
 .../camel/processor/TraceableUnitOfWorkTest.java   |    2 +
 .../camel/processor/TracerConfigurationTest.java   |    2 +
 .../processor/TransformBeanExceptionTest.java      |    2 +
 .../TransformProcessorWithHeaderTest.java          |    2 +
 .../org/apache/camel/processor/TransformTest.java  |    7 +-
 .../processor/TransformToInvalidEndpointTest.java  |    2 +
 .../apache/camel/processor/TransformToTest.java    |    3 +
 .../camel/processor/TransformViaDSLTest.java       |    7 +-
 .../apache/camel/processor/TransformXpathTest.java |    2 +
 .../processor/TripleNestedChoiceIssueTest.java     |    5 +
 .../TryCatchCaughtExceptionFinallyTest.java        |    2 +
 .../processor/TryCatchCaughtExceptionTest.java     |    2 +
 .../TryCatchCaughtExceptionTwoTimesTest.java       |    2 +
 .../processor/TryCatchContinueToRouteTest.java     |    2 +
 .../TryCatchMustHaveExceptionConfiguredTest.java   |    2 +
 .../camel/processor/TryCatchNestedChoiceTest.java  |    4 +
 .../camel/processor/TryCatchRecipientListTest.java |    6 +
 .../processor/TryFinallyCaughtExceptionTest.java   |    2 +
 .../TryProcessorHandleWrappedExceptionTest.java    |    2 +
 .../camel/processor/TryProcessorHandledTest.java   |    4 +
 .../TryProcessorMultipleExceptionTest.java         |    4 +
 .../camel/processor/TryProcessorOnWhenTest.java    |    6 +
 .../apache/camel/processor/TryProcessorTest.java   |    4 +
 .../camel/processor/TrySetFaultFinallyTest.java    |    2 +
 .../apache/camel/processor/TrySetFaultTest.java    |    2 +
 .../TypeConverterRegistryStatsPerformanceTest.java |   12 +-
 .../camel/processor/UnitOfWorkProducerTest.java    |    8 +-
 .../org/apache/camel/processor/UnitOfWorkTest.java |    9 +-
 .../processor/UnitOfWorkWithAsyncFlowTest.java     |    4 +-
 .../camel/processor/UnmarshalProcessorTest.java    |    5 +
 .../org/apache/camel/processor/ValidateIdTest.java |    2 +
 .../apache/camel/processor/ValidateRegExpTest.java |    8 +-
 .../apache/camel/processor/ValidateSimpleTest.java |    8 +-
 .../processor/ValidatingDomProcessorTest.java      |    7 +-
 .../ValidatingProcessorFromSourceTest.java         |    7 +-
 .../processor/ValidatingProcessorFromUrlTest.java  |    7 +-
 .../ValidatingProcessorNotUseSharedSchemaTest.java |   11 +-
 .../camel/processor/ValidatingProcessorTest.java   |   13 +-
 .../ValidationFinallyBlockNoCatchTest.java         |    8 +-
 .../processor/ValidationFinallyBlockTest.java      |    8 +-
 .../org/apache/camel/processor/ValidationTest.java |    9 +-
 .../camel/processor/VerySimpleDirectTest.java      |    2 +
 .../processor/WeightedRandomLoadBalanceTest.java   |   10 +-
 .../WeightedRoundRobinLoadBalanceTest.java         |   10 +-
 .../processor/WireTapBeanAsProcessorTest.java      |    7 +-
 .../apache/camel/processor/WireTapBeanTest.java    |    7 +-
 .../camel/processor/WireTapCustomPool2Test.java    |   11 +-
 .../camel/processor/WireTapCustomPoolTest.java     |   11 +-
 .../camel/processor/WireTapExpressionTest.java     |    2 +
 .../camel/processor/WireTapLogEndpointTest.java    |    2 +
 .../org/apache/camel/processor/WireTapLogTest.java |    2 +
 .../camel/processor/WireTapNewExchangeTest.java    |    2 +
 .../camel/processor/WireTapOnExceptionTest.java    |    2 +
 .../camel/processor/WireTapOnPrepareTest.java      |    2 +
 .../camel/processor/WireTapShutdownBeanTest.java   |    2 +
 .../camel/processor/WireTapShutdownRouteTest.java  |    2 +
 .../camel/processor/WireTapStreamCachingTest.java  |    5 +-
 .../org/apache/camel/processor/WireTapTest.java    |    8 +-
 ...WireTapUsingFireAndForgetCopyAsDefaultTest.java |    5 +
 .../WireTapUsingFireAndForgetCopyTest.java         |    5 +
 .../processor/WireTapUsingFireAndForgetTest.java   |    3 +
 .../camel/processor/WireTapUsingMulticastTest.java |    7 +-
 .../camel/processor/WireTapVoidBeanTest.java       |    2 +
 .../apache/camel/processor/XPathChoiceTest.java    |   10 +-
 .../apache/camel/processor/XPathFilterTest.java    |    3 +
 .../XPathWithNamespaceBuilderFilterTest.java       |    8 +-
 .../processor/XPathWithNamespacesFilterTest.java   |    8 +-
 .../aggregator/AbstractDistributedTest.java        |    5 +-
 ...ggregateAggregationStrategyIsPredicateTest.java |    2 +
 .../AggregateClosedCorrelationKeyTest.java         |    3 +
 .../aggregator/AggregateCompleteAllOnStopTest.java |    2 +
 ...yBatchConsumerSendEmptyMessageWhenIdleTest.java |    2 +
 ...gateCompletionAwareAggregationStrategyTest.java |    2 +
 .../AggregateCompletionIntervalTest.java           |    2 +
 .../aggregator/AggregateCompletionOnlyOneTest.java |    2 +
 .../aggregator/AggregateCompletionOnlyTwoTest.java |    2 +
 .../AggregateCompletionPredicateTest.java          |    5 +
 ...ggregateCompletionSizeAndBatchConsumerTest.java |    2 +
 ...gateCompletionSizeExpressionAndTimeoutTest.java |    2 +
 .../AggregateConcurrentPerCorrelationKeyTest.java  |    2 +
 .../aggregator/AggregateDiscardOnTimeoutTest.java  |    2 +
 .../processor/aggregator/AggregateDslTest.java     |    2 +
 .../AggregateEagerCheckCompletionTest.java         |    3 +
 .../AggregateExpressionSizeFallbackTest.java       |    2 +
 .../AggregateExpressionSizeOverrideFixedTest.java  |    2 +
 ...gateExpressionSizeOverrideFixedTimeoutTest.java |    2 +
 .../aggregator/AggregateExpressionSizeTest.java    |    2 +
 .../aggregator/AggregateExpressionTest.java        |    2 +
 .../AggregateExpressionTimeoutFallbackTest.java    |    2 +
 .../AggregateExpressionTimeoutPerGroupTest.java    |    2 +
 .../aggregator/AggregateExpressionTimeoutTest.java |    2 +
 .../AggregateForceCompletionOnStopTest.java        |    5 +
 .../aggregator/AggregateFromWireTapTest.java       |    2 +
 .../aggregator/AggregateGroupMessageTest.java      |    2 +
 .../AggregateGroupedExchangeBackwardsCompTest.java |    2 +
 .../AggregateGroupedExchangeBatchSizeTest.java     |    2 +
 ...roupedExchangeCompletionExpressionSizeTest.java |    2 +
 ...AggregateGroupedExchangeCompletionSizeTest.java |    2 +
 ...gateGroupedExchangeMultipleCorrelationTest.java |    2 +
 .../AggregateGroupedExchangeSizePredicateTest.java |    2 +
 .../AggregateGroupedExchangeSizeTest.java          |    2 +
 .../aggregator/AggregateGroupedExchangeTest.java   |    2 +
 .../AggregateIgnoreInvalidCorrelationKeysTest.java |    3 +
 .../aggregator/AggregateLostGroupIssueTest.java    |    2 +
 .../aggregator/AggregateMultipleSourceTest.java    |    2 +
 .../AggregateNewExchangeAndConfirmTest.java        |    2 +
 .../AggregateParallelProcessingTest.java           |    3 +
 .../AggregatePreCompleteAwareStrategyTest.java     |    2 +
 ...gregatePreCompleteAwareStrategyTimeoutTest.java |    4 +
 .../aggregator/AggregateProcessorTest.java         |   20 +-
 ...egateProcessorTimeoutCompletionRestartTest.java |    9 +-
 .../AggregateRepositoryReturnNullTest.java         |    2 +
 .../AggregateShouldSkipFilteredExchangesTest.java  |    2 +
 .../AggregateShutdownThreadPoolTest.java           |    3 +
 .../AggregateSimpleExpressionIssueTest.java        |    7 +-
 .../AggregateSimplePredicateEagerTest.java         |    2 +
 .../aggregator/AggregateSimplePredicateTest.java   |    2 +
 .../aggregator/AggregateSimpleSizeTest.java        |    2 +
 .../aggregator/AggregateSimpleTimeoutTest.java     |    2 +
 .../aggregator/AggregateStrategyServiceTest.java   |    2 +
 .../aggregator/AggregateThreadPoolProfileTest.java |    2 +
 .../aggregator/AggregateTimeoutManualTest.java     |    2 +
 .../aggregator/AggregateTimeoutOnlyTest.java       |    2 +
 .../processor/aggregator/AggregateTimeoutTest.java |    4 +-
 .../AggregateTimeoutWithExecutorServiceTest.java   |    2 +
 .../AggregateTimeoutWithNoExecutorServiceTest.java |    2 +
 .../AggregateUnknownExecutorServiceRefTest.java    |    2 +
 .../AggregationStrategyAsPredicateTest.java        |    2 +
 ...trategyBeanAdapterAllowNullOldExchangeTest.java |    2 +
 ...ggregationStrategyBeanAdapterAllowNullTest.java |    3 +
 ...tionStrategyBeanAdapterNonStaticMethodTest.java |    2 +
 ...ggregationStrategyBeanAdapterOneMethodTest.java |    2 +
 ...nAdapterPollEnrichAllowNullNewExchangeTest.java |    2 +
 ...gregationStrategyBeanAdapterPollEnrichTest.java |    3 +
 ...gationStrategyBeanAdapterRefMethodNameTest.java |    2 +
 .../AggregationStrategyBeanAdapterRefTest.java     |    2 +
 ...egationStrategyBeanAdapterStaticMethodTest.java |    2 +
 .../AggregationStrategyBeanAdapterTest.java        |    2 +
 ...egyBeanAdapterWithHeadersAndPropertiesTest.java |    2 +
 ...regationStrategyBeanAdapterWithHeadersTest.java |    2 +
 .../AggregationStrategyCompleteByPropertyTest.java |    2 +
 .../AggregationStrategyLifecycleTest.java          |    2 +
 .../aggregator/AggregatorAndOnExceptionTest.java   |    2 +
 .../aggregator/AggregatorConcurrencyTest.java      |    2 +
 .../aggregator/AggregatorExceptionHandleTest.java  |    3 +
 .../AggregatorExceptionInPredicateTest.java        |    3 +
 .../aggregator/AggregatorExceptionTest.java        |    2 +
 .../aggregator/AggregatorLockingTest.java          |    2 +
 .../camel/processor/aggregator/AggregatorTest.java |    5 +
 .../aggregator/AlbertoAggregatorTest.java          |    2 +
 .../aggregator/BeanBeforeAggregateIssueTest.java   |    2 +
 .../CustomAggregationStrategyServiceTest.java      |    2 +
 .../aggregator/CustomAggregationStrategyTest.java  |    2 +
 ...ionStrategyCompletionFromBatchConsumerTest.java |    2 +
 ...ustomListAggregationStrategyEmptySplitTest.java |    2 +
 .../CustomListAggregationStrategySplitTest.java    |    2 +
 .../CustomListAggregationStrategyTest.java         |    2 +
 .../DefaultAggregatorCollectionTest.java           |    2 +
 .../DistributedCompletionIntervalTest.java         |    3 +
 ...DistributedConcurrentPerCorrelationKeyTest.java |    2 +
 .../DistributedOptimisticLockFailingTest.java      |    3 +
 .../aggregator/DistributedTimeoutTest.java         |    4 +-
 .../EnricherRouteNumberOfProcessorTest.java        |    3 +
 .../aggregator/OptimisticLockRetryPolicyTest.java  |   10 +-
 .../PredicateAggregatorCollectionTest.java         |    2 +
 .../SplitRouteNumberOfProcessorTest.java           |    3 +
 ...yncDeadLetterChannelExecutorServiceRefTest.java |    2 +
 .../async/AsyncDeadLetterChannelTest.java          |    2 +
 .../async/AsyncDefaultErrorHandlerTest.java        |    2 +
 .../processor/async/AsyncEndpointCBRTest.java      |    2 +
 .../AsyncEndpointCustomAsyncInterceptorTest.java   |    2 +
 .../async/AsyncEndpointCustomInterceptorTest.java  |    2 +
 .../async/AsyncEndpointCustomRoutePolicyTest.java  |    2 +
 .../processor/async/AsyncEndpointDelayUoWTest.java |    2 +
 .../async/AsyncEndpointDoWhileLoopTest.java        |    2 +
 .../async/AsyncEndpointDualMulticastTest.java      |    2 +
 .../AsyncEndpointDualTopicLoadBalanceTest.java     |    2 +
 .../async/AsyncEndpointDynamicRouterTest.java      |    2 +
 .../processor/async/AsyncEndpointEnricherTest.java |    2 +
 .../AsyncEndpointEventNotifierSendingTest.java     |    2 +
 .../async/AsyncEndpointEventNotifierTest.java      |    2 +
 ...AsyncEndpointFailOverLoadBalanceMixed2Test.java |    2 +
 ...AsyncEndpointFailOverLoadBalanceMixed3Test.java |    2 +
 .../AsyncEndpointFailOverLoadBalanceMixedTest.java |    2 +
 ...ncEndpointFailOverLoadBalanceOnlyAsyncTest.java |    2 +
 ...ncEndpointFailedAfterDeadLetterChannelTest.java |    2 +
 ...EndpointFailedAfterOnExceptionContinueTest.java |    2 +
 ...cEndpointFailedAfterOnExceptionHandledTest.java |    2 +
 .../async/AsyncEndpointFailedAfterTest.java        |    2 +
 .../AsyncEndpointFailureProcessorContinueTest.java |    2 +
 .../async/AsyncEndpointFailureProcessorTest.java   |    2 +
 .../processor/async/AsyncEndpointFilterTest.java   |    2 +
 .../async/AsyncEndpointIdempotentConsumerTest.java |    2 +
 .../processor/async/AsyncEndpointLoopTest.java     |    2 +
 ...pointMulticastFineGrainedErrorHandlingTest.java |    3 +
 .../async/AsyncEndpointMulticastTest.java          |    2 +
 .../processor/async/AsyncEndpointPipelineTest.java |    2 +
 .../processor/async/AsyncEndpointPolicyTest.java   |    2 +
 .../async/AsyncEndpointRecipientList2Test.java     |    2 +
 .../async/AsyncEndpointRecipientList3Test.java     |    2 +
 .../async/AsyncEndpointRecipientList4Test.java     |    2 +
 .../async/AsyncEndpointRecipientListBean3Test.java |    2 +
 .../async/AsyncEndpointRecipientListBean4Test.java |    2 +
 .../async/AsyncEndpointRecipientListBeanTest.java  |    2 +
 ...tRecipientListFineGrainedErrorHandlingTest.java |    3 +
 .../AsyncEndpointRecipientListParallel2Test.java   |    2 +
 .../AsyncEndpointRecipientListParallel3Test.java   |    2 +
 .../AsyncEndpointRecipientListParallel4Test.java   |    2 +
 .../AsyncEndpointRecipientListParallel5Test.java   |    2 +
 .../AsyncEndpointRecipientListParallelTest.java    |    2 +
 .../async/AsyncEndpointRecipientListTest.java      |    2 +
 ...RedeliveryErrorHandlerNonBlockedDelay2Test.java |    2 +
 ...RedeliveryErrorHandlerNonBlockedDelay3Test.java |    2 +
 ...tRedeliveryErrorHandlerNonBlockedDelayTest.java |    2 +
 .../AsyncEndpointRoundRobinLoadBalanceTest.java    |    2 +
 .../async/AsyncEndpointRoutingSlip2Test.java       |    2 +
 .../async/AsyncEndpointRoutingSlip3Test.java       |    2 +
 .../async/AsyncEndpointRoutingSlipBean2Test.java   |    2 +
 .../async/AsyncEndpointRoutingSlipBean3Test.java   |    2 +
 ...syncEndpointRoutingSlipBeanNonBlockingTest.java |    2 +
 .../async/AsyncEndpointRoutingSlipBeanTest.java    |    2 +
 .../async/AsyncEndpointRoutingSlipTest.java        |    2 +
 .../processor/async/AsyncEndpointSamplingTest.java |    2 +
 .../async/AsyncEndpointSedaInOnlyTest.java         |    7 +-
 .../processor/async/AsyncEndpointSedaTest.java     |    2 +
 .../AsyncEndpointSingleTopicLoadBalanceTest.java   |    2 +
 ...cEndpointSplitFineGrainedErrorHandlingTest.java |    2 +
 .../processor/async/AsyncEndpointSplitTest.java    |    2 +
 ...pointSplitUseLatestAggregationStrategyTest.java |    2 +
 .../processor/async/AsyncEndpointStopTest.java     |    2 +
 .../async/AsyncEndpointSynchronousFalseTest.java   |    2 +
 .../async/AsyncEndpointSynchronousTest.java        |    2 +
 .../camel/processor/async/AsyncEndpointTest.java   |    2 +
 .../async/AsyncEndpointTransformTest.java          |    2 +
 .../async/AsyncEndpointTryCatchFinally2Test.java   |    2 +
 .../async/AsyncEndpointTryCatchFinally3Test.java   |    2 +
 .../async/AsyncEndpointTryCatchFinally4Test.java   |    2 +
 .../async/AsyncEndpointTryCatchFinally5Test.java   |    2 +
 .../async/AsyncEndpointTryCatchFinallyTest.java    |    2 +
 .../async/AsyncEndpointUoWFailedTest.java          |    2 +
 .../processor/async/AsyncEndpointUoWTest.java      |    2 +
 .../async/AsyncEndpointWithDelayerTest.java        |    2 +
 .../async/AsyncEndpointWithHandleFaultTest.java    |    2 +
 .../processor/async/AsyncEndpointWithJMXTest.java  |    2 +
 .../async/AsyncEndpointWithStreamCachingTest.java  |    2 +
 .../async/AsyncEndpointWithTracingTest.java        |    2 +
 ...FailureProcessorWithRedeliveryAndDelayTest.java |    2 +
 .../AsyncFailureProcessorWithRedeliveryTest.java   |    2 +
 .../processor/async/AsyncInOnlyEndpointTest.java   |    2 +
 .../apache/camel/processor/async/AsyncMDCTest.java |    4 +-
 .../async/AsyncNestedTripleChoiceIssueTest.java    |    5 +
 ...xceptionFailureProcessorWithRedeliveryTest.java |    2 +
 .../AsyncProcessorAwaitManagerInterruptTest.java   |    2 +
 ...sorAwaitManagerInterruptWithRedeliveryTest.java |    8 +-
 .../async/AsyncProcessorAwaitManagerTest.java      |    2 +
 .../camel/processor/async/AsyncProducerTest.java   |    2 +
 .../processor/async/AsyncRouteWithErrorTest.java   |    8 +-
 .../async/AsyncSedaInOnlyEndpointTest.java         |    2 +
 .../processor/async/AsyncTraceHandlerTest.java     |    2 +
 .../processor/async/AsyncTwoEndpointTest.java      |    2 +
 .../DynamicRouterConcurrentPOJOTest.java           |    2 +
 .../EnrichExpressionIgnoreInvalidEndpointTest.java |    2 +
 .../enricher/EnrichExpressionNoCacheTest.java      |    2 +
 .../processor/enricher/EnrichExpressionTest.java   |    2 +
 .../enricher/EnricherAggregateOnExceptionTest.java |    5 +
 .../EnricherDefaultAggregationStrategyTest.java    |    3 +
 .../camel/processor/enricher/EnricherDslTest.java  |    2 +
 .../processor/enricher/EnricherNoResourceTest.java |    2 +
 .../camel/processor/enricher/EnricherRefTest.java  |    2 +
 .../processor/enricher/EnricherSendEventTest.java  |    3 +
 .../camel/processor/enricher/EnricherTest.java     |   13 +-
 ...lEnrichExpressionIgnoreInvalidEndpointTest.java |    2 +
 .../enricher/PollEnrichExpressionNoCacheTest.java  |    2 +
 .../enricher/PollEnrichExpressionTest.java         |    2 +
 ...ollEnrichFileCustomAggregationStrategyTest.java |    5 +-
 ...llEnrichFileDefaultAggregationStrategyTest.java |    5 +-
 .../processor/enricher/PollEnrichNullBodyTest.java |    2 +
 .../PollEnricherAggregateOnExceptionTest.java      |    5 +
 .../enricher/PollEnricherNoResourceTest.java       |    4 +
 .../processor/enricher/PollEnricherRefTest.java    |    2 +
 .../camel/processor/enricher/PollEnricherTest.java |   11 +-
 .../CustomExceptionPolicyStrategyTest.java         |    2 +
 .../DefaultExceptionPolicyStrategyTest.java        |   17 +-
 ...ltExceptionPolicyStrategyUsingOnlyWhenTest.java |    3 +
 ...efaultExceptionPolicyStrategyUsingWhenTest.java |    3 +
 .../intercept/DualInterceptSimpleRouteTest.java    |    2 +
 .../InterceptFromEndpointInstanceTest.java         |    2 +
 .../intercept/InterceptFromEndpointRefTest.java    |    2 +
 .../intercept/InterceptFromEndpointRefUriTest.java |    2 +
 .../InterceptFromPropertyPlaceholderTest.java      |    2 +
 .../intercept/InterceptFromRouteTestSupport.java   |    2 +-
 .../intercept/InterceptFromSimpleLogTest.java      |    2 +
 .../InterceptFromSimplePredicateTest.java          |    3 +
 .../InterceptFromSimplePredicateWithStopTest.java  |    2 +
 .../intercept/InterceptFromSimpleRouteTest.java    |    2 +
 .../intercept/InterceptFromUriRegexTest.java       |    5 +
 .../intercept/InterceptFromUriSimpleLogTest.java   |    2 +
 .../InterceptFromUriWildcardHeaderUriTest.java     |    4 +
 .../intercept/InterceptFromUriWildcardTest.java    |    4 +
 .../intercept/InterceptFromWhenNoStopTest.java     |    3 +
 .../processor/intercept/InterceptFromWhenTest.java |    3 +
 .../intercept/InterceptFromWhenWithChoiceTest.java |    4 +
 ...nterceptSendToEndpointConditionalSkip2Test.java |    5 +
 ...nterceptSendToEndpointConditionalSkip3Test.java |    4 +
 ...InterceptSendToEndpointConditionalSkipTest.java |    5 +
 .../InterceptSendToEndpointDynamicTest.java        |   10 +-
 .../InterceptSendToEndpointMultipleRoutesTest.java |    2 +
 ...nterceptSendToEndpointNormalizePatternTest.java |    2 +
 ...rceptSendToEndpointServicePoolProducerTest.java |    2 +
 .../intercept/InterceptSendToEndpointTest.java     |    7 +
 .../InterceptSendToEndpointWithParametersTest.java |    2 +
 .../InterceptSendToEndpointWithStopTest.java       |    3 +
 .../intercept/InterceptSendToExceptionTest.java    |    2 +
 .../intercept/InterceptSendToFaultTest.java        |    2 +
 .../intercept/InterceptSimpleRouteStopTest.java    |    2 +
 .../intercept/InterceptSimpleRouteTest.java        |    2 +
 .../intercept/InterceptSimpleRouteTraceTest.java   |    2 +
 .../InterceptSimpleRouteWhenStopTest.java          |    3 +
 .../intercept/InterceptSimpleRouteWhenTest.java    |    2 +
 .../ParentChildInterceptStrategyTest.java          |    2 +
 .../interceptor/AdviceWithAutoStartupTest.java     |    2 +
 ...AdviceWithMockEndpointsHavingParameterTest.java |    3 +
 .../interceptor/AdviceWithMockEndpointsTest.java   |    4 +
 .../AdviceWithMockEndpointsWithSkipTest.java       |    2 +
 ...dviceWithMockMultipleEndpointsWithSkipTest.java |    2 +
 .../AdviceWithRecipientListMockEndpointsTest.java  |    2 +
 .../interceptor/AdviceWithReplaceFromTest.java     |    4 +
 .../interceptor/AdviceWithRouteIdTest.java         |    2 +
 .../interceptor/AdviceWithTasksMatchTest.java      |    2 +
 .../AdviceWithTasksOnExceptionTest.java            |    2 +
 .../interceptor/AdviceWithTasksSelectTest.java     |    9 +
 .../processor/interceptor/AdviceWithTasksTest.java |    6 +
 .../AdviceWithTasksToStringPatternTest.java        |    6 +
 .../processor/interceptor/AdviceWithTest.java      |    5 +
 .../interceptor/AdviceWithTryCatchTest.java        |    2 +
 .../AdviceWithTwoRoutesOnExceptionTest.java        |    4 +
 .../interceptor/AdviceWithTwoRoutesTest.java       |    4 +
 .../processor/interceptor/AdviceWithTypeTest.java  |    6 +
 .../AdviceWithWeaveAfterLastSplitTest.java         |    2 +
 .../AdviceWithWeaveByStringOnChoiceTest.java       |    2 +
 .../interceptor/AdviceWithWeaveFirstLastTest.java  |    3 +
 .../interceptor/AdviceWithWeaveLastCBRTest.java    |    3 +
 .../AdviceWithWeaveToUriAndAddLastTest.java        |    2 +
 .../AuditInterceptorAsyncDelegateIssueTest.java    |    8 +-
 .../AuditInterceptorDelegateIssueTest.java         |    8 +-
 .../CustomInterceptorRouteWithChildOutputTest.java |    2 +
 .../interceptor/DebugExceptionBreakpointTest.java  |    7 +-
 .../DebugExceptionEventBreakpointTest.java         |    7 +-
 .../interceptor/DebugSingleStepConditionTest.java  |    7 +-
 .../processor/interceptor/DebugSingleStepTest.java |    7 +-
 .../camel/processor/interceptor/DebugTest.java     |   10 +-
 ...aultTraceEventMessageCausedByExceptionTest.java |    2 +
 .../interceptor/DefaultTraceEventMessageTest.java  |    4 +
 .../interceptor/DefaultTraceFormatterTest.java     |    5 +
 .../InterceptorStrategyNotOrderedTest.java         |    2 +
 .../InterceptorStrategyOrderedTest.java            |    2 +
 .../processor/interceptor/NoStreamCachingTest.java |    9 +-
 .../interceptor/StreamCachingInterceptorTest.java  |   13 +-
 .../processor/interceptor/TraceFormatterTest.java  |    2 +
 .../interceptor/TraceInitIdOnAllNodesTest.java     |    2 +
 .../TraceInterceptorDestinationTest.java           |    2 +
 .../camel/processor/interceptor/TracerTest.java    |    7 +-
 .../interceptor/TracingRedeliveryIssueTest.java    |    6 +-
 .../processor/interceptor/TracingTestBase.java     |    4 +
 ...xtScopedOnExceptionCorrectRouteContextTest.java |    3 +
 ...ScopedOnExceptionLoadBalancerStopRouteTest.java |    5 +
 .../ContextScopedOnExceptionLogRouteTest.java      |    3 +
 ...efaultErrorHandlerExchangeFormatterRefTest.java |    2 +
 .../DefaultErrorHandlerRetryWhileTest.java         |    2 +
 .../onexception/DoCatchDirectDynamicRouteTest.java |    2 +
 .../DoCatchDirectRecipientListTest.java            |    2 +
 .../onexception/DoCatchDirectRouteTest.java        |    2 +
 .../LoggingErrorHandlerOnExceptionTest.java        |    3 +
 .../onexception/OnExceptionAfterRouteTest.java     |    2 +
 ...xceptionAndDLCErrorHandlerIssueReverseTest.java |    3 +
 .../OnExceptionAndDLCErrorHandlerIssueTest.java    |    3 +
 .../OnExceptionCallSubRouteNoErrorHandlerTest.java |    2 +
 .../onexception/OnExceptionComplexRouteTest.java   |   12 +-
 ...tionComplexWithNestedErrorHandlerRouteTest.java |    4 +
 ...rorHandlerRouteWithDefaultErrorHandlerTest.java |    2 +
 .../OnExceptionContinuePredicateTest.java          |    2 +
 .../OnExceptionContinueSubRouteTest.java           |    2 +
 .../OnExceptionContinueSubSubRouteTest.java        |    2 +
 .../onexception/OnExceptionContinueTest.java       |    2 +
 .../OnExceptionContinueTwoPredicateTest.java       |    2 +
 .../onexception/OnExceptionContinueTwoTest.java    |    2 +
 .../onexception/OnExceptionFromChoiceTest.java     |    9 +-
 .../OnExceptionFromChoiceUseOriginalBodyTest.java  |    9 +-
 ...onGlobalAndDLCErrorHandlerIssueReverseTest.java |    3 +
 ...ExceptionGlobalAndDLCErrorHandlerIssueTest.java |    3 +
 .../OnExceptionGlobalScopedRecursionTest.java      |    7 +
 .../OnExceptionHandleAndThrowNewExceptionTest.java |    2 +
 .../OnExceptionHandleAndTransformTest.java         |    4 +
 ...dleAndTransformWithDefaultErrorHandlerTest.java |    4 +
 .../OnExceptionHandledAndContinueTest.java         |    2 +
 .../onexception/OnExceptionHandledTest.java        |    2 +
 .../OnExceptionLoadBalancerDoubleIssueTest.java    |    2 +
 .../onexception/OnExceptionMisconfiguredTest.java  |   12 +
 ...nExceptionOccurredProcessorOnExceptionTest.java |    2 +
 .../OnExceptionOccurredProcessorTest.java          |    2 +
 ...ceptionProcessorInspectCausedExceptionTest.java |    2 +
 ...CausedExceptionWithDefaultErrorHandlerTest.java |    2 +
 .../onexception/OnExceptionRecursionTest.java      |    3 +
 .../onexception/OnExceptionRetryUntilTest.java     |    2 +
 ...ptionRetryUntilWithDefaultErrorHandlerTest.java |    2 +
 .../onexception/OnExceptionRouteIdTest.java        |    2 +
 .../OnExceptionRouteScopedRecursionTest.java       |    7 +
 .../onexception/OnExceptionRouteTest.java          |   10 +-
 ...nExceptionRouteWithDefaultErrorHandlerTest.java |   10 +-
 .../OnExceptionUseOriginalBodyTest.java            |    3 +
 .../OnExceptionUseOriginalMessageTest.java         |    3 +
 .../onexception/OnExceptionWhenSimpleOgnlTest.java |    2 +
 .../OnExceptionWireTapNewExchangeBodyTest.java     |    2 +
 .../OnExceptionWithRouteAndContinueTest.java       |    2 +
 .../OnExceptionWrappedExceptionTest.java           |    2 +
 .../onexception/OnExceptionsPerRouteTest.java      |    3 +
 .../onexception/RedeliverEntireRouteTest.java      |    2 +
 .../RouteScopedOnExceptionSameTypeTest.java        |   12 +
 .../resequencer/ResequencerBatchOrderTest.java     |    2 +
 .../resequencer/ResequencerEngineTest.java         |   13 +-
 .../resequencer/ResequencerFileNameTest.java       |    7 +-
 .../camel/processor/resequencer/SequenceTest.java  |   12 +-
 .../processor/resequencer/TestComparatorTest.java  |   13 +-
 .../DynamicRouterEventNotifierTest.java            |    2 +
 .../RecipientListEventNotifierTest.java            |    2 +
 .../RoutingSlipCreateProducerFailedTest.java       |    2 +
 .../RoutingSlipDataModificationTest.java           |    7 +-
 .../routingslip/RoutingSlipEventNotifierTest.java  |    2 +
 .../RoutingSlipIgnoreInvalidEndpointsTest.java     |    3 +
 .../processor/routingslip/RoutingSlipPOJOTest.java |    2 +
 .../processor/routingslip/RoutingSlipTest.java     |    8 +
 .../routingslip/RoutingSlipWithExceptionTest.java  |   11 +-
 .../validation/CatalogLSResourceResolver.java      |    1 +
 .../DefaultValidationErrorHandlerTest.java         |    7 +
 .../camel/runtimecatalog/JSonSchemaHelperTest.java |    3 +
 .../runtimecatalog/RuntimeCamelCatalogTest.java    |    1 -
 .../java/org/apache/camel/spi/ContainerTest.java   |   15 +-
 .../camel/support/DefaultTimeoutMapTest.java       |   14 +-
 .../camel/support/RecordableInputStreamTest.java   |    7 +-
 .../apache/camel/support/RecordableReaderTest.java |    7 +-
 .../apache/camel/support/ServiceSupportTest.java   |    5 +
 .../camel/support/TimerListenerManagerTest.java    |    2 +
 .../XMLTokenExpressionIteratorCharsetTest.java     |    8 +-
 .../XMLTokenExpressionIteratorGroupingTest.java    |   20 +-
 .../XMLTokenExpressionIteratorInvalidXMLTest.java  |    8 +-
 .../support/XMLTokenExpressionIteratorTest.java    |   37 +-
 .../org/apache/camel/util/AntPathMatcherTest.java  |    7 +-
 .../apache/camel/util/CamelContextHelperTest.java  |    7 +
 .../apache/camel/util/CamelVersionHelperTest.java  |    4 +-
 .../apache/camel/util/CaseInsensitiveMapTest.java  |   27 +-
 .../apache/camel/util/CollectionHelperTest.java    |   10 +-
 .../camel/util/CollectionStringBufferTest.java     |    8 +-
 .../util/DumpModelAsXmlAggregateRouteTest.java     |    2 +
 .../util/DumpModelAsXmlChoiceFilterRouteTest.java  |    3 +
 .../util/DumpModelAsXmlDanishCharactersTest.java   |    2 +
 .../camel/util/DumpModelAsXmlNamespaceTest.java    |    2 +
 .../camel/util/DumpModelAsXmlPlaceholdersTest.java |    2 +
 .../util/DumpModelAsXmlRouteExpressionTest.java    |    5 +
 .../util/DumpModelAsXmlRoutePredicateTest.java     |    5 +
 .../util/DumpModelAsXmlSplitBodyRouteTest.java     |    2 +
 ...umpModelAsXmlSplitNestedChoiceEndRouteTest.java |    2 +
 .../DumpModelAsXmlTransformRouteConstantTest.java  |    2 +
 .../DumpModelAsXmlTransformRouteLanguageTest.java  |    2 +
 .../util/DumpModelAsXmlTransformRouteTest.java     |    2 +
 .../org/apache/camel/util/EndpointHelperTest.java  |   10 +
 .../org/apache/camel/util/ExchangeHelperTest.java  |   20 +-
 .../camel/util/ExpressionListComparatorTest.java   |    2 +
 .../apache/camel/util/FilePathResolverTest.java    |    6 +-
 .../java/org/apache/camel/util/FileUtilTest.java   |   25 +-
 .../apache/camel/util/GroupTokenIteratorTest.java  |    9 +-
 .../java/org/apache/camel/util/IOHelperTest.java   |   18 +-
 .../org/apache/camel/util/InetAddressUtilTest.java |    6 +-
 .../camel/util/IntrospectionSupportTest.java       |   23 +
 .../org/apache/camel/util/KeyValueHolderTest.java  |   11 +-
 .../java/org/apache/camel/util/LRUCacheTest.java   |   14 +-
 .../org/apache/camel/util/LRUSoftCacheTest.java    |   11 +
 .../org/apache/camel/util/MessageHelperTest.java   |   22 +-
 .../NoClassDefFoundErrorWrapExceptionTest.java     |    2 +
 .../org/apache/camel/util/ObjectHelperTest.java    |   58 +-
 .../java/org/apache/camel/util/OgnlHelperTest.java |    9 +-
 .../apache/camel/util/OrderedComparatorTest.java   |   14 +-
 .../org/apache/camel/util/PackageHelperTest.java   |    6 +-
 .../camel/util/PredicateAssertHelperTest.java      |    4 +
 .../org/apache/camel/util/ResourceHelperTest.java  |   26 +-
 .../apache/camel/util/StingQuoteHelperTest.java    |    9 +-
 .../org/apache/camel/util/StringHelperTest.java    |   27 +-
 .../test/java/org/apache/camel/util/TimeTest.java  |    9 +-
 .../java/org/apache/camel/util/URISupportTest.java |   32 +
 .../java/org/apache/camel/util/UnitUtilsTest.java  |    6 +-
 .../camel/util/UnsafeCharactersEncoderTest.java    |   14 +-
 .../apache/camel/util/XmlLineNumberParserTest.java |    8 +-
 .../component/ApiMethodPropertiesHelperTest.java   |    1 +
 .../component/ArgumentSubstitutionParserTest.java  |    9 +-
 .../org/apache/camel/util/component/TestProxy.java |    4 +
 .../SizedScheduledExecutorServiceTest.java         |    6 +-
 .../SubmitOrderedCompletionServiceTest.java        |   23 +-
 .../concurrent/SynchronousExecutorServiceTest.java |    7 +-
 ...ndiCamelSingletonInitialContextFactoryTest.java |    8 +-
 .../java/org/apache/camel/util/jndi/JndiTest.java  |   10 +-
 .../util/jsse/AbstractJsseParametersTest.java      |    1 +
 .../camel/util/jsse/FilterParametersTest.java      |    5 +
 .../camel/util/jsse/KeyManagersParametersTest.java |    9 +
 .../camel/util/jsse/KeyStoreParametersTest.java    |    9 +
 .../camel/util/jsse/SSLContextParametersTest.java  |   19 +-
 .../util/jsse/SecureRandomParametersTest.java      |    5 +
 .../util/jsse/TrustManagersParametersTest.java     |    8 +
 .../component/ahc/ws/WsProducerConsumerTest.java   |    5 +-
 .../org/apache/camel/component/ahc/AhcBinding.java |    1 -
 .../apache/camel/component/ahc/AhcEndpoint.java    |    2 +-
 .../apache/camel/component/ahc/AhcProducer.java    |    3 +-
 .../camel/component/ahc/DefaultAhcBinding.java     |    1 -
 .../apache/camel/component/ahc/BaseAhcTest.java    |    1 -
 .../apache/camel/component/amqp/AMQPComponent.java |    1 +
 .../apache/camel/component/amqp/AMQPRouteTest.java |    1 -
 .../component/amqp/AMQPRouteTraceFrameTest.java    |    1 -
 .../amqp/artemis/AMQPEmbeddedBrokerTest.java       |    2 -
 .../component/apns/factory/ApnsServiceFactory.java |    5 +-
 .../camel/component/as2/api/AS2ClientManager.java  |   59 +-
 .../component/as2/api/AS2EncryptionAlgorithm.java  |   62 ++
 .../camel/component/as2/api/AS2MediaType.java      |    4 +
 .../component/as2/api/AS2ServerConnection.java     |   10 +-
 .../as2/api/entity/ApplicationPkcs7MimeEntity.java |   10 -
 .../component/as2/api/protocol/ResponseMDN.java    |    4 +-
 .../camel/component/as2/api/util/AS2Utils.java     |    2 +-
 .../component/as2/api/util/EncryptingUtils.java    |   65 ++
 .../camel/component/as2/api/util/MicUtils.java     |    5 +-
 .../camel/component/as2/api/util/SigningUtils.java |    8 +-
 .../camel/component/as2/api/AS2MessageTest.java    |  165 +++-
 .../component/as2/api/entity/EntityParserTest.java |  120 +++
 .../src/main/docs/as2-component.adoc               |   10 +-
 .../camel/component/as2/AS2Configuration.java      |   41 +
 .../as2/AS2ClientManagerIntegrationTest.java       |    1 -
 .../as2/AS2ServerManagerIntegrationTest.java       |    4 +-
 .../camel/component/asterisk/AsteriskProducer.java |    2 +-
 .../camel/component/atmos/AtmosEndpoint.java       |    8 +-
 .../camel/component/atmos/core/AtmosAPIFacade.java |    2 +-
 .../atmosphere/websocket/WebsocketProducer.java    |    2 +-
 .../atom/AtomEntryPollingConsumerTest.java         |    1 +
 .../AtomEntryPollingConsumerWithBasicAuthTest.java |    1 -
 .../camel/component/atom/AtomEntrySortTest.java    |    1 +
 .../atom/AtomPollingConsumerWithBasicAuthTest.java |    1 -
 .../apache/camel/component/atom/AtomRouteTest.java |    2 +-
 .../camel/component/atom/JettyTestServer.java      |    1 +
 .../atomix/cluster/AtomixClusterView.java          |    2 +-
 .../atomix/client/map/AtomixMapConsumerTest.java   |    3 +-
 .../client/map/AtomixMapNodesProducerTest.java     |    3 +-
 .../atomix/client/map/AtomixMapProducerTest.java   |    3 +-
 .../multimap/AtomixMultiMapProducerTest.java       |    3 +-
 .../client/queue/AtomixQueueConsumerTest.java      |    3 +-
 .../client/queue/AtomixQueueProducerTest.java      |    3 +-
 .../atomix/client/set/AtomixSetConsumerTest.java   |    3 +-
 .../atomix/client/set/AtomixSetProducerTest.java   |    3 +-
 .../client/value/AtomixValueConsumerTest.java      |    3 +-
 .../client/value/AtomixValueProducerTest.java      |    3 +-
 .../apache/camel/component/avro/AvroEndpoint.java  |    1 -
 .../camel/component/avro/AvroHttpProducer.java     |    1 -
 .../apache/camel/component/avro/AvroListener.java  |    2 +-
 .../camel/component/avro/AvroNettyProducer.java    |    1 -
 .../camel/avro/impl/KeyValueProtocolImpl.java      |    1 -
 .../component/avro/AvroConsumerTestSupport.java    |    1 -
 .../avro/AvroNettySpringConsumerTest.java          |    2 -
 .../avro/AvroNettySpringProducerTest.java          |    3 +-
 .../avro/AvroGenericMarshaAndUnmarshaTest.java     |    3 +-
 .../avro/AvroMarshalAndUnmarshalSpringTest.java    |    1 -
 .../avro/AvroMarshalAndUnmarshallTest.java         |    1 -
 .../camel/component/aws/xray/XRayTracer.java       |    2 +-
 .../src/main/docs/aws-kinesis-component.adoc       |    2 +-
 .../component/aws/ddbstream/DdbStreamConsumer.java |    2 +-
 .../camel/component/aws/ec2/EC2Producer.java       |    2 +-
 .../apache/camel/component/aws/s3/S3Consumer.java  |    4 +-
 .../camel/component/aws/sqs/SqsEndpoint.java       |    2 +-
 .../camel/component/aws/sqs/SqsProducer.java       |    2 +-
 .../aws/sqs/SqsComponentConfigurationTest.java     |   20 +
 .../camel/bam/processor/BamProcessorSupport.java   |    4 +-
 .../src/main/docs/base64-dataformat.adoc           |    4 +-
 .../bean/validator/BeanValidatorProducer.java      |    1 +
 .../HibernateValidationProviderResolver.java       |    1 +
 .../validator/BeanValidatorConfigurationTest.java  |    4 +-
 .../beanio/BeanIODataFormatComplexTest.java        |    3 -
 .../dataformat/bindy/BindyAbstractDataFormat.java  |    2 +-
 .../camel/dataformat/bindy/BindyCsvFactory.java    |   18 +-
 .../dataformat/bindy/BindyFixedLengthFactory.java  |    8 +-
 .../dataformat/bindy/BindyKeyValuePairFactory.java |   10 +-
 .../camel/dataformat/bindy/FormattingOptions.java  |    1 +
 .../bindy/annotation/FormatFactories.java          |    1 +
 .../format/factories/AbstractFormatFactory.java    |    1 +
 .../format/factories/BigDecimalFormatFactory.java  |    1 +
 .../factories/BigDecimalPatternFormatFactory.java  |    1 +
 .../format/factories/BigIntegerFormatFactory.java  |    1 +
 .../format/factories/BytePatternFormatFactory.java |    1 +
 .../format/factories/CharacterFormatFactory.java   |    1 +
 .../bindy/format/factories/DateFormatFactory.java  |    1 +
 .../format/factories/DefaultFactoryRegistry.java   |    1 +
 .../format/factories/DoubleFormatFactory.java      |    1 +
 .../factories/DoublePatternFormatFactory.java      |    1 +
 .../bindy/format/factories/FloatFormatFactory.java |    1 +
 .../factories/FloatPatternFormatFactory.java       |    1 +
 .../format/factories/FormatFactoryInterface.java   |    1 +
 .../factories/IntegerPatternFormatFactory.java     |    1 +
 .../format/factories/LocalDateFormatFactory.java   |    1 +
 .../factories/LocalDateTimeFormatFactory.java      |    1 +
 .../format/factories/LocalTimeFormatFactory.java   |    1 +
 .../format/factories/LongPatternFormatFactory.java |    1 +
 .../factories/ShortPatternFormatFactory.java       |    1 +
 .../factories/BigDecimalFormatFactoryTest.java     |    3 +-
 .../camel/blueprint/BlueprintCamelContext.java     |    8 +-
 .../camel/blueprint/CamelContextFactoryBean.java   |    2 +-
 .../blueprint/handler/CamelNamespaceHandler.java   |    6 +-
 .../box/api/BoxCollaborationsManager.java          |    8 +-
 .../component/box/api/BoxCommentsManager.java      |    6 +-
 .../camel/component/box/api/BoxFilesManager.java   |   24 +-
 .../camel/component/box/api/BoxFoldersManager.java |    8 +-
 .../camel/component/box/api/BoxGroupsManager.java  |   16 +-
 .../camel/component/box/api/BoxTasksManager.java   |   16 +-
 .../camel/component/box/api/BoxUsersManager.java   |   10 +-
 .../braintree/AbstractBraintreeTestSupport.java    |    1 -
 .../braintree/AddressGatewayIntegrationTest.java   |    3 +-
 .../braintree/DisputeGatewayIntegrationTest.java   |    1 -
 .../DocumentUploadGatewayIntegrationTest.java      |    1 -
 .../PaymentMethodGatewayIntegrationTest.java       |    3 +-
 .../braintree/ReportGatewayIntegrationTest.java    |    1 -
 .../TransactionGatewayIntegrationTest.java         |   10 +-
 .../camel/component/cache/CacheEndpoint.java       |    3 +-
 .../camel/component/cache/CacheEventListener.java  |    1 -
 .../camel/component/cache/CacheProducer.java       |    1 -
 .../component/cache/FileCacheManagerFactory.java   |    1 -
 .../cache/CacheBasedMessageBodyReplacer.java       |    1 -
 .../processor/cache/CacheBasedTokenReplacer.java   |    1 -
 .../processor/cache/CacheBasedXPathReplacer.java   |    2 +-
 .../camel/processor/cache/CacheValidate.java       |    1 -
 .../camel/component/cache/CacheProducerTest.java   |    1 -
 .../component/cache/CacheRegistryRefTest.java      |    4 +-
 .../component/cache/CacheRoutesManagementTest.java |    1 -
 .../cache/DefaultCacheManagerFactoryTest.java      |    3 +-
 .../camel/component/cache/EHCacheUtilTest.java     |    1 -
 .../component/caffeine/CaffeineConfiguration.java  |    1 -
 .../caffeine/cache/CaffeineCacheEndpoint.java      |    1 -
 .../caffeine/cache/CaffeineCacheProducer.java      |    1 -
 .../caffeine/load/CaffeineLoadCacheComponent.java  |    1 -
 .../caffeine/load/CaffeineLoadCacheEndpoint.java   |    1 -
 .../caffeine/load/CaffeineLoadCacheProducer.java   |    1 -
 .../aggregate/CaffeineAggregationRepository.java   |    2 +-
 .../idempotent/CaffeineIdempotentRepository.java   |    1 -
 .../CaffeineCacheFromScratchStatsCounterTest.java  |    1 -
 .../caffeine/cache/CaffeineCacheProducerTest.java  |    1 -
 .../CaffeineCacheRemovaListenerProducerTest.java   |    1 -
 .../caffeine/cache/CaffeineCacheTestSupport.java   |    1 -
 .../loadcache/CaffeineLoadCacheProducerTest.java   |    1 -
 .../loadcache/CaffeineLoadCacheTestSupport.java    |    1 -
 ...CaffeineAggregationRepositoryOperationTest.java |    3 +-
 .../CaffeineIdempotentRepositoryTest.java          |    1 -
 .../component/cassandra/CassandraEndpoint.java     |    1 -
 .../cassandra/CassandraAggregationRepository.java  |    4 +-
 .../cassandra/CassandraIdempotentRepository.java   |    1 -
 .../component/cassandra/BaseCassandraTest.java     |    1 -
 .../CassandraAggregationSerializedHeadersTest.java |    3 +-
 .../cassandra/CassandraAggregationTest.java        |    3 +-
 .../cassandra/CassandraIdempotentTest.java         |    3 +-
 .../chronicle/engine/ChronicleEngineComponent.java |    6 +-
 .../org/apache/camel/component/cm/CMEndpoint.java  |    4 +-
 .../org/apache/camel/component/cm/CMProducer.java  |    6 +-
 .../component/cm/test/CMConfigurationTest.java     |    1 -
 .../camel/component/cm/test/CMMessageTest.java     |    3 +-
 .../camel/component/cm/test/SMSMessageTest.java    |    3 +-
 .../component/consul/ConsulConfiguration.java      |    1 -
 .../camel/component/consul/ConsulRegistryTest.java |    1 -
 .../context/QualifiedContextComponent.java         |    4 +-
 .../apache/camel/core/osgi/OsgiClassResolver.java  |    4 +-
 .../apache/camel/core/osgi/OsgiNamingHelper.java   |    2 +-
 .../camel/core/osgi/OsgiServiceRegistry.java       |    2 +-
 .../core/xml/AbstractCamelContextFactoryBean.java  |    4 +-
 .../component/couchdb/CouchDbChangesetTracker.java |    2 +-
 .../crypto/cms/sig/SignedDataVerifier.java         |    2 +-
 .../component/crypto/cms/EnvelopedDataTest.java    |    1 -
 .../camel/component/crypto/cms/ProcessorsTest.java |    3 +-
 .../camel/component/crypto/cms/SignedDataTest.java |    1 -
 .../crypto/DefaultPGPSecretKeyAccessor.java        |    5 +-
 .../camel/converter/crypto/PGPDataFormatUtil.java  |    8 +-
 .../cxf/common/header/CxfHeaderFilterStrategy.java |    2 +-
 .../apache/camel/component/cxf/CxfConsumer.java    |    2 +-
 .../apache/camel/component/cxf/CxfEndpoint.java    |    2 +-
 .../apache/camel/component/cxf/CxfProducer.java    |    2 +-
 .../camel/component/cxf/DefaultCxfBinding.java     |    1 +
 .../blueprint/AbstractBeanDefinitionParser.java    |    1 +
 .../cxf/blueprint/RsClientDefinitionParser.java    |    1 +
 .../cxf/common/AbstractSslEndpointConfigurer.java  |    1 +
 .../cxf/converter/CxfPayloadConverter.java         |    1 +
 .../component/cxf/cxfbean/CxfBeanDestination.java  |    2 +-
 .../camel/component/cxf/jaxrs/CxfRsEndpoint.java   |    1 +
 .../camel/component/cxf/jaxrs/CxfRsProducer.java   |    2 +-
 .../component/cxf/jaxrs/DefaultCxfRsBinding.java   |    2 +-
 .../spring/AbstractCxfBeanDefinitionParser.java    |    2 +
 .../spring/CxfEndpointBeanDefinitionParser.java    |    1 +
 .../CxfRsClientFactoryBeanDefinitionParser.java    |    2 +
 .../CxfRsServerFactoryBeanDefinitionParser.java    |    2 +
 .../apache/camel/component/cxf/util/CxfUtils.java  |    1 +
 .../component/cxf/util/DataInInterceptor.java      |    2 +
 .../src/main/resources/META-INF/spring.schemas     |    1 +
 .../camel/component/cxf/CXFGreeterEnrichTest.java  |    1 -
 .../camel/component/cxf/CXFGreeterRouterTest.java  |    2 +-
 .../camel/component/cxf/CXFWsdlOnlyTest.java       |    1 -
 .../CxfConsumerPayloadFaultCauseEnabledTest.java   |    1 -
 .../component/cxf/CxfConsumerPayloadTest.java      |    1 +
 .../component/cxf/CxfConsumerStreamCacheTest.java  |    1 -
 .../component/cxf/CxfDispatchMessageTest.java      |    2 +
 .../component/cxf/CxfDispatchPayloadTest.java      |    1 +
 .../component/cxf/CxfDispatchTestSupport.java      |    1 +
 .../cxf/CxfGreeterCXFMessageRouterTest.java        |    1 -
 .../CxfGreeterCXFMessageWithoutSEIRouterTest.java  |    1 -
 .../cxf/CxfGreeterConverterRouterTest.java         |    2 -
 .../cxf/CxfGreeterMessageCamelHttpRouterTest.java  |    1 -
 .../component/cxf/CxfGreeterMessageRouterTest.java |    2 -
 .../component/cxf/CxfGreeterPayLoadRouterTest.java |    2 -
 .../CxfGreeterPayLoadWithFeatureRouterTest.java    |    2 -
 .../cxf/CxfGreeterWSDLOnlyRouterTest.java          |    2 -
 .../component/cxf/CxfJavaOnlyPayloadModeTest.java  |    1 +
 .../component/cxf/CxfMessageHeaderTimeoutTest.java |    1 -
 .../component/cxf/CxfMixedModeRouterTest.java      |    1 -
 .../camel/component/cxf/CxfOneWayRouteTest.java    |    1 -
 .../component/cxf/CxfPayLoadBareSoapTest.java      |    2 -
 ...CxfPayLoadMessageRouterAddressOverrideTest.java |    1 +
 .../cxf/CxfPayloadProviderRouterTest.java          |    1 -
 .../cxf/CxfPayloadWsdlWithoutSEITest.java          |    1 -
 .../camel/component/cxf/CxfProducerRouterTest.java |    1 -
 .../component/cxf/CxfProducerSessionTest.java      |    1 -
 .../cxf/CxfProducerSynchronousFalseTest.java       |    1 -
 .../component/cxf/CxfProducerSynchronousTest.java  |    1 -
 .../camel/component/cxf/CxfSimpleRouterTest.java   |    1 -
 .../cxf/CxfSimpleRouterWithUnwrappedStyleTest.java |    1 -
 .../apache/camel/component/cxf/CxfTimeoutTest.java |    1 -
 .../component/cxf/CxfWsdlFirstPayloadModeTest.java |    1 -
 .../component/cxf/CxfWsdlFirstProcessorTest.java   |    1 -
 .../camel/component/cxf/CxfWsdlFirstTest.java      |    1 -
 .../camel/component/cxf/FailOverFeatureTest.java   |    1 -
 .../component/cxf/LoadDistributorFeatureTest.java  |    1 -
 .../cxf/LoggingInterceptorInMessageModeTest.java   |    2 -
 .../cxf/converter/MyCxfCustomerConverter.java      |    2 +
 .../camel/component/cxf/cxfbean/CxfBeanTest.java   |    4 +-
 .../CxfRsConsumerSimpleBindingTest.java            |    5 +-
 .../cxf/jaxrs/testbean/CustomerService.java        |    1 +
 .../cxf/mtom/CxfMtomConsumerPayloadModeTest.java   |    1 +
 .../CxfMtomDisabledProducerPayloadModeTest.java    |    2 +
 .../cxf/mtom/CxfMtomPOJOProducerTest.java          |    1 -
 .../apache/camel/component/cxf/mtom/HelloImpl.java |    1 -
 .../camel/component/cxf/mtom/MtomTestHelper.java   |    1 -
 .../cxf/multipart/MultiPartInvokeImpl.java         |    1 -
 .../component/cxf/noparam/NoParamEndpoint.java     |    1 +
 .../camel/component/cxf/noparam/NoParamTest.java   |    1 -
 .../soap/headers/CxfMessageHeadersRelayTest.java   |    1 +
 .../cxf/spring/AbstractSpringBeanTestSupport.java  |    1 -
 .../cxf/spring/CxfEndpointBeansRouterTest.java     |    1 -
 .../cxf/spring/FileToCxfMessageDataFormatTest.java |    5 +-
 .../apache/camel/component/cxf/ssl/SslTest.java    |    2 +-
 .../component/cxf/util/SplitterWithXqureyTest.java |    1 +
 .../apache/camel/component/cxf/wsdl/OrderTest.java |    1 -
 .../component/cxf/wsrm/MessageLossSimulator.java   |    1 -
 .../cxf/wssecurity/camel/WSSecurityRouteTest.java  |    1 -
 .../cxf/wssecurity/server/GreeterImpl.java         |    1 +
 .../digitalocean/DigitalOceanEndpoint.java         |    2 +-
 .../DigitalOceanBlockStoragesProducer.java         |    2 +-
 .../producer/DigitalOceanDropletsProducer.java     |    8 +-
 .../producer/DigitalOceanFloatingIPsProducer.java  |    8 +-
 .../producer/DigitalOceanKeysProducer.java         |    4 +-
 .../component/disruptor/DisruptorProducer.java     |    1 -
 .../component/disruptor/DisruptorReference.java    |    1 -
 .../DisruptorWaitStrategyCreationTest.java         |    1 -
 .../FileDisruptorShutdownCompleteAllTasksTest.java |    3 +-
 .../disruptor/SedaDisruptorCompareTest.java        |    2 -
 .../DisruptorVmComponentReferenceEndpointTest.java |    2 +
 .../vm/DisruptorVmConcurrentConsumersTest.java     |    2 +
 .../disruptor/vm/DisruptorVmInOnlyChainedTest.java |    2 +
 .../disruptor/vm/DisruptorVmInOnlyTest.java        |    2 +
 .../disruptor/vm/DisruptorVmInOutChainedTest.java  |    2 +
 .../vm/DisruptorVmInOutChainedTimeoutTest.java     |    2 +
 .../disruptor/vm/DisruptorVmInOutTest.java         |    2 +
 .../vm/DisruptorVmInOutWithErrorTest.java          |    2 +
 .../vm/DisruptorVmMultipleConsumersIssueTest.java  |    2 +
 .../DisruptorVmMultipleContextsStartStopTest.java  |    2 +
 .../disruptor/vm/DisruptorVmQueueTest.java         |    2 +
 .../vm/DisruptorVmShouldNotUseSameThreadTest.java  |    2 +
 .../disruptor/vm/DisruptorVmSplitterTest.java      |    2 +
 .../disruptor/vm/DisruptorVmTimeoutIssueTest.java  |    3 +
 .../disruptor/vm/DisruptorVmUseSameQueueTest.java  |    2 +
 .../vm/DisruptorVmWaitForTaskCompleteTest.java     |    3 +
 .../DisruptorVmWaitForTaskIfReplyExpectedTest.java |    3 +
 .../vm/DisruptorVmWaitForTaskNewerTest.java        |    3 +
 .../vm/SameDisruptorVmQueueSizeAndNoSizeTest.java  |    4 +
 .../apache/camel/component/dns/DnsIpProducer.java  |    4 +-
 .../camel/component/dns/DnsLookupProducer.java     |    4 +-
 .../camel/component/dns/policy/DnsActivation.java  |    4 +-
 .../component/dns/policy/DnsActivationPolicy.java  |   18 +-
 .../docker/consumer/DockerEventsConsumer.java      |    2 +-
 .../camel/component/dozer/DozerEndpoint.java       |    2 -
 .../dozer/DozerThreadContextClassLoader.java       |    2 -
 .../camel/converter/dozer/DozerTypeConverter.java  |    2 -
 .../converter/dozer/DozerTypeConverterLoader.java  |    2 -
 .../camel/converter/dozer/MapperFactory.java       |    2 -
 .../component/dozer/example/abc/ABCOrder.java      |    1 +
 .../component/dozer/example/xyz/LineItem.java      |    1 +
 .../component/dozer/example/xyz/XYZOrder.java      |    2 +
 .../converter/dozer/DozerTestArtifactsFactory.java |    1 -
 .../converter/dozer/DozerTypeConverterDTOTest.java |    5 +-
 .../converter/dozer/DozerTypeConverterTest.java    |    5 +-
 .../camel/component/dropbox/DropboxEndpoint.java   |    8 +-
 .../consumer/DropboxScheduledPollGetConsumer.java  |    2 +-
 .../DropboxScheduledPollSearchConsumer.java        |    2 +-
 .../integration/producer/DropboxGetProducer.java   |    2 +-
 .../integration/producer/DropboxPutProducer.java   |    2 +-
 .../aggregate/EhcacheAggregationRepository.java    |    2 +-
 .../EhcacheAggregationRepositoryOperationTest.java |    3 +-
 .../camel-ejb/src/main/docs/ejb-component.adoc     |    5 +-
 .../apache/camel/component/ejb/EjbComponent.java   |    1 +
 .../camel/component/ejb/GreaterCamelBeanTest.java  |    1 +
 .../ejb/GreaterCamelEjbPropertiesTest.java         |    1 +
 .../apache/camel/component/ejb/GreaterTest.java    |   12 +-
 .../elasticsearch/ElasticsearchProducer.java       |    2 +-
 .../ElasticsearchActionRequestConverter.java       |    2 +-
 ...asticsearchGetSearchDeleteExistsUpdateTest.java |   14 +
 .../elasticsearch/ElasticsearchEndpoint.java       |    4 +-
 .../elasticsearch/ElasticsearchBaseTest.java       |    1 -
 .../ElasticsearchClusterBaseTest.java              |    1 -
 .../elasticsearch5/ElasticsearchProducer.java      |    2 +-
 .../elasticsearch5/ElasticsearchBaseTest.java      |    2 +
 .../ElasticsearchClusterBaseTest.java              |    2 +
 .../camel/component/etcd/EtcdConfiguration.java    |    1 -
 .../etcd/cloud/EtcdServiceCallRouteTest.java       |    3 +-
 .../etcd/cloud/EtcdServiceDiscoveryTest.java       |    3 +-
 .../SpringEtcdServiceCallDefaultRouteTest.java     |    3 +-
 .../etcd/cloud/SpringEtcdServiceCallRouteTest.java |    3 +-
 .../apache/camel/component/exec/ExecEndpoint.java  |    5 +-
 components/camel-fhir/camel-fhir-api/pom.xml       |    4 +
 .../camel/component/fhir/api/FhirHistory.java      |    2 +-
 .../camel/component/fhir/api/FhirOperation.java    |  202 ++++
 components/camel-fhir/camel-fhir-component/pom.xml |   12 +
 .../signatures/operation-sig-api.txt               |   21 +
 .../src/main/docs/fhir-component.adoc              |    1 +
 .../apache/camel/component/fhir/FhirEndpoint.java  |    4 +
 .../camel/component/fhir/FhirOperationIT.java      |  192 ++++
 .../apache/camel/component/fhir/FhirPatchIT.java   |    1 -
 .../component/file/remote/DSAKeyPairIdentity.java  |    1 -
 .../camel/component/file/remote/FtpConsumer.java   |    4 +-
 .../camel/component/file/remote/FtpOperations.java |    2 +-
 .../component/file/remote/FtpsOperations.java      |    1 +
 .../component/file/remote/OsgiParserFactory.java   |    1 -
 .../component/file/remote/RSAKeyPairIdentity.java  |    1 -
 .../component/file/remote/RemoteFileConsumer.java  |    8 +-
 .../component/file/remote/RemoteFileEndpoint.java  |    2 +-
 .../component/file/remote/RemoteFileProducer.java  |   10 +-
 .../camel/component/file/remote/SftpConsumer.java  |    2 +-
 .../component/file/remote/SftpOperations.java      |   27 +-
 .../FtpChangedExclusiveReadLockStrategy.java       |    4 +-
 .../SftpChangedExclusiveReadLockStrategy.java      |    4 +-
 .../file/remote/FromFtpRecursiveNoopTest.java      |    3 +-
 .../file/remote/FtpBadLoginConnectionLeakTest.java |    1 +
 .../FtpBadLoginInProducerConnectionLeakTest.java   |    1 +
 .../FtpBadLoginMockNoopConnectionLeakTest.java     |    4 +-
 .../file/remote/FtpConsumerDisconnectTest.java     |    3 +-
 .../remote/FtpConsumerRelativeFileNameTest.java    |    3 +-
 ...pProducerAllowNullBodyFileAlreadyExistTest.java |    3 +-
 .../FtpProducerDisconnectOnBatchCompleteTest.java  |    3 +-
 .../file/remote/FtpProducerDisconnectTest.java     |    3 +-
 .../remote/FtpProducerFileWithCharsetTest.java     |    3 +-
 ...FtpUtilsExtractDirNameFromAbsolutePathTest.java |    1 +
 .../RemoteFileProduceOverruleOnlyOnceTest.java     |    3 +-
 .../remote/manual/FtpConsumerCamelManualTest.java  |    3 +-
 .../FtpConsumerCamelRecursiveManualTest.java       |    3 +-
 ...ConsumerCamelRecursiveToAbsoluteManualTest.java |    3 +-
 .../FtpConsumerNotStepwiseCamelManualTest.java     |    3 +-
 ...onsumerNotStepwiseCamelRecursiveManualTest.java |    3 +-
 ...StepwiseCamelRecursiveToAbsoluteManualTest.java |    3 +-
 .../remote/manual/FtpConsumerScottManualTest.java  |    3 +-
 .../FtpConsumerScottRecursiveManualTest.java       |    3 +-
 .../file/remote/sftp/SftpChangedReadLockTest.java  |    3 +-
 .../camel/component/geocoder/GeoCoderProducer.java |    6 +-
 .../git/consumer/AbstractGitConsumer.java          |    2 +-
 .../camel/component/git/producer/GitProducer.java  |   48 +-
 .../github/consumer/AbstractGitHubConsumer.java    |    2 +-
 .../component/github/consumer/CommitConsumer.java  |    2 +-
 .../consumer/PullRequestCommentConsumer.java       |    2 +-
 .../github/consumer/PullRequestConsumer.java       |    2 +-
 .../github/producer/GetCommitFileProducer.java     |    2 +-
 .../producer/PullRequestCommentProducer.java       |    2 +-
 .../github/producer/PullRequestFilesProducer.java  |    2 +-
 .../github/producer/PullRequestStateProducer.java  |    2 +-
 .../docs/google-calendar-stream-component.adoc     |  162 +++
 .../stream/GoogleCalendarStreamComponent.java      |   94 ++
 .../stream/GoogleCalendarStreamConfiguration.java  |  220 +++++
 .../stream/GoogleCalendarStreamConstants.java      |   30 +
 .../stream/GoogleCalendarStreamConsumer.java       |  128 +++
 .../stream/GoogleCalendarStreamEndpoint.java       |  101 ++
 .../apache/camel/component/google-calendar-stream  |   17 +
 .../AbstractGoogleCalendarStreamTestSupport.java   |   72 ++
 ...oogleCalendarStreamConsumerIntegrationTest.java |   45 +
 .../src/test/resources/test-options.properties     |    2 +-
 .../drive/BatchGoogleDriveClientFactory.java       |    2 -
 .../google/drive/GoogleDriveConsumer.java          |    1 -
 .../google/drive/GoogleDriveFilesConverter.java    |    1 -
 .../google/drive/GoogleDriveProducer.java          |    1 -
 .../drive/InteractiveGoogleDriveClientFactory.java |    1 -
 .../drive/AbstractGoogleDriveTestSupport.java      |    2 -
 .../google/drive/DriveChangesIntegrationTest.java  |    1 -
 .../google/drive/DriveChildrenIntegrationTest.java |    1 -
 .../google/drive/DriveCommentsIntegrationTest.java |    1 -
 .../google/drive/DriveFilesIntegrationTest.java    |    1 -
 .../google/drive/DriveRepliesIntegrationTest.java  |    1 -
 .../google/drive/FileConverterIntegrationTest.java |    4 +-
 .../component/google/mail/GoogleMailComponent.java |    2 +
 .../mail/GoogleMailComponentVerifierExtension.java |   78 ++
 .../mail/stream/GoogleMailStreamComponent.java     |    2 +-
 ...GoogleMailStreamComponentVerifierExtension.java |   81 ++
 .../mail/stream/GoogleMailStreamConsumer.java      |    2 +-
 .../GoogleMailComponentVerifierExtensionTest.java  |   68 ++
 ...leMailStreamComponentVerifierExtensionTest.java |   68 ++
 .../src/test/resources/log4j2.properties           |    9 +-
 .../pubsub/GooglePubsubConnectionFactory.java      |    1 -
 .../google/pubsub/integration/AckModeNoneTest.java |    1 -
 .../pubsub/integration/AcknowledgementTest.java    |    1 -
 .../google/pubsub/integration/BodyTypesTest.java   |    1 -
 .../integration/GroupedExchangeRoundtripTest.java  |    1 -
 .../integration/SingleExchangeRoundtripTest.java   |    1 -
 .../grpc/client/GrpcExchangeForwarder.java         |    1 -
 .../client/GrpcResponseRouterStreamObserver.java   |    1 -
 .../grpc/client/GrpcSimpleExchangeForwarder.java   |    1 -
 .../client/GrpcStreamingExchangeForwarder.java     |    1 -
 .../component/grpc/server/GrpcMethodHandler.java   |    2 -
 .../component/grpc/GrpcConsumerConcurrentTest.java |    1 -
 .../component/grpc/GrpcProducerAsyncTest.java      |    2 -
 .../component/grpc/GrpcProducerSecurityTest.java   |    1 -
 .../component/grpc/GrpcProducerStreamingTest.java  |    1 -
 .../camel/component/grpc/GrpcProducerSyncTest.java |    4 +-
 .../hawtdb/HawtDBAggregationRepository.java        |    9 +-
 .../apache/camel/component/hawtdb/HawtDBFile.java  |    2 +-
 ...wtDBAggregateConcurrentDifferentGroupsTest.java |    3 +-
 .../HawtDBAggregateConcurrentSameGroupTest.java    |    3 +-
 .../HawtDBAggregateDiscardOnTimeoutTest.java       |    3 +-
 .../HawtDBAggregateForceCompletionHeaderTest.java  |    3 +-
 ...DBAggregateNotLostRemovedWhenConfirmedTest.java |    3 +-
 .../hawtdb/HawtDBAggregateNotLostTest.java         |    3 +-
 ...ggregateRecoverDeadLetterChannelFailedTest.java |    3 +-
 ...awtDBAggregateRecoverDeadLetterChannelTest.java |    3 +-
 .../hawtdb/HawtDBAggregateRecoverTest.java         |    3 +-
 ...DBAggregateRecoverWithRedeliveryPolicyTest.java |    3 +-
 .../hawtdb/HawtDBAggregateRecoverWithSedaTest.java |    3 +-
 .../HawtDBAggregateSerializedHeadersTest.java      |    3 +-
 .../component/hawtdb/HawtDBAggregateTest.java      |    3 +-
 ...awtDBAggregateTimeoutCompletionRestartTest.java |    3 +-
 .../HawtDBAggregationRepositoryAlotDataTest.java   |    5 +-
 ...awtDBAggregationRepositoryLoadExistingTest.java |    5 +-
 ...awtDBAggregationRepositoryMultipleRepoTest.java |    5 +-
 ...DBAggregationRepositoryRecoverExistingTest.java |    3 +-
 .../hawtdb/HawtDBAggregationRepositoryTest.java    |    5 +-
 .../hawtdb/HawtDBExchangeSerializationTest.java    |    5 +-
 .../component/hawtdb/HawtDBGetNotFoundTest.java    |    5 +-
 .../component/hawtdb/HawtDBGrowIssueTest.java      |    5 +-
 ...ngAggregateRecoverWithRedeliveryPolicyTest.java |    3 +-
 .../hawtdb/HawtDBSpringAggregateTest.java          |    3 +-
 .../hazelcast/queue/HazelcastQueueConsumer.java    |    2 +-
 .../hazelcast/seda/HazelcastSedaConsumer.java      |    4 +-
 .../HazelcastIdempotentRepositoryTest.java         |    4 +
 .../apache/camel/component/hdfs/HdfsComponent.java |    1 +
 .../apache/camel/component/hdfs/HdfsConsumer.java  |   12 +-
 .../camel/component/hdfs/HdfsInfoFactory.java      |    1 +
 .../apache/camel/component/hdfs/HdfsProducer.java  |    8 +-
 .../camel/component/hdfs/FromFileToHdfsTest.java   |    3 +-
 .../camel/component/hdfs/HdfsConsumerTest.java     |    3 +-
 .../component/hdfs/HdfsProducerConsumerTest.java   |    3 +-
 .../component/hdfs/HdfsProducerSplitTest.java      |    3 +-
 .../camel/component/hdfs/HdfsProducerTest.java     |    3 +-
 .../component/hdfs/integration/HdfsAppendTest.java |    5 +-
 .../camel/component/hdfs2/HdfsComponent.java       |    1 +
 .../apache/camel/component/hdfs2/HdfsConsumer.java |   12 +-
 .../camel/component/hdfs2/HdfsInfoFactory.java     |    1 +
 .../apache/camel/component/hdfs2/HdfsProducer.java |    8 +-
 .../camel/component/hdfs2/FromFileToHdfsTest.java  |    3 +-
 .../camel/component/hdfs2/HdfsConsumerTest.java    |    3 +-
 .../component/hdfs2/HdfsProducerConsumerTest.java  |    3 +-
 .../component/hdfs2/HdfsProducerSplitTest.java     |    3 +-
 .../camel/component/hdfs2/HdfsProducerTest.java    |    3 +-
 .../hdfs2/integration/HdfsAppendTest.java          |    5 +-
 .../HdfsProducerConsumerIntegrationTest.java       |    1 -
 .../headersmap/FastHeadersMapFactoryTest.java      |    8 +-
 .../camel/component/hipchat/HipchatProducer.java   |    4 +-
 .../apache/camel/component/hl7/AckExpression.java  |    1 -
 .../java/org/apache/camel/component/hl7/HL7.java   |    1 -
 .../apache/camel/component/hl7/HL721Converter.java |    4 -
 .../apache/camel/component/hl7/HL722Converter.java |    1 -
 .../camel/component/hl7/HL7231Converter.java       |    3 -
 .../apache/camel/component/hl7/HL723Converter.java |    3 -
 .../apache/camel/component/hl7/HL724Converter.java |    3 -
 .../camel/component/hl7/HL7251Converter.java       |    3 -
 .../apache/camel/component/hl7/HL725Converter.java |    1 -
 .../apache/camel/component/hl7/HL726Converter.java |    3 -
 .../apache/camel/component/hl7/HL7Converter.java   |    1 -
 .../component/hl7/HL7GenericMessageConverter.java  |    1 -
 .../apache/camel/component/hl7/HL7MLLPDecoder.java |    2 +-
 .../apache/camel/component/hl7/TerserLanguage.java |    1 -
 .../component/hl7/ValidationContextPredicate.java  |    2 -
 .../camel/component/hl7/AckExpressionTest.java     |    1 -
 .../component/hl7/HL7MLLPCodecBoundaryTest.java    |    2 -
 .../camel/component/hl7/HL7MLLPCodecLongTest.java  |    2 -
 .../hl7/HL7MLLPCodecStandAndEndBytesTest.java      |    1 -
 .../hl7/HL7MLLPNettyDecoderResourceLeakTest.java   |    1 -
 .../apache/camel/component/hl7/HL7TestSupport.java |    1 -
 .../camel/component/hl7/HL7XmlDataFormatTest.java  |    1 -
 .../camel/component/hl7/TerserExpressionTest.java  |    1 -
 .../org/apache/camel/http/common/CamelServlet.java |   22 +-
 .../org/apache/camel/http/common/HttpHelper.java   |    4 +-
 .../common/HttpServletResolveConsumerStrategy.java |    9 +-
 .../common/ServletResolveConsumerStrategy.java     |    4 +-
 .../apache/camel/component/http/HttpProducer.java  |    2 +-
 ...ntextParametersSecureProtocolSocketFactory.java |    1 +
 .../component/http/HttpProducerSessionTest.java    |    1 -
 .../component/http/HttpReferenceParameterTest.java |    3 +-
 .../camel/component/http4/HttpComponent.java       |    7 +-
 .../apache/camel/component/http4/HttpEndpoint.java |   68 +-
 .../camel/component/http4/HttpEntityConverter.java |   11 +-
 .../apache/camel/component/http4/HttpProducer.java |   13 +-
 .../http4/HttpProducerContentLengthTest.java       |  136 +++
 .../http4/HttpReferenceParameterTest.java          |    2 +
 .../http4/ManagedHttpProducerPoolStatsTest.java    |  130 +++
 .../InfinispanAsyncClusteredEventListener.java     |    1 +
 .../InfinispanAsyncLocalEventListener.java         |    1 +
 .../InfinispanLocalAggregationRepository.java      |    2 +-
 .../InfinispanRemoteAggregationRepository.java     |    2 +-
 .../remote/InfinispanRemoteEventListener.java      |    1 +
 .../InfinispanClusteredConsumerTest.java           |    2 +-
 .../infinispan/InfinispanLocalConsumerTest.java    |    1 +
 .../infinispan/MyEmbeddedCustomListener.java       |    1 +
 ...anLocalAggregationRepositoryOperationsTest.java |    1 -
 .../camel/component/infinispan/util/UserUtils.java |    1 +
 .../apache/camel/component/irc/IrcEndpoint.java    |    2 +-
 .../org/apache/camel/component/irc/IrcLogger.java  |    4 +-
 .../camel/component/ironmq/IronMQConsumer.java     |    2 +-
 .../camel/component/jackson/JacksonDataFormat.java |    1 -
 .../JacksonNotUseDefaultObjectMapperTest.java      |    3 +-
 .../component/jasypt/JasyptPropertiesParser.java   |    7 +-
 .../apache/camel/component/jasypt/MainTest.java    |    4 +-
 .../component/javaspace/JavaSpaceProducer.java     |    2 +-
 .../camel/converter/jaxb/JaxbDataFormat.java       |    2 +-
 .../ExplicitEncodingAndXMLCharFilteringTest.java   |    2 +
 .../camel/example/ExplicitFileEncodingTest.java    |    2 +
 .../camel/component/jcache/JCacheProducer.java     |    3 +-
 .../component/jclouds/JcloudsBlobStoreHelper.java  |    1 -
 .../component/jclouds/JcloudsComputeProducer.java  |    1 -
 .../component/jclouds/JcloudsPayloadConverter.java |    1 +
 .../jclouds/JcloudsBlobStoreProducerTest.java      |    1 -
 .../JcloudsFileConsumerStreamCachingIssueTest.java |    3 +-
 .../jclouds/JcloudsSpringBlobstoreTest.java        |    1 -
 .../jclouds/JcloudsSpringComputeTest.java          |    1 +
 .../apache/camel/component/jcr/JcrEndpoint.java    |    7 +-
 .../camel/component/jdbc/ResultSetIterator.java    |    6 +-
 .../component/jetty/CamelContinuationServlet.java  |   17 +-
 .../camel/component/jetty/JettyHttpComponent.java  |    5 +-
 .../camel/component/jetty/BaseJettyTest.java       |    1 -
 .../camel/component/jetty/CustomFiltersTest.java   |    1 +
 .../jetty/ExplicitJettyAsyncRouteTest.java         |    1 +
 .../jetty/HttpAuthMethodPriorityTest.java          |    1 +
 .../HttpBasicAuthComponentConfiguredTest.java      |    1 +
 .../camel/component/jetty/HttpBasicAuthTest.java   |    1 +
 .../camel/component/jetty/HttpBindingRefTest.java  |    1 +
 .../camel/component/jetty/HttpConverterTest.java   |    1 +
 .../component/jetty/HttpGZipEncodingTest.java      |    1 +
 .../camel/component/jetty/HttpHeaderTest.java      |    1 +
 .../jetty/HttpProducerJMXBeansIssueTest.java       |    3 +-
 .../camel/component/jetty/HttpRouteTest.java       |    1 +
 .../camel/component/jetty/HttpsAsyncRouteTest.java |    1 +
 .../camel/component/jetty/JettyEnableJmxTest.java  |    6 +-
 .../jetty/JettyRouteWithSocketPropertiesTest.java  |    1 +
 .../camel/component/jetty/MultiPartFormTest.java   |    1 +
 .../jetty/MultiPartFormWithCustomFilterTest.java   |    1 +
 .../camel/component/jetty/MyErrorHandler.java      |    1 +
 .../component/jetty/SpringHttpsRouteTest.java      |    1 +
 .../JettyHttpProducerSessionTest.java              |    1 -
 .../component/jetty/rest/MyCustomHttpBinding.java  |    1 +
 .../camel/component/jetty/rest/MyLoginService.java |    1 +
 .../component/jetty/rest/RestJettyOptionsTest.java |   28 +-
 .../component/jgroups/JGroupsComponentTest.java    |    3 +-
 .../JGroupsComponentWithChannelPropertiesTest.java |    3 +-
 .../component/jgroups/JGroupsConsumerTest.java     |    3 +-
 .../component/jgroups/JGroupsProducerTest.java     |    3 +-
 .../component/validator/jing/JingEndpoint.java     |    4 +-
 .../jira/consumer/AbstractJIRAConsumer.java        |    2 +-
 .../component/jms/EndpointMessageListener.java     |    4 +-
 .../org/apache/camel/component/jms/JmsBinding.java |    1 +
 .../apache/camel/component/jms/JmsComponent.java   |    1 +
 .../apache/camel/component/jms/JmsConsumer.java    |    1 +
 .../apache/camel/component/jms/JmsEndpoint.java    |    1 +
 .../org/apache/camel/component/jms/JmsMessage.java |    1 +
 .../camel/component/jms/JmsMessageHelper.java      |    1 +
 .../apache/camel/component/jms/JmsProducer.java    |    4 +-
 .../camel/component/jms/JmsQueueEndpoint.java      |    1 +
 .../component/jms/StreamMessageInputStream.java    |    1 +
 .../camel/component/jms/reply/ReplyManager.java    |    1 +
 .../component/jms/reply/ReplyManagerSupport.java   |    1 +
 .../camel/component/jms/CamelJmsTestHelper.java    |    1 +
 .../component/jms/ConsumeJmsMapMessageTest.java    |    1 +
 .../component/jms/ConsumeJmsObjectMessageTest.java |    1 +
 .../jms/FileRouteJmsKeepLastModifiedTest.java      |    4 +-
 .../component/jms/FileRouteJmsPreMoveTest.java     |    3 +-
 .../component/jms/FileRouteToJmsToFileTest.java    |    1 +
 .../jms/JmsAddAndRemoveRouteManagementTest.java    |    1 +
 .../camel/component/jms/JmsAutoStartupTest.java    |    1 +
 .../jms/JmsBatchResequencerJMSPriorityTest.java    |    1 -
 .../jms/JmsComponentConfigurationTest.java         |    1 -
 .../camel/component/jms/JmsComponentTest.java      |    1 +
 ...sumerRestartPickupConfigurationChangesTest.java |    1 +
 .../jms/JmsCustomHeaderFilterStrategyTest.java     |    2 +
 .../component/jms/JmsDeadLetterQueueTest.java      |    1 +
 ...msDeadLetterQueueUsingTransferExchangeTest.java |    1 +
 .../jms/JmsEagerLoadingPropertiesTest.java         |    1 +
 .../jms/JmsEndpointConfigurationTest.java          |    3 -
 .../apache/camel/component/jms/JmsFilterTest.java  |    1 -
 .../component/jms/JmsHeaderFilteringTest.java      |    1 -
 .../component/jms/JmsInOutBeanReturnNullTest.java  |    1 +
 .../jms/JmsIncludeAllJMSXPropertiesTest.java       |    1 +
 .../camel/component/jms/JmsMessageTypeTest.java    |    1 +
 .../component/jms/JmsNoRequestTimeoutTest.java     |    1 +
 .../jms/JmsNotIncludeAllJMSXPropertiesTest.java    |    1 +
 ...OnCompletionAndInterceptAndOnExceptionTest.java |    1 +
 .../component/jms/JmsPollingConsumerTest.java      |    2 +
 .../component/jms/JmsProduerConcurrentTest.java    |    2 +
 .../jms/JmsProduerConcurrentWithReplyTest.java     |    2 +
 .../camel/component/jms/JmsRemoveHeaderTest.java   |    2 +
 .../jms/JmsRequestReplyCorrelationTest.java        |    1 +
 ...RequestReplyExclusiveReplyToConcurrentTest.java |    3 +-
 .../jms/JmsRequestReplyManualReplyTest.java        |    1 +
 .../jms/JmsRouteDeliveryModePreserveQoSTest.java   |    1 +
 .../component/jms/JmsRouteRequestReplyTest.java    |    1 +
 .../camel/component/jms/JmsRouteTimeoutTest.java   |    1 +
 .../jms/JmsRouteUsingDifferentHeadersTest.java     |    1 +
 .../component/jms/JmsRouteUsingJMSXGroupTest.java  |    1 +
 .../JmsRouteWithDefaultKeyFormatStrategyTest.java  |    2 +
 .../jms/JmsRouteWithInOnlyAndMultipleAcksTest.java |    1 +
 .../component/jms/JmsRouteWithInOnlyTest.java      |    1 +
 .../component/jms/JmsRoutingSlipInOutTest.java     |    1 +
 .../camel/component/jms/JmsRoutingSlipTest.java    |    1 +
 .../camel/component/jms/JmsSimpleHeaderTest.java   |    1 +
 .../component/jms/JmsSimpleInOnlyNoMutateTest.java |    1 +
 .../jms/JmsSimpleRequestCustomReplyToTest.java     |    2 +-
 .../jms/JmsSimpleRequestLateReplyTest.java         |    1 +
 .../component/jms/JmsSimpleRequestReplyTest.java   |    1 +
 .../component/jms/JmsStreamMessageTypeTest.java    |    4 +-
 .../camel/component/jms/JmsSuspendResumeTest.java  |    1 +
 .../jms/JmsThrottlingInflightRoutePolicyTest.java  |    1 +
 .../component/jms/JmsTransactedRouteTest.java      |    1 +
 .../component/jms/JmsTransferExchangeTest.java     |    1 +
 .../component/jms/JmsUseOriginalBodyTest.java      |    1 +
 .../component/jms/ManagedJmsSelectorTest.java      |    1 +
 .../camel/component/jms/MapJmsMessageTest.java     |    1 +
 .../component/jms/async/AsyncJmsInOutTest.java     |    1 +
 .../component/jms/discovery/JmsDiscoveryTest.java  |    1 +
 .../jms/issues/ActiveMQPropagateHeadersTest.java   |    1 +
 .../ActiveMQPropagateSerializableHeadersTest.java  |    1 +
 ...cRoutersWithJMSMessageLostHeadersIssueTest.java |    3 +-
 .../jms/issues/JmsConcurrentConsumersTest.java     |    1 +
 .../jms/issues/JmsDirectStartupOrderIssueTest.java |    1 +
 .../jms/issues/JmsFilenameHeaderTest.java          |    1 +
 .../jms/issues/JmsGetHeaderKeyFormatIssueTest.java |    2 +-
 ...derKeyFormatIssueWithContentTypeHeaderTest.java |    1 -
 .../jms/issues/JmsHeaderAsObjectTest.java          |    1 +
 .../component/jms/issues/JmsInOutIssueTest.java    |    1 +
 .../JmsJMSReplyToEndpointUsingInOutTest.java       |    1 +
 .../jms/issues/JmsMQSpecialHeaderTest.java         |    1 +
 .../component/jms/issues/JmsMutateMessageTest.java |    1 -
 .../issues/JmsMutateRemoveHeaderMessageTest.java   |    1 -
 ...roughtJmsKeyFormatStrategyEndUserIssueTest.java |    2 +-
 ...ssThroughtJmsKeyFormatStrategyEndpointTest.java |    1 +
 .../JmsPassThroughtJmsKeyFormatStrategyTest.java   |    1 +
 ...KeyFormatStrategyUsingJmsConfigurationTest.java |    2 +-
 .../jms/issues/JmsTypeConverterIssueTest.java      |    1 +
 .../component/jms/issues/MQSeriesHeaderTest.java   |    1 +
 .../NoClassDefFoundErrorWrapExceptionTest.java     |    1 +
 .../JMSTransactionThrottlingRoutePolicyTest.java   |    3 +-
 .../component/jmx/NotificationXmlFormatter.java    |    2 +-
 .../apache/camel/component/jolt/JoltEndpoint.java  |    2 +-
 .../apache/camel/component/jpa/JpaComponent.java   |   10 +-
 .../jpa/JpaRouteSharedEntityManagerTest.java       |    2 +
 .../jpa/JpaRouteSkipLockedEntityTest.java          |    2 +
 .../apache/camel/component/scp/ScpOperations.java  |    4 +-
 .../apache/camel/jsonpath/JsonPathSourceTest.java  |    1 +
 .../camel/component/jt400/Jt400Component.java      |    2 +-
 .../camel/component/jt400/Jt400Configuration.java  |    1 +
 .../camel/component/jt400/Jt400Endpoint.java       |    2 +
 .../camel/component/jt400/Jt400PgmProducer.java    |    2 +-
 .../jt400/Jt400DataQueueConsumerTest.java          |    4 +-
 .../camel/component/kafka/KafkaConsumer.java       |    4 +-
 .../camel/component/kafka/KafkaProducer.java       |    1 -
 .../kafka/KafkaIdempotentRepository.java           |    1 -
 .../component/kafka/BaseEmbeddedKafkaTest.java     |    1 -
 .../component/kafka/KafkaProducerFullTest.java     |    2 -
 .../kafka/embedded/EmbeddedKafkaBroker.java        |    3 +-
 .../kafka/embedded/EmbeddedZookeeper.java          |    3 +-
 .../camel/component/kestrel/KestrelComponent.java  |    4 +-
 .../camel/component/kestrel/KestrelConsumer.java   |    4 +-
 .../camel/component/kestrel/KestrelProducer.java   |    2 +-
 .../krati/KratiDataStoreRegistration.java          |    1 +
 .../apache/camel/component/krati/KratiHelper.java  |    1 -
 .../idempotent/KratiIdempotentRepository.java      |    1 -
 .../krati/serializer/KratiDefaultSerializer.java   |    1 +
 .../camel/component/krati/KratiEndpointTest.java   |    1 -
 .../idempotent/KratiIdempotentRepositoryTest.java  |    5 +-
 .../component/kubernetes/KubernetesHelper.java     |    2 +-
 .../apache/camel/component/ldif/LdifProducer.java  |   10 +-
 .../leveldb/LevelDBAggregationRepository.java      |    9 +-
 ...elDBAggregateConcurrentDifferentGroupsTest.java |    3 +-
 .../LevelDBAggregateConcurrentSameGroupTest.java   |    3 +-
 .../LevelDBAggregateDiscardOnTimeoutTest.java      |    3 +-
 .../LevelDBAggregateForceCompletionHeaderTest.java |    3 +-
 ...DBAggregateNotLostRemovedWhenConfirmedTest.java |    3 +-
 .../leveldb/LevelDBAggregateNotLostTest.java       |    3 +-
 ...ggregateRecoverDeadLetterChannelFailedTest.java |    3 +-
 ...velDBAggregateRecoverDeadLetterChannelTest.java |    3 +-
 .../leveldb/LevelDBAggregateRecoverTest.java       |    3 +-
 ...DBAggregateRecoverWithRedeliveryPolicyTest.java |    3 +-
 .../LevelDBAggregateRecoverWithSedaTest.java       |    3 +-
 .../component/leveldb/LevelDBAggregateTest.java    |    3 +-
 ...velDBAggregateTimeoutCompletionRestartTest.java |    3 +-
 .../LevelDBAggregationRepositoryAlotDataTest.java  |    5 +-
 ...velDBAggregationRepositoryLoadExistingTest.java |    5 +-
 ...velDBAggregationRepositoryMultipleRepoTest.java |    5 +-
 ...DBAggregationRepositoryRecoverExistingTest.java |    3 +-
 .../leveldb/LevelDBAggregationRepositoryTest.java  |    5 +-
 .../leveldb/LevelDBExchangeSerializationTest.java  |    5 +-
 .../component/leveldb/LevelDBGetNotFoundTest.java  |    5 +-
 ...ngAggregateRecoverWithRedeliveryPolicyTest.java |    3 +-
 .../leveldb/LevelDBSpringAggregateTest.java        |    3 +-
 .../api/EnumQueryParamConverterProvider.java       |    1 +
 .../api/LinkedInExceptionResponseFilter.java       |    3 +-
 .../linkedin/api/LinkedInOAuthRequestFilter.java   |    2 +-
 .../api/AbstractResourceIntegrationTest.java       |    2 +-
 .../api/PeopleResourceIntegrationTest.java         |    9 +-
 .../api/SearchResourceIntegrationTest.java         |    1 -
 .../component/linkedin/LinkedInComponent.java      |    2 +-
 .../camel/component/linkedin/LinkedInEndpoint.java |    2 +-
 .../component/lumberjack/LumberjackConsumer.java   |    1 +
 .../component/lumberjack/LumberjackEndpoint.java   |    1 +
 .../component/lumberjack/io/LumberjackServer.java  |    1 +
 .../LumberjackComponentGlobalSSLTest.java          |    1 -
 .../LumberjackComponentLifecycleTest.java          |    1 -
 .../lumberjack/LumberjackComponentSSLTest.java     |    1 -
 .../lumberjack/LumberjackComponentTest.java        |    1 -
 .../lumberjack/LumberjackDisconnectionTest.java    |    1 -
 .../camel/component/lumberjack/LumberjackUtil.java |    1 +
 .../component/mail/DefaultJavaMailSender.java      |    1 +
 .../component/mail/DefaultMailUidGenerator.java    |    1 +
 .../component/mail/DummySSLSocketFactory.java      |    1 +
 .../camel/component/mail/JavaMailSender.java       |    1 +
 .../apache/camel/component/mail/MailBinding.java   |    3 +-
 .../apache/camel/component/mail/MailComponent.java |    7 +-
 .../camel/component/mail/MailConfiguration.java    |    1 +
 .../apache/camel/component/mail/MailConsumer.java  |    9 +-
 .../camel/component/mail/MailConverters.java       |    1 -
 .../apache/camel/component/mail/MailMessage.java   |    1 +
 .../org/apache/camel/component/mail/MailUtils.java |    3 +-
 .../apache/camel/component/mail/NowSearchTerm.java |    1 +
 .../camel/component/mail/SearchTermBuilder.java    |    1 +
 .../mime/multipart/MimeMultipartDataFormat.java    |    1 +
 .../mail/MailAttachmentRedeliveryTest.java         |    1 +
 .../component/mail/MailBatchConsumerTest.java      |    3 +-
 .../component/mail/MailCommitOnCompletionTest.java |    3 +-
 .../mail/MailConsumerUnsupportedCharsetTest.java   |    3 +-
 .../mail/MailContentTypeResolverTest.java          |    1 +
 .../camel/component/mail/MailConvertersTest.java   |    4 +-
 .../camel/component/mail/MailCopyToTest.java       |    3 +-
 .../component/mail/MailCustomMailSenderTest.java   |    1 +
 .../mail/MailDoNotDeleteIfProcessFailsTest.java    |    3 +-
 .../camel/component/mail/MailFetchSizeTest.java    |    3 +-
 .../component/mail/MailFetchSizeZeroTest.java      |    3 +-
 .../MailIdempotentRepositoryDuplicateTest.java     |    3 +-
 .../mail/MailIdempotentRepositoryTest.java         |    3 +-
 .../component/mail/MailMaxMessagesPerPollTest.java |    3 +-
 .../MailMultipleRecipientsUsingHeadersTest.java    |    1 +
 .../component/mail/MailPollEnrichNoMailTest.java   |    3 +-
 .../camel/component/mail/MailPollEnrichTest.java   |    3 +-
 .../component/mail/MailPostProcessActionTest.java  |    3 +-
 .../mail/MailProcessOnlyUnseenMessagesTest.java    |    3 +-
 .../camel/component/mail/MailSearchTermTest.java   |    3 +-
 .../MailSearchTermUriConfigLast24HoursTest.java    |    4 +-
 .../mail/MailSearchTermUriConfigTest.java          |    3 +-
 .../mail/MailShutdownCompleteAllTasksTest.java     |    3 +-
 .../MailShutdownCompleteCurrentTaskOnlyTest.java   |    3 +-
 .../camel/component/mail/MailSortTermTest.java     |    4 +-
 .../component/mail/MailSortTermThreeTest.java      |    4 +-
 .../camel/component/mail/MailSortTermTwoTest.java  |    4 +-
 .../component/mail/MailUsingCustomSessionTest.java |    1 +
 .../mail/MimeMultipartAlternativeTest.java         |    1 +
 ...MultipartAlternativeWithLongerFilenameTest.java |    1 +
 .../camel/component/mail/RawMailMessageTest.java   |    4 +-
 .../component/mail/SearchTermBuilderTest.java      |   10 +-
 .../camel/component/mail/mock/MyMockStore.java     |    1 +
 .../SslContextParametersMailRouteTest.java         |    1 +
 .../camel/component/metrics/MetricsComponent.java  |    6 +-
 .../apache/camel/component/mina/MinaComponent.java |    2 +-
 .../apache/camel/component/mina/MinaProducer.java  |    2 +-
 .../apache/camel/component/mina/BaseMinaTest.java  |    1 -
 .../camel/component/mina/MinaConverterTest.java    |   10 +-
 .../camel/component/mina/MinaFiltersTest.java      |    4 +-
 .../component/mina/MinaProducerShutdownTest.java   |    2 +
 .../camel/component/mina2/Mina2Consumer.java       |    4 +-
 .../camel/component/mina2/Mina2Producer.java       |    2 +-
 .../camel/component/mina2/BaseMina2Test.java       |    1 -
 .../camel/component/mina2/Mina2ConverterTest.java  |   10 +-
 .../camel/component/mina2/Mina2FiltersTest.java    |    4 +-
 .../component/mina2/Mina2ProducerShutdownTest.java |    2 +
 .../camel/component/mina2/Mina2UdpNoCamelTest.java |    1 -
 .../apache/camel/component/mllp/MllpEndpoint.java  |    1 +
 .../component/mllp/MllpTcpClientProducer.java      |    6 -
 .../component/mllp/MllpTcpServerConsumer.java      |    2 +-
 .../mllp/internal/TcpSocketConsumerRunnable.java   |    2 -
 .../mllp/MllpProducerConsumerLoopbackTest.java     |    4 -
 .../mllp/MllpTcpClientProducerBlueprintTest.java   |    3 -
 .../MllpTcpClientProducerConnectionErrorTest.java  |    3 -
 ...TcpClientProducerIdleConnectionTimeoutTest.java |    5 -
 ...roducerOptionalEndOfDataWithValidationTest.java |   10 +
 ...ucerOptionalEndOfDataWithoutValidationTest.java |   10 +
 ...roducerRequiredEndOfDataWithValidationTest.java |   10 +
 ...ucerRequiredEndOfDataWithoutValidationTest.java |   10 +
 .../mllp/MllpTcpServerConsumerBindTimeoutTest.java |    5 -
 .../mllp/MllpTcpServerConsumerBlueprintTest.java   |    6 -
 .../mllp/MllpTcpServerConsumerConnectionTest.java  |    4 -
 ...MllpTcpServerConsumerMulitpleTcpPacketTest.java |    5 -
 ...onsumerOptionalEndOfDataWithValidationTest.java |    9 +
 ...umerOptionalEndOfDataWithoutValidationTest.java |    1 -
 ...onsumerRequiredEndOfDataWithValidationTest.java |    9 +
 ...umerRequiredEndOfDataWithoutValidationTest.java |   11 +-
 .../mllp/MllpTcpServerConsumerTransactionTest.java |    7 -
 ...cpServerConsumerAcknowledgementTestSupport.java |    1 -
 ...rConsumerEndOfDataAndValidationTestSupport.java |    1 -
 .../camel/component/mllp/internal/Hl7UtilTest.java |    1 -
 .../internal/MllpSocketBufferReadFromTest.java     |    1 -
 .../mllp/internal/MllpSocketBufferTest.java        |    1 -
 .../mllp/internal/MllpSocketBufferWriteTest.java   |    1 -
 .../test/junit/rule/mllp/MllpServerResource.java   |    6 +-
 .../org/apache/camel/test/tcp/JavaSocketTests.java |    1 -
 .../component/mongodb/gridfs/GridFsConsumer.java   |    1 -
 .../component/mongodb/gridfs/GridFsEndpoint.java   |    2 +-
 .../mongodb/gridfs/AbstractMongoDbTest.java        |    5 +-
 .../mongodb/gridfs/GridFsConsumerTest.java         |    2 -
 .../camel/component/mongodb/MongoDbEndpoint.java   |    3 +-
 .../camel/component/mongodb/MongoDbProducer.java   |    1 -
 .../component/mongodb/MongoDbTailingProcess.java   |    1 -
 .../component/mongodb/AbstractMongoDbTest.java     |    3 +-
 .../mongodb/MongoDbAggregateOperationTest.java     |    1 -
 .../mongodb/MongoDbBulkWriteOperationTest.java     |    1 -
 .../component/mongodb/MongoDbDynamicityTest.java   |    2 -
 .../mongodb/MongoDbExceptionHandlingTest.java      |    1 -
 .../mongodb/MongoDbFindOperationTest.java          |    2 -
 .../mongodb/MongoDbHeaderHandlingTest.java         |    1 -
 .../camel/component/mongodb/MongoDbIndexTest.java  |    1 -
 .../component/mongodb/MongoDbOperationsTest.java   |    2 -
 .../component/mongodb/MongoDbOutputTypeTest.java   |    1 -
 .../mongodb/MongoDbTailableCursorConsumerTest.java |    1 -
 .../mongodb/MongoDbWriteConcernsTest.java          |    2 -
 .../camel/component/mongodb3/MongoDbEndpoint.java  |    3 +-
 .../camel/component/mongodb3/MongoDbProducer.java  |    1 -
 .../mongodb3/MongoDbTailTrackingManager.java       |    1 -
 .../component/mongodb3/MongoDbTailingProcess.java  |    1 -
 .../idempotent/MongoDbIdempotentRepository.java    |    1 -
 .../component/mongodb3/AbstractMongoDbTest.java    |    4 +-
 .../mongodb3/EmbedMongoConfiguration.java          |    2 -
 .../mongodb3/MongoDbAggregateOperationTest.java    |    1 -
 .../mongodb3/MongoDbBulkWriteOperationTest.java    |    1 -
 .../component/mongodb3/MongoDbDynamicityTest.java  |    1 -
 .../mongodb3/MongoDbFindOperationTest.java         |    1 -
 .../mongodb3/MongoDbHeaderHandlingTest.java        |    1 -
 .../camel/component/mongodb3/MongoDbIndexTest.java |    1 -
 .../component/mongodb3/MongoDbOperationsTest.java  |    1 -
 .../component/mongodb3/MongoDbOutputTypeTest.java  |    1 -
 .../mongodb3/MongoDbReadPreferenceOptionTest.java  |    1 -
 .../MongoDbTailableCursorConsumerTest.java         |    1 -
 .../camel/component/mqtt/MQTTConfiguration.java    |    6 +-
 .../apache/camel/component/mqtt/MQTTBaseTest.java  |    5 +-
 .../component/mqtt/MQTTConfigurationTest.java      |   41 +-
 .../apache/camel/component/mvel/MvelEndpoint.java  |    2 +-
 .../component/nagios/NagiosConfiguration.java      |    1 -
 .../camel/component/nagios/NagiosEndpoint.java     |    1 -
 .../component/nagios/NagiosEventNotifier.java      |    3 +-
 .../camel/component/nagios/NagiosProducer.java     |    1 -
 .../component/nagios/NagiosAsyncSendTest.java      |    2 -
 .../apache/camel/component/nagios/NagiosTest.java  |    1 -
 .../component/nagios/NagiosXorEncryptionTest.java  |    1 -
 .../netty/http/DefaultNettyHttpBinding.java        |    5 +-
 .../netty/http/JAASSecurityAuthenticator.java      |    1 +
 .../component/netty/http/NettyHttpEndpoint.java    |    5 +-
 .../component/netty/http/NettyHttpHelper.java      |    3 +-
 .../netty/http/SecurityAuthenticatorSupport.java   |    1 +
 .../http/handlers/HttpServerChannelHandler.java    |   13 +-
 .../HttpServerMultiplexChannelHandler.java         |    1 +
 .../camel/component/netty/http/BaseNettyTest.java  |    1 -
 .../netty/http/ManagedNettyEndpointTest.java       |    1 +
 .../camel/component/netty/http/MyLoginModule.java  |    1 +
 .../NettyHttpBasicAuthConstraintMapperTest.java    |    5 +-
 .../netty/http/NettyHttpBasicAuthTest.java         |    5 +-
 .../netty/http/NettyHttpGlobalSSLTest.java         |    1 -
 .../component/netty/http/NettyHttpSSLTest.java     |    4 +-
 ...ttyHttpSimpleBasicAuthConstraintMapperTest.java |    5 +-
 .../netty/http/NettyHttpSimpleBasicAuthTest.java   |    5 +-
 .../netty/http/NettySharedHttpServerTest.java      |    3 +-
 .../netty/http/SecurityConstraintMappingTest.java  |   12 +-
 .../netty/http/SpringNettyHttpBasicAuthTest.java   |    5 +-
 .../netty/http/SpringNettyHttpSSLTest.java         |    6 +-
 .../netty/http/rest/RestPathMatchingTest.java      |    7 +-
 .../camel-netty/src/main/docs/netty-component.adoc |    4 +-
 .../camel/component/netty/NettyConfiguration.java  |    2 +-
 .../camel/component/netty/NettyConsumer.java       |    4 +-
 .../camel/component/netty/NettyConverter.java      |    1 +
 .../camel/component/netty/NettyEndpoint.java       |    1 +
 .../apache/camel/component/netty/NettyHelper.java  |    4 +-
 .../SingleUDPNettyServerBootstrapFactory.java      |    2 +-
 .../netty/handlers/ClientChannelHandler.java       |    4 +-
 .../netty/handlers/ServerChannelHandler.java       |    2 +-
 .../component/netty/ssl/SSLEngineFactory.java      |    1 +
 .../camel/component/netty/BaseNettyTest.java       |    1 -
 .../camel/component/netty/NettyRedeliveryTest.java |    3 +-
 .../apache/camel/component/netty/NettySSLTest.java |    1 +
 .../camel/component/netty/NettyTCPAsyncTest.java   |    1 -
 .../camel/component/netty/NettyUDPAsyncTest.java   |    1 -
 .../netty/NettyUDPMulticastAsyncTest.java          |    1 -
 ...ttyUseSharedWorkerThreadPoolManyRoutesTest.java |    3 +-
 .../netty4/http/DefaultNettyHttpBinding.java       |    5 +-
 .../netty4/http/HttpServerBootstrapFactory.java    |    2 -
 .../netty4/http/JAASSecurityAuthenticator.java     |    1 +
 .../component/netty4/http/NettyHttpEndpoint.java   |    5 +-
 .../component/netty4/http/NettyHttpHelper.java     |    3 +-
 .../netty4/http/SecurityAuthenticatorSupport.java  |    1 +
 .../http/handlers/HttpClientChannelHandler.java    |    1 -
 .../http/handlers/HttpServerChannelHandler.java    |   32 +-
 .../HttpServerMultiplexChannelHandler.java         |   63 +-
 .../camel/component/netty4/http/BaseNettyTest.java |    2 -
 .../component/netty4/http/LogCaptureTest.java      |    1 -
 .../netty4/http/ManagedNettyEndpointTest.java      |    1 +
 .../camel/component/netty4/http/MyLoginModule.java |    1 +
 ...tyHttpAccessHttpRequestAndResponseBeanTest.java |    1 -
 .../http/NettyHttpAccessHttpRequestTest.java       |    2 -
 .../NettyHttpBasicAuthConstraintMapperTest.java    |    5 +-
 .../netty4/http/NettyHttpBasicAuthTest.java        |    5 +-
 ...pBindingPreservePostFormUrlEncodedBodyTest.java |    1 -
 .../NettyHttpBindingUseRelativePathInPostTest.java |    1 -
 .../netty4/http/NettyHttpCompressTest.java         |    1 -
 .../http/NettyHttpGetWithInvalidMessageTest.java   |    2 -
 .../NettyHttpOperationFailedExceptionTest.java     |    1 -
 .../netty4/http/NettyHttpProducerSimpleTest.java   |    2 -
 .../netty4/http/NettyHttpRequestTimeoutTest.java   |    2 -
 .../component/netty4/http/NettyHttpSSLTest.java    |    4 +-
 ...ttyHttpSimpleBasicAuthConstraintMapperTest.java |    5 +-
 .../netty4/http/NettyHttpSimpleBasicAuthTest.java  |    5 +-
 .../netty4/http/NettyRequestManagementTest.java    |    1 -
 .../netty4/http/NettySharedHttpServerTest.java     |    3 +-
 .../netty4/http/SecurityConstraintMappingTest.java |   12 +-
 .../netty4/http/SpringNettyHttpBasicAuthTest.java  |    5 +-
 .../netty4/http/SpringNettyHttpSSLTest.java        |    6 +-
 .../netty4/http/rest/RestNettyHttpOptionsTest.java |   28 +-
 .../netty4/http/rest/RestPathMatchingTest.java     |    7 +-
 .../src/main/docs/netty4-component.adoc            |    4 +-
 .../ClientModeTCPNettyServerBootstrapFactory.java  |    1 -
 .../netty4/DefaultClientInitializerFactory.java    |    1 -
 .../netty4/DefaultServerInitializerFactory.java    |    1 -
 .../camel/component/netty4/NettyComponent.java     |    1 -
 .../camel/component/netty4/NettyConfiguration.java |    2 +-
 .../camel/component/netty4/NettyConsumer.java      |    4 +-
 .../camel/component/netty4/NettyConverter.java     |    1 -
 .../camel/component/netty4/NettyEndpoint.java      |    1 -
 .../apache/camel/component/netty4/NettyHelper.java |    5 +-
 .../netty4/NettyServerBootstrapFactory.java        |    1 -
 .../SingleTCPNettyServerBootstrapFactory.java      |    1 -
 .../SingleUDPNettyServerBootstrapFactory.java      |    2 +-
 .../netty4/handlers/ClientChannelHandler.java      |    4 +-
 .../netty4/handlers/ServerChannelHandler.java      |    2 +-
 .../handlers/ServerResponseFutureListener.java     |    1 -
 .../component/netty4/ssl/SSLEngineFactory.java     |    1 +
 .../camel/component/netty4/BaseNettyTest.java      |    2 -
 .../camel/component/netty4/LogCaptureTest.java     |    1 -
 .../camel/component/netty4/MultipleCodecsTest.java |    1 -
 .../camel/component/netty4/MyCustomCodec.java      |    1 +
 .../component/netty4/NettyManualEndpointTest.java  |    1 -
 .../component/netty4/NettyRedeliveryTest.java      |    3 +-
 .../netty4/NettySSLConsumerClientModeTest.java     |    1 -
 .../component/netty4/NettySingleCodecTest.java     |    1 -
 .../camel/component/netty4/NettyTCPAsyncTest.java  |    1 -
 .../camel/component/netty4/NettyUDPAsyncTest.java  |    1 -
 .../netty4/NettyUDPMulticastAsyncTest.java         |    1 -
 ...ttyUseSharedWorkerThreadPoolManyRoutesTest.java |    3 +-
 .../camel/component/olingo2/Olingo2AppAPITest.java |    6 +-
 .../component/olingo2/Olingo2ComponentTest.java    |    3 +-
 .../camel/component/olingo4/Olingo4AppAPITest.java |    6 +-
 .../component/olingo4/Olingo4ComponentTest.java    |    2 +-
 .../component/openshift/OpenShiftProducer.java     |    3 +-
 .../component/openshift/OpenShiftAddAliasTest.java |    3 +-
 .../OpenShiftAddEmbeddedCartridgeTest.java         |    3 +-
 .../OpenShiftAddEnvironmentVariableTest.java       |    3 +-
 ...enShiftAddMultipleEnvironmentVariablesTest.java |    3 +-
 .../openshift/OpenShiftConsumerOnChangeTest.java   |    3 +-
 .../component/openshift/OpenShiftConsumerTest.java |    3 +-
 .../openshift/OpenShiftGetAliasesTest.java         |    3 +-
 .../OpenShiftGetAllEnvironmentVariablesTest.java   |    3 +-
 .../openshift/OpenShiftGetDeploymentTypeTest.java  |    3 +-
 .../OpenShiftGetEmbeddedCartridgesTest.java        |    3 +-
 .../OpenShiftGetEnvironmentVariableValueTest.java  |    3 +-
 .../openshift/OpenShiftGetGearProfileTest.java     |    3 +-
 .../openshift/OpenShiftGetGitUrlTest.java          |    3 +-
 .../OpenShiftGetStandaloneCartridgeTest.java       |    3 +-
 .../OpenShiftListApplicationsModeJsonTest.java     |    3 +-
 .../openshift/OpenShiftListApplicationsTest.java   |    3 +-
 .../openshift/OpenShiftRemoveAliasTest.java        |    3 +-
 .../OpenShiftRemoveEmbeddedCartridgeTest.java      |    3 +-
 .../OpenShiftRemoveEnvironmentVariableTest.java    |    3 +-
 .../openshift/OpenShiftScaleDownTest.java          |    3 +-
 .../component/openshift/OpenShiftScaleUpTest.java  |    3 +-
 .../openshift/OpenShiftSetDeploymentTypeTest.java  |    3 +-
 .../component/openshift/OpenShiftStateTest.java    |    3 +-
 .../OpenShiftUpdateEnvironmentVariableTest.java    |    3 +-
 .../cinder/producer/SnapshotProducer.java          |   10 +-
 .../openstack/cinder/producer/VolumeProducer.java  |   14 +-
 .../common/AbstractOpenstackProducer.java          |    3 +-
 .../component/openstack/glance/GlanceProducer.java |    7 +-
 .../keystone/producer/DomainProducer.java          |    8 +-
 .../openstack/keystone/producer/GroupProducer.java |   20 +-
 .../keystone/producer/ProjectProducer.java         |    8 +-
 .../keystone/producer/RegionProducer.java          |    6 +-
 .../openstack/keystone/producer/UserProducer.java  |    8 +-
 .../neutron/producer/NetworkProducer.java          |    8 +-
 .../openstack/neutron/producer/PortProducer.java   |    8 +-
 .../openstack/neutron/producer/RouterProducer.java |   13 +-
 .../openstack/neutron/producer/SubnetProducer.java |    9 +-
 .../openstack/nova/producer/FlavorsProducer.java   |    8 +-
 .../openstack/nova/producer/KeypairProducer.java   |    8 +-
 .../openstack/nova/producer/ServerProducer.java    |   13 +-
 .../swift/producer/ContainerProducer.java          |   14 +-
 .../openstack/swift/producer/ObjectProducer.java   |   24 +-
 .../camel/opentracing/OpenTracingTracer.java       |   12 +-
 .../camel-paho/src/main/docs/paho-component.adoc   |    3 +-
 .../apache/camel/component/paho/PahoConsumer.java  |    4 +-
 .../apache/camel/component/paho/PahoEndpoint.java  |   32 +-
 .../camel/component/paho/PahoComponentTest.java    |    2 +
 .../component/paho/PahoOverrideTopicTest.java      |    2 +
 .../camel/component/pgevent/PgEventConsumer.java   |    2 +-
 .../camel/component/pgevent/PgEventEndpoint.java   |    2 +-
 .../camel/component/printer/PrinterOperations.java |    4 +-
 .../camel/component/quartz/QuartzComponent.java    |   12 +-
 .../camel/component/quartz/QuartzMessage.java      |    1 -
 .../quartz/CronScheduledRoutePolicy.java           |    2 +-
 .../routepolicy/quartz/ScheduledRoutePolicy.java   |    2 +-
 .../quartz/SimpleScheduledRoutePolicy.java         |    2 +-
 ...omponentCamelContextSchedulerIsolationTest.java |    1 -
 .../component/quartz/QuartzPropertiesTest.java     |    3 +-
 ...PersistentStoreRestartAppChangeOptionsTest.java |    1 -
 .../apache/camel/component/quartz2/CamelJob.java   |    2 +-
 .../camel/component/quartz2/QuartzComponent.java   |    5 +-
 .../camel/component/quartz2/QuartzEndpoint.java    |    1 +
 .../QuartzScheduledPollConsumerScheduler.java      |    3 +-
 .../quartz2/CronScheduledRoutePolicy.java          |    2 +-
 .../routepolicy/quartz2/ScheduledRoutePolicy.java  |    2 +-
 .../quartz2/SimpleScheduledRoutePolicy.java        |    2 +-
 ...omponentCamelContextSchedulerIsolationTest.java |    1 -
 .../component/quartz2/QuartzPropertiesTest.java    |    3 +-
 ...PersistentStoreRestartAppChangeOptionsTest.java |    1 -
 .../FileConsumerQuartzSchedulerRestartTest.java    |    3 +-
 .../quartz2/FileConsumerQuartzSchedulerTest.java   |    3 +-
 .../component/quickfixj/MessageCorrelator.java     |    1 -
 .../component/quickfixj/MessagePredicate.java      |    1 -
 .../camel/component/quickfixj/QuickfixjEngine.java |   12 +-
 .../component/quickfixj/QuickfixjProducer.java     |    1 -
 .../quickfixj/converter/QuickfixjConverters.java   |    1 -
 .../quickfixj/QuickfixjComponentTest.java          |    1 +
 .../component/quickfixj/QuickfixjEngineTest.java   |    3 -
 .../quickfixj/QuickfixjLazyProducerTest.java       |    5 +-
 .../component/quickfixj/QuickfixjProducerTest.java |    1 +
 .../component/quickfixj/QuickfixjSpringTest.java   |    3 +-
 .../camel/component/quickfixj/TestSupport.java     |    1 -
 .../quickfixj/examples/AuthenticationExample.java  |    2 -
 .../quickfixj/examples/DynamicRoutingExample.java  |    1 -
 .../quickfixj/examples/RequestReplyExample.java    |    2 -
 .../quickfixj/examples/SimpleMessagingExample.java |    1 -
 .../examples/routing/FixMessageRouter.java         |    1 -
 .../quickfixj/examples/trading/TradeExecutor.java  |    1 -
 .../examples/trading/TradeExecutorComponent.java   |    2 -
 .../examples/trading/TradeExecutorExample.java     |    1 -
 .../transform/QuickfixjEventJsonTransformer.java   |    1 -
 .../transform/QuickfixjMessageJsonPrinter.java     |    2 -
 .../camel/component/rabbitmq/RabbitConsumer.java   |    3 +-
 .../component/rabbitmq/RabbitMQComponent.java      |    1 +
 .../camel/component/rabbitmq/RabbitMQConsumer.java |    1 -
 .../camel/component/rabbitmq/RabbitMQEndpoint.java |    1 -
 .../rabbitmq/RabbitMQMessagePublisher.java         |    1 -
 .../camel/component/rabbitmq/RabbitMQProducer.java |    1 -
 .../component/rabbitmq/reply/ReplyHolder.java      |    1 -
 .../rabbitmq/reply/ReplyManagerSupport.java        |    1 -
 .../rabbitmq/reply/TemporaryQueueReplyHandler.java |    1 -
 .../rabbitmq/reply/TemporaryQueueReplyManager.java |    1 -
 .../rabbitmq/AbstractRabbitMQIntTest.java          |    1 +
 .../component/rabbitmq/RabbitMQComponentTest.java  |    1 -
 .../rabbitmq/RabbitMQConsumerIntTestReplyTo.java   |    1 -
 .../component/rabbitmq/RabbitMQConsumerTest.java   |    1 -
 .../component/rabbitmq/RabbitMQEndpointTest.java   |    7 +-
 .../component/rabbitmq/RabbitMQProducerTest.java   |    1 -
 .../rabbitmq/RabbitMQReConnectionIntTest.java      |    1 -
 .../component/rabbitmq/RabbitMQSpringIntTest.java  |    1 -
 .../rabbitmq/qpid/RabbitMQConsumerQpidTest.java    |    1 -
 .../rabbitmq/qpid/RabbitMQInOutQpidTest.java       |    1 -
 .../rabbitmq/qpid/RabbitMQLoadQpidTest.java        |    1 -
 .../rabbitmq/qpid/RabbitMQProducerQpidTest.java    |    1 -
 .../qpid/RabbitMQReConnectionQpidTest.java         |    1 -
 .../rabbitmq/qpid/RabbitMQRequeueQpidTest.java     |    5 +-
 .../RabbitMQRequeueUnhandledExceptionQpidTest.java |    1 -
 .../qpid/RabbitMQSupendResumeQpidTest.java         |    1 -
 .../engine/DefaultCamelReactiveStreamsService.java |    1 +
 .../reactive/streams/util/ConvertingPublisher.java |    2 +-
 .../BackpressurePublisherRoutePolicyTest.java      |    1 -
 .../reactive/streams/BackpressureStrategyTest.java |    1 -
 .../streams/BackpressureSubscriberTest.java        |    1 -
 .../reactive/streams/BasicPublisherTest.java       |    1 -
 .../component/reactive/streams/BeanCallTest.java   |    1 -
 .../reactive/streams/ConcurrentConsumersTest.java  |    1 -
 .../reactive/streams/DelayedMonoPublisherTest.java |    1 -
 .../reactive/streams/DirectClientAPITest.java      |    1 -
 .../component/reactive/streams/EventTypeTest.java  |    1 -
 .../reactive/streams/ExchangeRequestTest.java      |    1 -
 .../streams/PublisherTypeConversionTest.java       |    1 -
 .../reactive/streams/ReactiveStreamsJMXTest.java   |    2 +-
 .../reactive/streams/RequestRefillTest.java        |    1 -
 .../streams/platforms/ReactorCorePlatformTest.java |    1 -
 .../streams/platforms/RxJava2PlatformTest.java     |    1 -
 .../CamelPublisherConversionVerificationTest.java  |    1 -
 .../tck/CamelPublisherVerificationTest.java        |    1 -
 .../CamelSubscriberConversionVerificationTest.java |    1 -
 .../tck/CamelSubscriberVerificationTest.java       |    1 -
 .../component/restlet/DefaultRestletBinding.java   |    2 +-
 .../camel/component/restlet/MethodBasedRouter.java |   29 +-
 .../component/restlet/RestletInvalidURLTest.java   |   50 +
 .../restlet/RestletProducerSynchronouslyTest.java  |    2 +-
 .../cloud/RibbonServiceCallUpdateRouteTest.java    |    3 +-
 .../routebox/seda/RouteboxSedaConsumer.java        |    2 +-
 .../routebox/strategy/RouteboxDispatcher.java      |    2 +-
 .../component/rss/AggregateRssFeedStrategy.java    |    1 -
 .../camel/component/rss/JettyTestServer.java       |    1 +
 .../RssEntryPollingConsumerWithBasicAuthTest.java  |    1 -
 .../rss/RssEntryPollingConsumerWithFilterTest.java |    1 +
 .../camel/component/rss/RssEntrySortTest.java      |    1 +
 .../rss/RssPollingConsumerWithBasicAuthTest.java   |    1 -
 .../camel/dataformat/rss/RssConverterTest.java     |    1 -
 .../camel/dataformat/rss/RssDataFormatTest.java    |    1 -
 .../component/salesforce/SalesforceConsumer.java   |   12 +-
 .../salesforce/BulkApiBatchIntegrationTest.java    |    2 +
 .../salesforce/BulkApiQueryIntegrationTest.java    |    2 +
 .../salesforce/SalesforceConsumerTest.java         |   11 +-
 .../salesforce/StreamingApiIntegrationTest.java    |    2 +-
 .../src/main/docs/xquery-component.adoc            |    4 +-
 .../xquery/XQueryAnnotationExpressionFactory.java  |    1 +
 .../camel/component/xquery/XQueryBuilder.java      |    1 +
 .../camel/converter/saxon/SaxonConverter.java      |    2 +-
 .../saxon/XPathSplitChoicePerformanceTest.java     |    3 +-
 .../xquery/XQueryFromFileExceptionTest.java        |    3 +-
 .../camel/component/xquery/XQueryFromFileTest.java |    3 +-
 .../xquery/XQueryLanguageFromFileTest.java         |    3 +-
 .../camel/component/xslt/SaxonUriResolverTest.java |    1 +
 .../camel/converter/saxon/SaxonConverterTest.java  |    1 -
 .../xpath/XPathLanguageDefaultSettingsTest.java    |    5 +-
 .../camel/language/xpath/XPathLanguageTest.java    |    5 +-
 .../component/schematron/SchematronEndpoint.java   |    1 +
 .../schematron/processor/ClassPathURIResolver.java |    1 +
 .../schematron/SchematronProducerTest.java         |    1 -
 .../apache/camel/builder/script/ScriptBuilder.java |    5 +-
 .../org/apache/camel/script/osgi/Activator.java    |    7 +-
 .../apache/camel/builder/script/Jsr223Test.java    |    4 +-
 .../script/example/AnyLanguageFilterTest.java      |    3 +
 .../script/example/BeanShellFilterTest.java        |    3 +
 .../builder/script/example/GroovyFilterTest.java   |    3 +
 .../script/example/JavaScriptFilterTest.java       |    3 +
 .../builder/script/example/PythonFilterTest.java   |    3 +
 .../builder/script/example/RubyFilterTest.java     |    3 +
 .../apache/camel/script/osgi/ActivatorTest.java    |    1 +
 .../component/servicenow/ServiceNowParams.java     |    3 +-
 .../src/main/docs/servlet-component.adoc           |   50 +-
 .../camel/component/servlet/ServletComponent.java  |    2 +-
 .../servlet/rest/RestServletOptionsTest.java       |   26 +-
 .../camel/component/sip/SipConfiguration.java      |    1 +
 .../camel/component/sip/PublishSubscribeTest.java  |    3 +-
 .../apache/camel/component/sjms/SjmsMessage.java   |    1 +
 .../apache/camel/component/sjms/SjmsProducer.java  |   18 +-
 .../component/sjms/batch/SjmsBatchComponent.java   |    1 +
 .../component/sjms/batch/SjmsBatchConsumer.java    |    1 +
 .../component/sjms/batch/SjmsBatchEndpoint.java    |    1 +
 .../sjms/consumer/AbstractMessageHandler.java      |    1 +
 .../sjms/consumer/InOutMessageHandler.java         |    3 +-
 .../camel/component/sjms/jms/JmsBinding.java       |    1 +
 .../camel/component/sjms/jms/JmsMessageHelper.java |    1 +
 .../component/sjms/producer/InOnlyProducer.java    |    2 +
 .../component/sjms/producer/InOutProducer.java     |    2 +-
 .../tx/SessionBatchTransactionSynchronization.java |    1 +
 .../component/sjms/JmsSelectorOptionTest.java      |    1 -
 .../camel/component/sjms/JmsSelectorTest.java      |    1 -
 .../component/sjms/SimpleJmsComponentTest.java     |    1 -
 .../sjms/SjmsEndpointNameOverrideTest.java         |    1 -
 .../sjms/batch/SjmsBatchConsumerTest.java          |    1 +
 .../sjms/batch/SjmsBatchEndpointTest.java          |    1 -
 .../sjms/consumer/AsyncConsumerFalseTest.java      |    1 -
 .../sjms/consumer/EmptyMessageBodyTest.java        |    1 -
 .../consumer/InOnlyConsumerAsyncFalseTest.java     |    1 -
 .../sjms/consumer/InOnlyConsumerAsyncTrueTest.java |    1 -
 .../sjms/consumer/InOnlyConsumerQueueTest.java     |    1 -
 .../sjms/consumer/InOnlyConsumerTempQueueTest.java |    1 -
 .../sjms/consumer/InOnlyConsumerTopicTest.java     |    1 -
 .../sjms/consumer/InOnlyQueueConsumerTest.java     |    1 -
 .../sjms/consumer/InOnlyTopicConsumerTest.java     |    1 -
 .../consumer/InOnlyTopicDurableConsumerTest.java   |    1 -
 .../sjms/consumer/InOutConsumerQueueAsyncTest.java |    1 -
 .../sjms/consumer/InOutConsumerQueueTest.java      |    1 -
 .../consumer/InOutConsumerTempQueueAsyncTest.java  |    1 -
 .../sjms/consumer/InOutConsumerTempQueueTest.java  |    1 -
 .../sjms/consumer/InOutConsumerTopicTest.java      |    1 -
 .../consumer/InOutSynchronousConsumerTest.java     |    1 -
 .../camel/component/sjms/it/AsyncJmsInOutIT.java   |    1 -
 .../component/sjms/it/AsyncJmsInOutTempDestIT.java |    1 -
 .../camel/component/sjms/it/SyncJmsInOutIT.java    |    1 -
 .../component/sjms/it/SyncJmsInOutTempDestIT.java  |    1 -
 .../sjms/jms/DestinationNameParserTest.java        |    4 +-
 .../sjms/producer/AsyncQueueProducerTest.java      |    1 -
 .../sjms/producer/AsyncTopicProducerTest.java      |    1 -
 .../sjms/producer/InOnlyQueueProducerTest.java     |    1 -
 .../sjms/producer/InOnlyTopicProducerTest.java     |    1 -
 .../producer/InOutQueueProducerAsyncLoadTest.java  |    6 +-
 .../producer/InOutQueueProducerSyncLoadTest.java   |    6 +-
 .../sjms/producer/InOutQueueProducerTest.java      |    1 -
 .../sjms/producer/InOutTempQueueProducerTest.java  |    1 -
 .../component/sjms/producer/QueueProducerTest.java |    1 -
 .../component/sjms/support/MockConnection.java     |    1 +
 .../sjms/support/MockConnectionFactory.java        |    2 +
 .../sjms/support/MockMessageConsumer.java          |    1 +
 .../camel/component/sjms/support/MockSession.java  |    1 +
 .../sjms/support/SjmsConnectionTestSupport.java    |    1 -
 .../slack/SlackComponentVerifierExtension.java     |   99 +-
 .../camel/component/slack/SlackConsumer.java       |   39 +-
 .../camel/component/slack/utils/SlackUtils.java    |   53 +
 .../slack/SlackComponentVerifierExtensionTest.java |   58 +-
 .../camel/component/slack/SlackConsumerTest.java   |    2 +-
 .../component/smpp/SmppConnectionFactory.java      |    2 +-
 .../apache/camel/component/smpp/SmppProducer.java  |    2 +-
 .../component/smpp/SmppConfigurationTest.java      |    2 +-
 .../component/smpp/SmppDataSmCommandTest.java      |    1 -
 .../camel/component/smpp/SmppNLSTSplitterTest.java |    1 +
 .../component/smpp/SmppReplaceSmCommandTest.java   |    1 -
 .../component/smpp/SmppSubmitMultiCommandTest.java |    1 -
 .../component/smpp/SmppSubmitSmCommandTest.java    |    1 -
 .../apache/camel/component/smpp/SmppUtilsTest.java |    1 -
 .../apache/camel/component/snmp/SnmpProducer.java  |    2 +-
 .../camel/component/snmp/SnmpTrapConsumer.java     |    2 +-
 .../camel/component/snmp/SnmpTrapProducer.java     |    2 +-
 .../dataformat/soap/Soap11DataFormatAdapter.java   |    1 +
 .../camel/dataformat/soap/SoapJaxbDataFormat.java  |    5 +-
 .../soap/name/ServiceInterfaceStrategy.java        |    1 -
 .../converter/soap/name/QNameStrategyTest.java     |    1 -
 .../soap/name/ServiceInterfaceStrategyTest.java    |    3 -
 .../converter/soap/name/TypeNameStrategyTest.java  |    1 -
 ...otElementPreferringElementNameStrategyTest.java |    1 +
 .../soap/MultiPartClientMarshalTest.java           |    1 -
 .../dataformat/soap/MultiPartCxfServerTest.java    |    1 -
 .../camel/dataformat/soap/SoapClientTest.java      |    1 -
 .../camel/dataformat/soap/SoapCxfClientTest.java   |    2 -
 .../camel/dataformat/soap/SoapCxfServerTest.java   |    1 -
 .../camel/dataformat/soap/SoapMarshalTest.java     |    1 -
 .../camel/dataformat/soap/SoapRoundtripTest.java   |    1 -
 .../camel/dataformat/soap/SoapServerTest.java      |    1 -
 .../dataformat/soap/SoapSpringRoundtripTest.java   |    1 -
 .../dataformat/soap/SoapToSoapDontIgnoreTest.java  |    3 +-
 .../dataformat/soap/SoapToSoapIgnoreTest.java      |    3 +-
 .../soap/SoapToSoapSingleDataFormatterTest.java    |    3 +-
 .../camel/dataformat/soap/SoapUnMarshalTest.java   |    2 -
 .../dataformat/soap12/Soap12UnMarshalTest.java     |    1 -
 .../component/sparkrest/DefaultSparkBinding.java   |    1 +
 .../camel/component/sparkrest/SparkConsumer.java   |    2 +-
 .../camel/component/sparkrest/BaseSparkTest.java   |    3 +-
 .../camel-spark/src/main/docs/spark-component.adoc |   16 +-
 .../camel/component/spark/DataFrameCallback.java   |    5 +-
 .../component/spark/DataFrameSparkProducer.java    |    9 +-
 .../camel/component/spark/HiveSparkProducer.java   |    5 +-
 .../camel/component/spark/SparkEndpoint.java       |    9 +-
 .../camel/component/spark/SparkProducerTest.java   |   20 +-
 .../component/splunk/support/SplunkDataWriter.java |    2 +-
 .../src/main/docs/spring-boot.adoc                 |   52 +
 .../spring/boot/TypeConversionConfiguration.java   |    2 +-
 .../integration/SpringIntegrationConsumer.java     |    5 +-
 .../integration/SpringIntegrationProducer.java     |    5 +-
 .../src/main/resources/META-INF/spring.schemas     |    1 +
 .../camel/component/redis/RedisConsumer.java       |   10 +-
 .../src/main/resources/META-INF/spring.schemas     |    1 +
 .../spring/ws/SpringWebserviceComponent.java       |    3 +-
 .../spring/ws/bean/CamelEndpointMapping.java       |    3 +
 .../spring/ws/bean/WSACamelEndpointMapping.java    |    4 +-
 .../spring/ws/ConsumerBreadcrumbIdTest.java        |    3 +-
 ...erEndpointMappingResponseHandlingRouteTest.java |    1 +
 .../ws/ConsumerEndpointMappingRouteTest.java       |    1 +
 .../spring/ws/ConsumerMarshallingRouteTest.java    |    3 +-
 .../ws/MessageFilterResolvingDefaultsTest.java     |    1 -
 .../spring/ws/MessageFilterResolvingTest.java      |    1 -
 .../spring/ws/ProducerLocalRouteTest.java          |    1 +
 .../spring/ws/ProducerRemoteRouteTest.java         |    1 +
 .../spring/ws/ProducerRemoteRouteTimeOutTest.java  |    2 -
 .../spring/ws/SoapResponseAttachmentTest.java      |    1 -
 .../spring/ws/StockQuoteResponseProcessor.java     |    1 +
 .../security/ProducerWss4JSecurityHeaderTest.java  |    6 +-
 .../camel/spring/CamelBeanPostProcessor.java       |    1 +
 .../camel/spring/CamelContextFactoryBean.java      |    7 +-
 .../camel/spring/CamelRestContextFactoryBean.java  |    1 +
 .../camel/spring/CamelRouteContextFactoryBean.java |    1 +
 .../main/java/org/apache/camel/spring/Main.java    |    8 +-
 .../spring/handler/CamelNamespaceHandler.java      |    5 +-
 .../camel/spring/spi/TransactionErrorHandler.java  |   26 +-
 .../spring/spi/TransactionErrorHandlerBuilder.java |    2 +-
 .../org/apache/camel/spring/util/MainRunner.java   |    1 -
 .../SSLContextClientParametersFactoryBean.java     |    1 -
 .../spring/SSLContextParametersFactoryBean.java    |    1 -
 .../SSLContextServerParametersFactoryBean.java     |    1 -
 .../spring/SecureRandomParametersFactoryBean.java  |    1 -
 .../src/main/resources/META-INF/spring.schemas     |    1 +
 .../bean/AutowireConstructorRouteTest.java         |    2 +
 .../bean/AutowireConstructorRouteTwoTest.java      |    2 +
 .../camel/component/bean/BeanBindingTest.java      |    5 +
 .../apache/camel/component/bean/BeanRouteTest.java |    6 +-
 .../camel/component/event/EventRouteTest.java      |    2 +
 .../component/log/CustomExchangeFormatterTest.java |    2 +
 .../camel/component/log/SpringLogMarkerTest.java   |    2 +
 .../apache/camel/component/log/SpringLogTest.java  |    2 +
 .../BaseSpringPropertiesComponentTest.java         |    5 +
 ...elSpringPropertyPlaceholderConfigurer2Test.java |    2 +
 ...elSpringPropertyPlaceholderConfigurer3Test.java |   11 +-
 ...ingPropertyPlaceholderConfigurerNestedTest.java |    2 +
 ...melSpringPropertyPlaceholderConfigurerTest.java |    2 +
 .../properties/SpringBuilderRefBeanInjectTest.java |    2 +
 .../properties/SpringBuilderRefPropertiesTest.java |    2 +
 .../SpringBuilderRefPropertyInjectTest.java        |    2 +
 ...rorHandlerInlinedPropertiesPlaceholderTest.java |    2 +
 ...pringErrorHandlerPropertiesPlaceholderTest.java |    2 +
 .../properties/SpringPackagePropertiesTest.java    |    2 +
 .../SpringPackageScanPropertiesTest.java           |    2 +
 ...SpringPropertiesComponentCacheDisabledTest.java |    5 +-
 .../SpringPropertiesComponentRefTest.java          |    2 +
 .../properties/SpringPropertiesComponentTest.java  |    2 +
 .../properties/SpringPropertiesResolverTest.java   |    2 +
 .../apache/camel/component/rest/RestRefTest.java   |    2 +
 .../rest/SpringFromRestDuplicateTest.java          |    7 +-
 .../language/SpringSimpleEmptyStringTest.java      |    2 +
 .../camel/language/SpringSimpleExpressionTest.java |    3 +
 .../camel/language/SpringSimpleNewlineTest.java    |    2 +
 .../SpringSimplePropertyPlaceholderClashTest.java  |    2 +
 .../camel/language/SpringSimpleRegexTest.java      |    2 +
 .../camel/language/SpringSimpleWeirdIssueTest.java |    2 +
 .../SpringTokenXMLPairNamespaceSplitTest.java      |    2 +
 .../camel/language/SpringXMLTokenSplitTest.java    |    2 +
 .../camel/language/spel/SpelNonSpringTest.java     |    3 +
 .../apache/camel/language/spel/SpelRouteTest.java  |    4 +
 .../apache/camel/language/spel/SpelSpringTest.java |    3 +
 .../org/apache/camel/language/spel/SpelTest.java   |    5 +
 .../spel/SpringSimpleMultiLineExpressionTest.java  |    2 +
 .../camel/processor/RemoveHeadersExcludeTest.java  |    2 +
 .../spring/ApplicationContextClassLoaderTest.java  |    2 +
 .../spring/ApplicationContextTestSupport.java      |    1 +
 .../apache/camel/spring/CamelContextAwareTest.java |    8 +-
 .../camel/spring/CamelContextFactoryBeanTest.java  |   16 +-
 .../CamelContextLazyLoadTypeConvertersTest.java    |    2 +
 .../camel/spring/CamelGlobalOptionsTest.java       |    2 +
 .../camel/spring/CamelLoadRoutesFromXMLTest.java   |    2 +
 .../spring/CustomProcessorWithNamespacesTest.java  |    7 +-
 .../apache/camel/spring/DefaultJMXAgentTest.java   |   12 +-
 .../camel/spring/DefaultStreamCachingTest.java     |    6 +-
 .../apache/camel/spring/DisableJmxAgentTest.java   |    2 +
 .../spring/DumpModelAsXmlPlaceholdersTest.java     |    2 +
 .../apache/camel/spring/EndpointReferenceTest.java |    5 +
 .../apache/camel/spring/EndpointToIdRefTest.java   |    2 +
 .../org/apache/camel/spring/InjectedBeanTest.java  |    8 +-
 .../camel/spring/JMXAgentPropertiesTest.java       |    2 +
 .../java/org/apache/camel/spring/JMXAgentTest.java |    5 +-
 .../spring/LifecycleStrategyInjectionTest.java     |    2 +
 .../org/apache/camel/spring/MainDummyTest.java     |    6 +-
 .../org/apache/camel/spring/MainExampleTest.java   |    7 +-
 .../java/org/apache/camel/spring/MainTest.java     |    6 +-
 .../java/org/apache/camel/spring/MainVetoTest.java |    4 +-
 .../MultipleLifecycleStrategyInjectionTest.java    |    2 +
 .../apache/camel/spring/RegistryInjectionTest.java |    2 +
 .../RoutingUsingCamelContextFactoryTest.java       |    7 +-
 .../spring/SendMessageOnRouteStartAndStopTest.java |   11 +-
 .../SpringCamelContextShutdownAfterBeanTest.java   |    2 +
 .../SpringCamelContextShutdownBeforeBeanTest.java  |    2 +
 .../SpringChangeFunctionStartFunctionEndTest.java  |    7 +-
 .../camel/spring/SpringEndpointPropertyTest.java   |    2 +
 .../spring/SpringLogDebugBodyMaxCharsTest.java     |    1 +
 .../org/apache/camel/spring/SpringMDCTest.java     |    3 +
 .../org/apache/camel/spring/SpringTestSupport.java |    8 +-
 .../aop/SpringAopClassLevelCamelBeanTest.java      |    3 +
 .../camel/spring/bind/BeanAsEndpointTest.java      |    2 +
 .../org/apache/camel/spring/bind/BeanInfoTest.java |   14 +-
 .../camel/spring/bind/ProcessorAsEndpointTest.java |    4 +-
 .../camel/spring/config/AnotherCamelProxyTest.java |    7 +-
 .../spring/config/CamelContextAutoStartupTest.java |   15 +-
 .../spring/config/CamelContextFactoryBeanTest.java |   16 +-
 .../camel/spring/config/CamelPropertiesTest.java   |    2 +
 .../apache/camel/spring/config/CamelProxyTest.java |    2 +
 .../spring/config/CamelProxyUsingRefTest.java      |    7 +-
 .../spring/config/CamelSpringPackageTest.java      |    2 +
 .../DefaultPackageResolverConfigureTest.java       |    2 +
 .../DualCamelContextEndpointOutsideTest.java       |    2 +
 .../ErrorHandlerCamelContextRefNotFoundTest.java   |    7 +-
 .../ErrorHandlerRouteContextRefNotFoundTest.java   |    7 +-
 .../camel/spring/config/ErrorHandlerTest.java      |    2 +
 .../OnExceptionNoExceptionConfiguredTest.java      |    7 +-
 ...eRouteRefOnExceptionAndDLCErrorHandlerTest.java |    3 +
 ...uteRefOnExceptionAndTwoDLCErrorHandlerTest.java |    3 +
 .../spring/config/OneRouteRefOnExceptionTest.java  |    3 +
 ...efReverseOnExceptionAndDLCErrorHandlerTest.java |    3 +
 .../config/OneRouteRefReverseOnExceptionTest.java  |    3 +
 .../config/RouteAutoStartupPropertiesTest.java     |   15 +-
 .../camel/spring/config/RouteBuilderRef2Test.java  |    2 +
 .../camel/spring/config/RouteBuilderRefTest.java   |    2 +
 .../spring/config/RouteRefIncludeXmlFileTest.java  |    3 +
 .../RouteRefMultipleCamelContextRefsTest.java      |    6 +-
 .../spring/config/RouteRefMultipleRefsTest.java    |    2 +
 .../spring/config/RouteRefMultipleRoutesTest.java  |    3 +
 ...rtyPlaceholderMultipleCamelContextRefsTest.java |    6 +-
 .../apache/camel/spring/config/RouteRefTest.java   |    3 +
 ...lContextCustomDefaultThreadPoolProfileTest.java |    2 +
 ...ingCamelContextCustomThreadPoolProfileTest.java |    2 +
 .../config/SpringCamelContextDependsOnTest.java    |    2 +
 .../config/SpringCamelContextNoDependsOnTest.java  |    2 +
 ...xtSimpleCustomDefaultThreadPoolProfileTest.java |    2 +
 .../SpringCamelContextThreadPoolProfilesTest.java  |    3 +
 .../config/SpringErrorHandlerConfigTest.java       |    4 +
 .../SpringProduceInjectedPrototypeBeanTest.java    |    3 +
 .../SpringProduceInjectedSingletonBeanTest.java    |    3 +
 .../camel/spring/config/SpringRouteNoFromTest.java |    7 +-
 .../spring/config/SpringRouteNoOutputTest.java     |    7 +-
 ...oRouteRefOnExceptionAndDLCErrorHandlerTest.java |    3 +
 .../spring/config/TwoRouteRefOnExceptionTest.java  |    3 +
 ...efReverseOnExceptionAndDLCErrorHandlerTest.java |    3 +
 .../config/TwoRouteRefReverseOnExceptionTest.java  |    3 +
 ...teExclusionFromWithinSpringTestSupportTest.java |    3 +
 .../config/scan/SpringComponentScanTest.java       |   12 +-
 ...ingComponentScanWithDeprecatedPackagesTest.java |   11 +-
 ...anOnExceptionAndDLCErrorHandlerReverseTest.java |    3 +
 ...ntextScanOnExceptionAndDLCErrorHandlerTest.java |    3 +
 .../spring/converter/ResourceConverterTest.java    |    3 +
 .../spring/example/ContentBasedRouteTest.java      |    9 +-
 .../camel/spring/example/FooEventRouteTest.java    |    2 +
 .../camel/spring/example/PojoConsumerTest.java     |    7 +-
 .../example/PojoDualCamelContextConsumerTest.java  |   14 +-
 .../camel/spring/example/PojoSenderTest.java       |    9 +-
 .../camel/spring/example/PojoVmConsumerTest.java   |    7 +-
 .../camel/spring/example/SimpleRouteTest.java      |    3 +-
 .../spring/example/SpringExpressionTrimTest.java   |    4 +
 .../spring/file/SpringFileLanguageCBRTest.java     |    9 +-
 .../handler/ErrorHandlerDefinitionParserTest.java  |   15 +-
 .../SpringProduceConsumeImplicitPropertyTest.java  |    2 +
 .../interceptor/ContainerWideInterceptorTest.java  |   12 +-
 .../spring/interceptor/DelayerInterceptorTest.java |    2 +
 .../MixedPropagationTransactedTest.java            |   13 +-
 .../MixedStreamCachingInterceptorTest.java         |    5 +
 .../MixedTransactionPropagationTest.java           |   10 +-
 .../NoStreamCachingInterceptorTest.java            |    4 +
 .../SpringAdviceWithTwoRoutesOnExceptionTest.java  |    1 +
 ...ransactionalClientDataSourceTransactedTest.java |    8 +-
 ...hOnExceptionAndRollbackUsingTransactedTest.java |    2 +
 .../interceptor/StreamCachingInterceptorTest.java  |    3 +
 .../spring/interceptor/TraceFormatterTest.java     |    2 +
 .../interceptor/TracerConfigurationTest.java       |    2 +
 .../TransactedInterceptSendToEndpointTest.java     |    3 +
 .../TransactionClientDataSourceSupport.java        |    4 +-
 .../TransactionalClientDataSourceAsyncTest.java    |    2 +
 .../TransactionalClientDataSourceHandledTest.java  |    2 +
 ...alClientDataSourceMinimalConfigurationTest.java |    8 +-
 ...ctionalClientDataSourceMixedTransactedTest.java |    2 +
 ...sactionalClientDataSourceNotTransactedTest.java |    2 +
 ...lClientDataSourceOnExceptionRedeliveryTest.java |    2 +
 ...ransactionalClientDataSourceRedeliveryTest.java |    2 +
 .../TransactionalClientDataSourceTest.java         |    3 +
 ...ataSourceTransactedWithFileOnExceptionTest.java |    3 +
 ...onalClientDataSourceTransactedWithFileTest.java |    8 +-
 ...lientDataSourceWithDefaultErrorHandlerTest.java |    4 +-
 ...ourceWithOnExceptionHandledAndRollbackTest.java |    2 +
 ...ptionHandledAndRollbackUsingTransactedTest.java |    2 +
 ...lientDataSourceWithOnExceptionRollbackTest.java |    2 +
 ...ctionalClientDataSourceWithOnExceptionTest.java |    2 +
 ...ClientDataSourceWithSpringRouteBuilderTest.java |    5 +-
 .../TransactionalClientWithAnnotatedBeanTest.java  |    8 +-
 .../TransactionalClientWithRollbackTest.java       |    8 +-
 .../CamelContextModelErrorHandlerIssueTest.java    |    5 +-
 .../issues/CamelRouteRefInjectionIssueTest.java    |    2 +
 .../camel/spring/issues/CustomIdIssuesTest.java    |    2 +
 .../issues/FileWireTapWithXMLPayloadIssueTest.java |    7 +-
 .../spring/issues/MisspelledRouteRefTest.java      |    7 +-
 .../issues/ProduceSplitMethodCallIssueTest.java    |    2 +
 ...RedeliveryErrorHandlerTwoXmlFilesIssueTest.java |    2 +
 ...viceWithContextScopedErrorHandlerIssueTest.java |    2 +
 .../spring/issues/SpringCatchNestedFailTest.java   |    4 +
 ...ngCharlesSplitAndTryCatchRollbackIssueTest.java |    1 +
 .../spring/issues/SpringFinallyNestedFailTest.java |    4 +
 ...stanceFactoryBeanCamelContextScanIssueTest.java |    2 +
 .../issues/SpringInstanceFactoryBeanIssueTest.java |    2 +
 .../issues/SpringMainStartFailedIssueTest.java     |    2 +
 .../camel/spring/issues/SpringPackageTest.java     |    2 +
 ...ngPropertyPlaceholderFileEndpointIssueTest.java |    2 +
 .../issues/SpringPropertyPlaceholderIssueTest.java |    2 +
 .../issues/SpringRenameFileOnCommitIssueTest.java  |    7 +-
 .../issues/SpringSingletonScopedBeanIssueTest.java |    2 +
 ...ringSplitterDetermineErrorHandlerIssueTest.java |    2 +
 ...andlerAndContextScopedOnExceptionIssueTest.java |    8 +-
 .../SpringTryCatchFinallyAndErrorHandlerTest.java  |    4 +
 .../issues/SpringTryCatchWithSplitIssueTest.java   |    1 +
 ...SpringTryCatchWithSplitNotHandledIssueTest.java |    1 +
 .../spring/issues/SpringTryNestedFailTest.java     |    3 +
 .../SpringTwoCamelContextDirectEndpointTest.java   |    6 +-
 .../camel/spring/issues/StringDataFormatTest.java  |    3 +
 .../SpringRouteIsComponentAnnotatedTest.java       |    2 +
 .../SpringRouteIsComponentAnnotated2Test.java      |    2 +
 .../packagescan/SkipNonPublicRouteBuilderTest.java |    2 +
 ...ualCamelContextManagedAutoAssignedNameTest.java |    3 +
 .../management/DualCamelContextManagedTest.java    |    3 +
 .../JmxInstrumentationWithConnectorTest.java       |    3 +
 .../ManagedEndpointInjectRefEndpointTest.java      |    3 +
 .../spring/management/ManagedRefEndpointTest.java  |    3 +
 .../SpringCamelContextStartingFailedEventTest.java |    2 +
 .../SpringJmxDumpCBRRoutesAsXmlTest.java           |    2 +
 ...pringJmxDumpRoutesAsXmlIncludeHostNameTest.java |    2 +
 .../management/SpringJmxDumpRoutesAsXmlTest.java   |    2 +
 .../SpringJmxEndpointInjectBeanRefTest.java        |    2 +
 .../SpringJmxEndpointInjectBeanRefTwoTest.java     |    2 +
 .../SpringJmxEndpointInjectBeanTest.java           |    2 +
 .../SpringJmxRecipientListRegisterAlwaysTest.java  |    2 +
 .../management/SpringJmxRecipientListTest.java     |    2 +
 .../management/SpringManagedCamelContextTest.java  |    1 +
 .../SpringManagedCustomProcessorTest.java          |    2 +
 .../management/SpringManagedErrorHandlerTest.java  |    1 +
 .../management/SpringManagedSedaEndpointTest.java  |    2 +
 .../SpringManagedStatisticsLevelOffTest.java       |    1 +
 ...SpringManagedStatisticsLevelRoutesOnlyTest.java |    1 +
 .../SpringManagedTransactedProcessorTest.java      |    3 +
 .../org/apache/camel/spring/mock/BeanMockTest.java |    2 +
 .../InterceptSendToMockEndpointStrategyTest.java   |    2 +
 .../FileConsumerSpringSchedulerTest.java           |    3 +-
 ...CamelCustomPostProcessorOnRouteBuilderTest.java |    2 +
 ...pringCustomPostProcessorOnRouteBuilderTest.java |    6 +-
 .../DualSpringManagedThreadsThreadPoolTest.java    |    2 +
 .../JavaDslTransactedNoTXManagerTest.java          |    2 +
 .../processor/SpringAOPAfterFinallyTest.java       |    1 +
 .../camel/spring/processor/SpringAOPAfterTest.java |    1 +
 .../processor/SpringAOPAroundFinallyTest.java      |    1 +
 .../spring/processor/SpringAOPBeforeTest.java      |    1 +
 .../spring/processor/SpringAOPNestedRouteTest.java |    1 +
 .../SpringAggregatorWithCustomStrategyTest.java    |    3 +
 .../processor/SpringCBRHeaderPredicateTest.java    |    1 +
 .../camel/spring/processor/SpringChoiceTest.java   |    1 +
 .../processor/SpringComplexBlockWithEndTest.java   |    5 +
 .../spring/processor/SpringConvertBodyTest.java    |    1 +
 .../processor/SpringCustomExpressionTest.java      |    2 +
 .../processor/SpringCustomPredicateTest.java       |    2 +
 ...gDeadLetterChannelInvalidDeadLetterUriTest.java |    5 +-
 ...etterChannelInvalidOptionDeadLetterUriTest.java |    5 +-
 ...ingDeadLetterChannelUseOriginalBodyNewTest.java |    1 +
 ...SpringDeadLetterChannelUseOriginalBodyTest.java |    1 +
 ...adLetterChannelUseOriginalBodyWithFileTest.java |    1 +
 ...ingDefaultErrorHandlerOnExceptionTraceTest.java |    1 +
 .../processor/SpringDelayerPerRouteTest.java       |    1 +
 .../camel/spring/processor/SpringDelayerTest.java  |    1 +
 ...ringDoubleLoadBalancerMisconfigurationTest.java |    7 +-
 .../spring/processor/SpringEnricherRefTest.java    |    8 +-
 .../camel/spring/processor/SpringEnricherTest.java |    7 +-
 ...ingErrorHandlerRedeliveryPolicyProfileTest.java |    2 +
 .../spring/processor/SpringFaultRouteTest.java     |    1 +
 .../spring/processor/SpringFilterNoChildTest.java  |    7 +-
 .../camel/spring/processor/SpringFilterTest.java   |    1 +
 .../spring/processor/SpringFromEndpointTest.java   |    1 +
 .../processor/SpringFromMultipleEndpointTest.java  |    1 +
 .../processor/SpringHandleFaultPerRouteTest.java   |    1 +
 ...dempotentConsumerNoSkipDuplicateFilterTest.java |    2 +
 ...pringIdempotentConsumerNoSkipDuplicateTest.java |    2 +
 .../processor/SpringIdempotentConsumerTest.java    |    2 +
 .../spring/processor/SpringInterceptFromTest.java  |    3 +-
 .../processor/SpringInterceptFromUriRegexTest.java |    1 +
 .../SpringInterceptFromUriSimpleLogTest.java       |    1 +
 .../SpringInterceptFromUriWildcardTest.java        |    1 +
 .../SpringInterceptFromWhenNoStopTest.java         |    1 +
 .../processor/SpringInterceptFromWhenTest.java     |    1 +
 .../SpringInterceptFromWhenWithChoiceTest.java     |    1 +
 .../processor/SpringInterceptFromWithStopTest.java |    3 +-
 .../SpringInterceptSendToEndpointDynamicTest.java  |    4 +
 ...ngInterceptSendToEndpointInOnExceptionTest.java |    1 +
 .../SpringInterceptSendToEndpointSkipTest.java     |    3 +
 .../SpringInterceptSendToEndpointTest.java         |    3 +
 .../SpringInterceptSendToEndpointWhenTest.java     |    3 +
 .../SpringInterceptSimpleRouteStopTest.java        |    1 +
 .../processor/SpringInterceptSimpleRouteTest.java  |    1 +
 .../SpringInterceptSimpleRouteTraceTest.java       |    1 +
 .../SpringInterceptSimpleRouteWhenStopTest.java    |    1 +
 .../SpringInterceptSimpleRouteWhenTest.java        |    1 +
 .../spring/processor/SpringLoopDoWhileTest.java    |    2 +
 .../SpringManagedThreadsThreadPoolTest.java        |    2 +
 .../processor/SpringMarkRollbackOnlyTest.java      |    1 +
 .../spring/processor/SpringMethodCallTest.java     |    4 +
 .../SpringMulticastNoStopOnExceptionTest.java      |    1 +
 .../SpringMulticastStopOnExceptionTest.java        |    1 +
 .../spring/processor/SpringNormalizerTest.java     |    1 +
 ...letionAndInterceptAndOnExceptionGlobalTest.java |    1 +
 .../SpringOnCompletionAndInterceptGlobalTest.java  |    1 +
 .../SpringOnCompletionAndInterceptTest.java        |    1 +
 .../processor/SpringOnCompletionGlobalTest.java    |    1 +
 .../SpringOnCompletionGlobalTraceTest.java         |    1 +
 .../SpringOnCompletionOnCompleteOnlyTest.java      |    1 +
 .../SpringOnCompletionOnFailureOnlyTest.java       |    1 +
 ...ompletionRouteScopeOverrideGlobalScopeTest.java |    1 +
 .../spring/processor/SpringOnCompletionTest.java   |    1 +
 .../processor/SpringOnCompletionWhenTest.java      |    1 +
 .../processor/SpringPollEnricherRefTest.java       |    1 +
 .../spring/processor/SpringPollEnricherTest.java   |    1 +
 .../processor/SpringRandomLoadBalanceTest.java     |    1 +
 ...ingRecipientListIgnoreInvalidEndpointsTest.java |    1 +
 .../SpringRecipientListWithArrayHeaderTest.java    |    1 +
 ...RecipientListWithStringDelimitedHeaderTest.java |    1 +
 .../spring/processor/SpringRemoveHeaderTest.java   |    1 +
 .../SpringRemovePropertiesWithExclusionTest.java   |    1 +
 ...SpringRemovePropertiesWithoutExclusionTest.java |    1 +
 .../spring/processor/SpringRemovePropertyTest.java |    1 +
 .../spring/processor/SpringResequencerTest.java    |    1 +
 .../processor/SpringRoundRobinLoadBalanceTest.java |    1 +
 .../SpringRouteContextProduceBeanTest.java         |    2 +
 .../processor/SpringRouteNoAutoStartupTest.java    |    1 +
 .../spring/processor/SpringRoutePoliciesTest.java  |    2 +
 .../SpringRouteStartupOrderSimpleTest.java         |    1 +
 .../processor/SpringRouteStartupOrderTest.java     |    1 +
 .../SpringRouteStartupOrderWithDefaultTest.java    |    1 +
 .../spring/processor/SpringRouteStopTest.java      |    1 +
 .../SpringRouteTopLevelMisconfiguredTest.java      |    2 +
 ...RouteWithConstantFieldFromExchangeFailTest.java |    5 +-
 ...pringRoutingSlipIgnoreInvalidEndpointsTest.java |    1 +
 .../spring/processor/SpringRoutingSlipTest.java    |    1 +
 .../camel/spring/processor/SpringSagaTest.java     |    3 +
 .../processor/SpringScheduledThreadPoolTest.java   |    2 +
 .../spring/processor/SpringScriptExternalTest.java |    7 +-
 .../camel/spring/processor/SpringScriptTest.java   |    7 +-
 .../camel/spring/processor/SpringSetBodyTest.java  |    2 +
 .../processor/SpringSetExchangePatternTest.java    |    1 +
 .../SpringSetExchangePatternWithCustomIdTest.java  |    2 +
 .../spring/processor/SpringSetFaultBodyTest.java   |    2 +
 .../processor/SpringSetHeaderNameDynamicTest.java  |    2 +
 .../spring/processor/SpringSetHeaderTest.java      |    2 +
 .../processor/SpringSetHeaderWithConstantTest.java |    2 +
 .../SpringSetHeaderXPathResultTypeTest.java        |    2 +
 .../spring/processor/SpringSetOutHeaderTest.java   |    2 +
 .../SpringSetOutHeaderWithConstantTest.java        |    2 +
 .../SpringSetPropertyNameDynamicTest.java          |    2 +
 .../spring/processor/SpringSetPropertyTest.java    |    1 +
 .../camel/spring/processor/SpringSortBodyTest.java |    1 +
 .../spring/processor/SpringSortExpressionTest.java |    1 +
 .../spring/processor/SpringSplitterBodyTest.java   |    2 +
 .../processor/SpringSplitterMethodCallTest.java    |    1 +
 .../SpringSplitterNoStopOnExceptionTest.java       |    1 +
 .../SpringSplitterStopOnExceptionTest.java         |    1 +
 .../processor/SpringStaticRecipientListTest.java   |    1 +
 .../processor/SpringStickyLoadBalanceTest.java     |    1 +
 .../processor/SpringStreamCachingPerRouteTest.java |    1 +
 .../processor/SpringThreadNamePatternTest.java     |    2 +
 .../processor/SpringThreadsCorePoolTest.java       |    3 +
 .../processor/SpringThrottlerGroupingTest.java     |    1 +
 .../spring/processor/SpringThrottlerTest.java      |    1 +
 .../SpringThrottlingInflightRoutePolicyTest.java   |    1 +
 .../spring/processor/SpringThrowExceptionTest.java |    1 +
 .../spring/processor/SpringTokenizerTest.java      |    1 +
 .../processor/SpringTopicLoadBalanceTest.java      |    1 +
 ...SpringTraceInterceptorWithOutBodyTraceTest.java |    1 +
 .../spring/processor/SpringTracePerRouteTest.java  |    1 +
 .../spring/processor/SpringTransformTest.java      |    3 +-
 .../processor/SpringTryCatchMisconfiguredTest.java |    2 +
 ...ingTryCatchMustHaveExceptionConfiguredTest.java |    2 +
 .../processor/SpringTryProcessorHandledTest.java   |    1 +
 .../SpringTryProcessorMultipleExceptionTest.java   |    1 +
 .../processor/SpringTryProcessorOnWhenTest.java    |    1 +
 .../SpringWeightedRandomLoadBalanceTest.java       |    1 +
 .../SpringWeightedRoundRobinLoadBalanceTest.java   |    1 +
 .../camel/spring/processor/SpringWireTapTest.java  |    1 +
 .../SpringWireTapUsingFireAndForgetCopyTest.java   |    3 +
 .../SpringWireTapUsingFireAndForgetTest.java       |    4 +
 .../spring/processor/SpringXPathFilterTest.java    |    1 +
 ...ilterWithNamespaceOnImportRouteContextTest.java |    5 +-
 ...XPathFilterWithNamespaceOnRouteContextTest.java |    5 +-
 .../SpringXPathFilterWithNamespaceTest.java        |    6 +-
 .../spring/processor/SpringXPathHeaderTest.java    |    5 +-
 .../processor/TransformWithExpressionTest.java     |    7 +-
 .../processor/aggregator/SpringAggregatorTest.java |    1 +
 ...yncDeadLetterChannelExecutorServiceRefTest.java |    2 +
 .../FileConsumerIdempotentLoadStoreTest.java       |    7 +-
 .../idempotent/FileConsumerIdempotentTest.java     |    7 +-
 .../DeadLetterChannelHandledExampleTest.java       |    3 +
 .../SpringContextScopeOnExceptionTest.java         |    3 +
 ...adLetterChannelOnExceptionOnRedeliveryTest.java |    1 +
 ...ngOnExceptionFromChoiceUseOriginalBodyTest.java |    1 +
 ...pringOnExceptionNotNormalizedClassNameTest.java |    2 +
 .../onexception/SpringOnExceptionSubRouteTest.java |    4 +
 ...ceptionSubRouteWithDefaultErrorHandlerTest.java |    1 +
 .../SpringOnExceptionUseOriginalBodyTest.java      |    1 +
 .../processor/scattergather/ScatterGatherTest.java |    2 +
 .../spring/processor/tracing/TracingTestBase.java  |    2 +
 .../spring/produce/generics/MyServiceImpl.java     |    1 -
 .../spring/produce/generics/MyServiceInvoker.java  |    1 -
 .../spring/produce/generics/MyServiceTest.java     |    2 -
 .../remoting/EchoSpringRemotingPojoDirectTest.java |    4 +
 .../remoting/EchoSpringRemotingPojoTest.java       |    3 +
 ...SpringRemotingThrowingRuntimeExceptionTest.java |    5 +
 .../remoting/MultiArgumentsWithDefaultBinding.java |    1 +
 ...DefaultBindingSpringRemotingPojoDirectTest.java |    2 +
 .../spring/remoting/MyMultiArgumentService.java    |    1 +
 ...yMultiArgumentSpringRemotingPojoDirectTest.java |    2 +
 .../remoting/SpringRemotingBeanConverterTest.java  |    6 +-
 .../spring/remoting/SpringRemotingRouteTest.java   |    6 +-
 .../SpringRemotingTwoCamelContextTest.java         |    7 +-
 .../spring/routebuilder/CamelRouteBuilderTest.java |    2 +
 .../scan/DefaultPackageScanClassResolverTest.java  |   17 +-
 .../camel/spring/scan/PackageScanFiltersTest.java  |   11 +-
 .../scan/PatternBasedPackageScanFilterTest.java    |   10 +-
 .../apache/camel/spring/scan/ScanTestSupport.java  |    1 +
 .../BridgePropertyPlaceholderConfigurerTest.java   |    3 +
 ...PropertyPlaceholderConfigurerUtilIssueTest.java |    2 +
 .../spring/spi/ParentContextRegistryTest.java      |    5 +
 .../camel/spring/util/EndpointHelperTest.java      |    2 +
 .../apache/camel/spring/util/MainRunnerTest.java   |    2 +
 .../spring/xml/SpringXmlRouteBuilderTest.java      |    4 +-
 .../camel/component/sql/ResultSetIterator.java     |    6 +-
 .../aggregate/jdbc/JdbcAggregationRepository.java  |    4 +-
 .../component/ssh/SshComponentProducerTest.java    |    1 -
 .../ssh/SshShellOutputStringHelperTest.java        |    7 +-
 .../component/stax/StAXJAXBIteratorExpression.java |    1 +
 .../org/apache/camel/component/stax/StAXUtil.java  |    1 +
 .../camel/component/stax/StaxStreamXMLReader.java  |    1 +
 .../stax/SpringStAXJAXBIteratorExpressionTest.java |    1 -
 .../camel/component/stax/StAXComponentRefTest.java |    1 -
 .../camel/component/stax/StAXComponentTest.java    |    1 -
 .../stax/StAXJAXBIteratorExpressionTest.java       |    1 -
 .../stax/StAXXPathSplitChoicePerformanceTest.java  |    3 +-
 .../apache/camel/component/stax/model/Orders.java  |    1 +
 .../apache/camel/component/stax/model/Records.java |    1 +
 .../camel/component/stax/model/RecordsUtil.java    |    1 +
 .../camel/component/stomp/StompBaseTest.java       |    5 +-
 .../camel/component/stream/StreamProducer.java     |    3 +-
 .../camel/component/stream/StreamToUrlTest.java    |    3 +-
 .../apache/camel/swagger/RestSwaggerProcessor.java |    2 +-
 .../apache/camel/swagger/RestSwaggerReader.java    |    7 +-
 .../camel/swagger/servlet/RestSwaggerServlet.java  |    2 +-
 .../camel/swagger/RestSwaggerArrayEnumTest.java    |    2 +-
 .../swagger/producer/DummyRestProducerFactory.java |    4 +-
 .../camel/component/syslog/SyslogConverter.java    |    3 +-
 .../syslog/netty/Rfc5425FrameDecoder.java          |    1 -
 .../component/syslog/AutomatedConversionTest.java  |    1 -
 .../camel/component/syslog/MinaDataFormatTest.java |    1 -
 .../component/syslog/MinaManyUDPMessagesTest.java  |    1 -
 .../component/syslog/NettyDataFormatTest.java      |    1 -
 .../component/syslog/NettyManyUDPMessagesTest.java |    1 -
 .../syslog/NettyRfc5425LongMessageTest.java        |    2 -
 .../camel/component/syslog/NettyRfc5425Test.java   |    1 -
 .../camel/component/syslog/SyslogEnumsTest.java    |    4 +-
 .../component/syslog/SyslogSpringMinaTest.java     |    1 -
 .../component/syslog/SyslogSpringNettyTest.java    |    1 -
 .../aggregate/tarfile/TarAggregationStrategy.java  |    2 +-
 .../tarfile/SpringTarFileDataFormatTest.java       |    3 +-
 .../dataformat/tarfile/TarFileDataFormatTest.java  |    3 +-
 .../tarfile/TarFileSplitAndDeleteTest.java         |    3 +-
 .../tarfile/TarSplitterRouteIssueTest.java         |    3 +-
 .../AggregationStrategyWithFilenameHeaderTest.java |    3 +-
 .../AggregationStrategyWithPreservationTest.java   |    3 +-
 .../tarfile/TarAggregationStrategyTest.java        |    3 +-
 .../telegram/model/UnixTimestampDeserializer.java  |    2 +-
 ...BlueprintAugmentedPropertiesNoFallbackTest.java |    2 +
 ...nfigAdminLoadConfigurationFileNotFoundTest.java |    2 +
 ...gAdminNoDefaultValuesBlueprintCreationTest.java |    2 +
 .../camel/test/spring/CamelAnnotationsHandler.java |    2 +-
 .../test/spring/CamelSpringTestContextLoader.java  |    2 +-
 ...lSpringRouteProcessorDumpRouteCoverageTest.java |    1 +
 .../spring/CamelSpringRunnerExcludeRoutesTest.java |    3 +
 .../org/apache/camel/test/patterns/DebugTest.java  |    4 +
 .../test/patterns/IsMockEndpointsFileTest.java     |    2 +
 .../RouteBuilderConfigureExceptionTest.java        |    2 +
 .../RouteProcessorDumpRouteCoverageTest.java       |    2 +
 .../org/apache/camel/testng/CamelTestSupport.java  |    6 +-
 .../java/org/apache/camel/testng/TestSupport.java  |    4 +-
 .../camel/component/twitter/TwitterHelper.java     |    1 -
 .../component/twitter/search/SearchProducer.java   |    1 -
 .../component/twitter/timeline/UserProducer.java   |    1 -
 .../component/twitter/DirectMessageDirectTest.java |    3 +-
 .../twitter/DirectMessagePollingTest.java          |    3 +-
 .../camel/component/twitter/SearchEventTest.java   |    1 -
 .../deprecated/DirectMessageDirectTest.java        |    3 +-
 .../deprecated/DirectMessagePollingTest.java       |    3 +-
 .../twitter/deprecated/SearchEventTest.java        |    1 -
 .../twitter/deprecated/UserProducerInOutTest.java  |    1 -
 .../component/undertow/DefaultUndertowHost.java    |    1 -
 .../undertow/DefaultUndertowHttpBinding.java       |    1 -
 .../undertow/HttpHandlerRegistrationInfo.java      |   20 +
 .../component/undertow/UndertowClientCallback.java |    1 -
 .../component/undertow/UndertowComponent.java      |   12 +-
 .../camel/component/undertow/UndertowConsumer.java |   34 +-
 .../camel/component/undertow/UndertowEndpoint.java |    1 +
 .../camel/component/undertow/UndertowHost.java     |    1 -
 .../camel/component/undertow/UndertowProducer.java |    1 -
 .../undertow/handlers/CamelMethodHandler.java      |    1 -
 .../undertow/handlers/CamelWebSocketHandler.java   |    1 -
 .../camel/component/undertow/BaseUndertowTest.java |    1 -
 .../undertow/UndertowHttpProducerSessionTest.java  |    1 -
 .../undertow/UndertowHttpsSpringTest.java          |    2 +-
 .../undertow/UndertowMethodRestricTest.java        |    1 -
 .../undertow/handlers/CamelRootHandlerTest.java    |    1 -
 .../undertow/rest/RestUndertowHttpOptionsTest.java |   19 +-
 .../undertow/ws/UndertowWssRouteTest.java          |    2 -
 .../component/urlrewrite/BaseUrlRewriteTest.java   |    1 +
 .../camel/component/velocity/VelocityEndpoint.java |    4 +-
 .../weather/CurrentWeatherConsumerHtmlTest.java    |    2 +-
 .../weather/CurrentWeatherMadridProducerTest.java  |    2 +-
 .../camel/component/web3j/Web3jConsumer.java       |   18 +-
 .../camel/component/web3j/Web3jEndpoint.java       |    2 +-
 .../camel/component/web3j/Web3jProducer.java       |    2 +-
 .../component/websocket/WebsocketComponent.java    |    8 +-
 .../websocket/WebsocketComponentServlet.java       |    1 +
 .../component/websocket/WebsocketConsumer.java     |    1 +
 .../websocket/MemoryWebsocketStoreTest.java        |    1 +
 .../websocket/WebsocketComponentTest.java          |    1 +
 .../WebsocketSSLContextGlobalRouteExampleTest.java |    2 +-
 .../WebsocketSSLContextInUriRouteExampleTest.java  |    1 -
 .../websocket/WebsocketSSLRouteExampleTest.java    |    1 -
 .../websocket/WebsocketTwoRoutesExampleTest.java   |    3 +-
 ...SIndividualAndBroadcastEndpointExampleTest.java |    3 +-
 ...ebsocketTwoRoutesToSameEndpointExampleTest.java |    3 +-
 .../component/wordpress/WordpressComponent.java    |    1 +
 .../wordpress/WordpressComponentConfiguration.java |    1 +
 .../component/wordpress/WordpressEndpoint.java     |    1 +
 .../wordpress/api/WordpressAPIConfiguration.java   |    3 +
 .../wordpress/api/WordpressServiceProvider.java    |    2 +
 .../component/wordpress/api/model/Category.java    |    1 +
 .../component/wordpress/api/model/Comment.java     |    2 +
 .../component/wordpress/api/model/Content.java     |    1 +
 .../camel/component/wordpress/api/model/Post.java  |    1 +
 .../wordpress/api/model/PostRevision.java          |    2 +
 .../component/wordpress/api/model/Publishable.java |    1 +
 .../wordpress/api/model/SearchCriteria.java        |    1 +
 .../camel/component/wordpress/api/model/Tag.java   |    1 +
 .../component/wordpress/api/model/Taxonomy.java    |    1 +
 .../wordpress/api/model/TextPublishable.java       |    2 +
 .../camel/component/wordpress/api/model/User.java  |    2 +
 .../api/service/WordpressCrudService.java          |    1 +
 .../api/service/WordpressServicePostRevision.java  |    1 +
 .../api/service/WordpressServiceTaxonomy.java      |    1 +
 .../impl/AbstractWordpressCrudServiceAdapter.java  |    1 +
 .../impl/AbstractWordpressServiceAdapter.java      |    3 +
 .../impl/WordpressServiceCategoriesAdapter.java    |    2 +
 .../impl/WordpressServiceCommentsAdapter.java      |    2 +
 .../service/impl/WordpressServicePagesAdapter.java |    2 +
 .../service/impl/WordpressServicePostsAdapter.java |    2 +
 .../service/impl/WordpressServiceTagsAdapter.java  |    2 +
 .../impl/WordpressServiceTaxonomyAdapter.java      |    2 +
 .../service/impl/WordpressServiceUsersAdapter.java |    1 +
 .../impl/WordpressSevicePostRevisionAdapter.java   |    2 +
 .../wordpress/api/service/spi/CategoriesSPI.java   |    2 +
 .../wordpress/api/service/spi/CommentsSPI.java     |    2 +
 .../wordpress/api/service/spi/PagesSPI.java        |    2 +
 .../api/service/spi/PostRevisionsSPI.java          |    2 +
 .../wordpress/api/service/spi/PostsSPI.java        |    2 +
 .../wordpress/api/service/spi/TagsSPI.java         |    2 +
 .../wordpress/api/service/spi/TaxonomySPI.java     |    2 +
 .../wordpress/api/service/spi/UsersSPI.java        |    2 +
 .../consumer/AbstractWordpressConsumer.java        |    1 +
 .../wordpress/consumer/WordpressPostConsumer.java  |    1 +
 .../wordpress/consumer/WordpressUserConsumer.java  |    1 +
 .../wordpress/WordpressComponentTest.java          |    1 +
 .../wordpress/WordpressComponentTestSupport.java   |    1 +
 .../wordpress/WordpressPostOperationTest.java      |    1 +
 .../wordpress/WordpressUserOperationTest.java      |    1 +
 .../wordpress/api/model/PublishableStatusTest.java |    1 +
 .../impl/WordpressServicePostsAdapterTest.java     |    3 +-
 .../impl/WordpressServiceUsersAdapterTest.java     |    3 +-
 .../WordpressServiceCategoriesAdapterIT.java       |    2 +
 .../ignored/WordpressServiceCommentsAdapterIT.java |    2 +
 .../ignored/WordpressServicePagesAdapterIT.java    |    2 +
 .../WordpressServicePostRevisionAdapterIT.java     |    2 +
 .../ignored/WordpressServiceTagsAdapterIT.java     |    2 +
 .../ignored/WordpressServiceTaxonomyAdapterIT.java |    2 +
 .../api/test/WordpressMockServerTestSupport.java   |    1 +
 .../test/WordpressServerHttpRequestHandler.java    |    1 +
 .../xmljson/converters/XmlJsonConverters.java      |    1 -
 .../xmljson/JsonToXmlAttributesTest.java           |    2 +-
 .../xmljson/SpringXmlJsonDataFormatTest.java       |    4 -
 .../dataformat/xmljson/XmlJsonDataFormatTest.java  |    2 -
 .../dataformat/xmljson/XmlJsonExceptionsTest.java  |    1 -
 .../dataformat/xmljson/XmlJsonOptionsTest.java     |    2 -
 components/camel-xmlrpc/pom.xml                    |    2 +-
 .../src/main/docs/xmlrpc-component.adoc            |    7 +-
 .../component/xmlrpc/XmlRpcComponentTest.java      |    1 -
 .../xmlsecurity/api/XAdESSignatureProperties.java  |    1 +
 .../xmlsecurity/api/XmlSignature2Message.java      |    1 +
 .../xmlsecurity/api/XmlSignatureHelper.java        |    1 +
 .../processor/XmlSignatureProcessor.java           |    2 +-
 .../xmlsecurity/processor/XmlSignerProcessor.java  |    2 +-
 .../processor/XmlVerifierProcessor.java            |    1 +
 .../xmlsecurity/XMLSecurityDataFormat.java         |    1 +
 .../component/xmlsecurity/ECDSASignatureTest.java  |    1 +
 .../xmlsecurity/SignatureDigestMethodTest.java     |    1 -
 .../xmlsecurity/XAdESSignaturePropertiesTest.java  |    1 +
 .../component/xmlsecurity/XmlSignatureTest.java    |    3 +-
 .../xmlsecurity/EncryptionAlgorithmTest.java       |    3 +-
 .../camel/dataformat/xmlsecurity/TestHelper.java   |    1 +
 .../xmlsecurity/XMLEncryption11Test.java           |    3 +-
 .../xmlsecurity/XMLSecurityDataFormatTest.java     |    4 +-
 .../camel/component/xmpp/XmppDirectProducer.java   |    2 +-
 .../component/xmpp/XmppPrivateChatProducer.java    |    2 +-
 .../camel/component/xmpp/XmppPubSubProducer.java   |    2 +-
 .../component/xmpp/XmppDeferredConnectionTest.java |    3 +-
 .../component/xmpp/XmppMultiUserChatTest.java      |    3 +-
 .../component/xmpp/XmppProducerConcurrentTest.java |    3 +-
 .../component/xmpp/XmppRobustConnectionTest.java   |    5 +-
 .../camel/component/xmpp/XmppRouteChatTest.java    |    3 +-
 ...ppRouteMultipleProducersSingleConsumerTest.java |    3 +-
 .../apache/camel/component/xmpp/XmppRouteTest.java |    1 +
 .../camel/dataformat/xstream/JsonDataFormat.java   |    1 -
 .../dataformat/xstream/XStreamDataFormat.java      |    1 -
 .../xstream/XStreamConfigurationTest.java          |    3 +-
 ...eamDataFormatPermissionsSystemPropertyTest.java |    1 -
 .../dataformat/zipfile/ZipFileDataFormatTest.java  |    3 +-
 .../zipfile/ZipFileSplitAndDeleteTest.java         |    3 +-
 .../zipfile/ZipFileSplitOneFileTest.java           |    3 +-
 .../zipfile/ZipSplitterRouteIssueTest.java         |    3 +-
 .../AggregationStrategyWithFilenameHeaderTest.java |    3 +-
 .../AggregationStrategyWithPreservationTest.java   |    3 +-
 .../ZipAggregationStrategyEmptyFileTest.java       |    3 +-
 .../zipfile/ZipAggregationStrategyTest.java        |    3 +-
 components/camel-zipkin/pom.xml                    |    9 +
 .../java/org/apache/camel/zipkin/ZipkinTracer.java |  102 +-
 .../camel/zipkin/ZipkinMDCScopeDecoratorTest.java  |   78 ++
 .../zipkin/ZipkinMultiServerNoClientTest.java      |   71 ++
 .../camel/zipkin/ZipkinServerMulticastTest.java    |   83 ++
 .../src/test/resources/log4j2.properties           |    6 +-
 .../component/zookeepermaster/MasterConsumer.java  |    4 +-
 .../group/internal/ZooKeeperGroup.java             |    2 +-
 .../zookeepermaster/policy/MasterRoutePolicy.java  |    4 +-
 .../component/zookeeper/ZooKeeperProducer.java     |    1 -
 .../zookeeper/policy/ZooKeeperElection.java        |    4 +-
 .../component/zookeeper/ConsumeChildrenTest.java   |    2 -
 .../zookeeper/NaturalSortComparatorTest.java       |    1 -
 .../zookeeper/ZooKeeperManagedEndpointTest.java    |    6 +-
 .../component/zookeeper/ZooKeeperProducerTest.java |    1 -
 .../component/zookeeper/ZooKeeperTestSupport.java  |    3 -
 .../component/zookeeper/ZooKeeperUtilsTest.java    |    1 -
 .../cloud/SpringZooKeeperServiceCallRouteTest.java |    3 +-
 .../cloud/ZooKeeperServiceCallRouteTest.java       |    3 +-
 .../ZooKeeperServiceRegistrationTestBase.java      |    3 +-
 .../operations/FutureEventDrivenOperationTest.java |    2 +-
 .../FailoverCuratorLeaderRoutePolicyTest.java      |    1 -
 .../MultiMasterCuratorLeaderRoutePolicyTest.java   |    1 -
 components/readme.adoc                             |    7 +-
 docs/user-manual/en/SUMMARY.md                     |   22 +-
 docs/user-manual/en/async.adoc                     |  137 +++
 docs/user-manual/en/component.adoc                 |   42 +
 docs/user-manual/en/examples.adoc                  |   55 ++
 docs/user-manual/en/guice-jms-example.adoc         |   61 ++
 docs/user-manual/en/guice-maven-plugin.adoc        |  160 +++
 docs/user-manual/en/guice.adoc                     |  155 +++
 docs/user-manual/en/how-do-i-add-a-component.adoc  |   72 ++
 ...spring-property-placeholder-with-camel-xml.adoc |   77 ++
 docs/user-manual/en/lifecycle.adoc                 |    5 +-
 docs/user-manual/en/producertemplate.adoc          |  103 ++
 .../en/release-notes/camel-2170-release.adoc       |  441 +++++++++
 .../en/release-notes/camel-2171-release.adoc       |   44 +
 .../en/release-notes/camel-2172-release.adoc       |   45 +
 .../en/release-notes/camel-2173-release.adoc       |   44 +
 .../en/release-notes/camel-2174-release.adoc       |   43 +
 .../en/release-notes/camel-2175-release.adoc       |   43 +
 .../en/release-notes/camel-2176-release.adoc       |   43 +
 .../en/release-notes/camel-2177-release.adoc       |   39 +
 .../en/release-notes/camel-2180-release.adoc       |  370 +++++++
 .../en/release-notes/camel-2181-release.adoc       |   43 +
 .../en/release-notes/camel-2182-release.adoc       |   45 +
 .../en/release-notes/camel-2183-release.adoc       |   43 +
 .../en/release-notes/camel-2184-release.adoc       |   39 +
 .../en/release-notes/camel-2185-release.adoc       |   39 +
 .../en/release-notes/camel-2190-release.adoc       |  317 ++++++
 .../en/release-notes/camel-2191-release.adoc       |   40 +
 .../en/release-notes/camel-2192-release.adoc       |   39 +
 .../en/release-notes/camel-2193-release.adoc       |   39 +
 .../en/release-notes/camel-2194-release.adoc       |   39 +
 .../en/release-notes/camel-2195-release.adoc       |   39 +
 .../en/release-notes/camel-2200-release.adoc       |  271 +++++
 .../en/release-notes/camel-2201-release.adoc       |   40 +
 .../en/release-notes/camel-2202-release.adoc       |   40 +
 .../en/release-notes/camel-2203-release.adoc       |   40 +
 .../en/release-notes/camel-2204-release.adoc       |   40 +
 .../en/release-notes/camel-2210-release.adoc       |  209 ++++
 .../en/release-notes/camel-2211-release.adoc       |   40 +
 .../en/release-notes/camel-2212-release.adoc       |   40 +
 docs/user-manual/en/route-builder.adoc             |   10 +-
 .../en/security-advisories/CVE-2013-4330.txt.asc   |   46 +
 .../en/security-advisories/CVE-2014-0002.txt.asc   |   46 +
 .../en/security-advisories/CVE-2014-0003.txt.asc   |   46 +
 .../en/security-advisories/CVE-2015-0263.txt.asc   |   38 +
 .../en/security-advisories/CVE-2015-0264.txt.asc   |   38 +
 .../en/security-advisories/CVE-2015-5344.txt.asc   |   52 +
 .../en/security-advisories/CVE-2015-5348.txt.asc   |   37 +
 .../en/security-advisories/CVE-2016-8749.txt.asc   |   35 +
 .../en/security-advisories/CVE-2017-12633.txt.asc  |   33 +
 .../en/security-advisories/CVE-2017-12634.txt.asc  |   33 +
 .../en/security-advisories/CVE-2017-3159.txt.asc   |   33 +
 .../en/security-advisories/CVE-2017-5643.txt.asc   |   30 +
 .../en/security-advisories/CVE-2018-8027.txt.asc   |   31 +
 .../en/security-advisories/CVE-2018-8041.txt.asc   |   32 +
 docs/user-manual/en/uris.adoc                      |   28 +
 docs/user-manual/en/using-propertyplaceholder.adoc | 1032 ++++++++++++++++++++
 docs/user-manual/en/writing-components.adoc        |  158 +++
 .../reportincident/ReportIncidentRoutesTest.java   |    2 +
 .../transport/CamelTransportClientServerTest.java  |    2 +
 .../example/cxf/jaxrs/JAXRSClientServerTest.java   |    3 +
 .../google/pubsub/CreateTopicSubscription.java     |    4 +-
 .../camel/example/guice/jms/IntegrationTest.java   |    7 +-
 .../resources/fabric8/hazelcast-deployment.yaml    |    2 +-
 .../apache/camel/loanbroker/LoanBrokerWSTest.java  |    1 +
 .../reportincident/ReportIncidentRoutesTest.java   |    1 +
 .../reportincident/ReportIncidentRoutesTest.java   |    1 +
 .../src/main/resources/application.properties      |    4 +-
 .../example/SpringJmsClientRemotingServerTest.java |    2 +
 .../camel/example/SpringJmsClientServerTest.java   |    1 +
 .../camel/example/spring/IntegrationTest.java      |    7 +-
 parent/pom.xml                                     |  145 +--
 .../catalog/maven/MavenArtifactProviderTest.java   |    4 +-
 .../catalog/maven/MavenVersionManagerTest.java     |    4 +-
 .../LocalNexusComponentCatalogRepositoryTest.java  |    4 +-
 .../nexus/LocalNexusConnectorRepositoryTest.java   |    4 +-
 .../catalog/karaf/KarafRuntimeProviderTest.java    |    1 +
 .../springboot/SpringBootRuntimeProviderTest.java  |    1 +
 .../camel/catalog/CamelCatalogMBeanExporter.java   |    1 +
 .../catalog/CamelCatalogMBeanExporterTest.java     |    6 +
 .../karaf/features/src/main/resources/features.xml |    1 +
 .../spring-boot/components-starter/README.adoc     |    1 -
 .../as2/springboot/AS2ComponentConfiguration.java  |   37 +
 .../springboot/BeanComponentConfiguration.java     |   14 +
 .../springboot/ClassComponentConfiguration.java    |   14 +
 .../components-starter/camel-git-starter/pom.xml   |    8 -
 ...leCalendarStreamComponentAutoConfiguration.java |  130 +++
 ...GoogleCalendarStreamComponentConfiguration.java |  238 +++++
 .../src/main/resources/META-INF/spring.factories   |    4 +-
 .../camel-jclouds-starter/pom.xml                  |   53 +
 .../JcloudsComponentAutoConfiguration.java         |  128 +++
 .../springboot/JcloudsComponentConfiguration.java  |   82 ++
 .../src/main/resources/META-INF/LICENSE.txt        |    0
 .../src/main/resources/META-INF/NOTICE.txt         |    0
 .../src/main/resources/META-INF/spring.factories   |   19 +
 .../src/main/resources/META-INF/spring.provides    |   17 +
 .../camel/component/jetty9/Jetty9SSLTest.java      |    1 +
 .../springboot/NettyComponentConfiguration.java    |    2 +-
 .../springboot/NettyComponentConfiguration.java    |    2 +-
 .../camel-spring-ws-starter/pom.xml                |    8 -
 .../camel/component/undertow/UndertowSSLTest.java  |    1 +
 platforms/spring-boot/components-starter/pom.xml   |    1 +
 .../camel-spring-boot-dependencies/pom.xml         |   76 +-
 platforms/spring-boot/spring-boot-dm/pom.xml       |    2 +-
 pom.xml                                            |    2 +-
 .../blueprint/CxfPayloadProviderRouterTest.java    |    2 +
 .../camel/itest/springboot/CamelAs2Test.java       |   46 +
 .../camel/itest/springboot/CamelJcloudsTest.java   |   48 +
 .../standalone/CamelContextStandaloneTest.java     |    7 +-
 ...ipientListInterceptSendToEndpointIssueTest.java |    3 +
 .../org/apache/camel/itest/ftp/FtpXQueryTest.java  |    3 +
 .../itest/greeter/CamelFileGreeterOneWayTest.java  |    2 +
 .../itest/greeter/CamelGreeterFileDomTest.java     |    2 +
 .../camel/itest/greeter/CamelGreeterTest.java      |    2 +
 .../apache/camel/itest/http/Http4EndpointTest.java |    2 +
 .../itest/http/Http4MaxConnectionPerHostTest.java  |    2 +
 .../itest/http/HttpRouteContentLengthTest.java     |   87 --
 .../http/JettyHttpRouteContentLengthTest.java      |   25 -
 .../camel/itest/jetty/JettyFreemarkerTest.java     |    3 +-
 .../quartz/FtpCronScheduledRoutePolicyTest.java    |    4 +
 .../camel/tests/partialclasspath/MyConverter.java  |    4 +-
 .../camel/tests/typeconverterscan/MyConverter.java |    4 +-
 .../apache/camel/parser/RouteBuilderParser.java    |   71 +-
 .../camel/parser/helper/XmlLineNumberParser.java   |   26 +-
 .../camel/parser/model/CamelEndpointDetails.java   |   44 -
 .../camel/parser/java/MySedaRouteBuilder.java      |   38 +
 .../parser/java/RoasterEndpointInjectTest.java     |   14 +-
 .../parser/java/RoasterMySedaRouteBuilderTest.java |   55 ++
 .../camel/parser/java/SimpleProcessorTest.java     |    2 +
 .../camel/parser/java/SplitTokenizeTest.java       |    8 +
 .../camel/parser/java/XmlLineNumberParserTest.java |   39 +
 .../camel/json/simple/JsonSimpleOrderedTest.java   |    4 +-
 .../src/main/docs/camel-maven-plugin.adoc          |    1 +
 .../java/org/apache/camel/maven/ValidateMojo.java  |  228 ++++-
 .../maven/packaging/SpringBootStarterMojo.java     |    2 +-
 4765 files changed, 24606 insertions(+), 4677 deletions(-)
 delete mode 100644 camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
 create mode 100644 camel-core/src/main/java/org/apache/camel/component/stub/StubProducer.java
 create mode 100644 camel-core/src/test/java/org/apache/camel/component/stub/StubConsumerTest.java
 create mode 100644 camel-core/src/test/java/org/apache/camel/component/stub/StubInOutTest.java
 create mode 100644 camel-core/src/test/java/org/apache/camel/component/stub/StubTest.java
 create mode 100644 camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java
 create mode 100644 camel-core/src/test/java/org/apache/camel/language/simple/SimpleResourceDynamicTest.java
 create mode 100644 camel-core/src/test/java/org/apache/camel/processor/BeanCachedProcessorGlobalTest.java
 create mode 100644 camel-core/src/test/java/org/apache/camel/processor/BeanCachedProcessorTest.java
 create mode 100644 components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2EncryptionAlgorithm.java
 create mode 100644 components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/EncryptingUtils.java
 create mode 100644 components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirOperation.java
 create mode 100644 components/camel-fhir/camel-fhir-component/signatures/operation-sig-api.txt
 create mode 100644 components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
 create mode 100644 components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
 create mode 100644 components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
 create mode 100644 components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java
 create mode 100644 components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConstants.java
 create mode 100644 components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConsumer.java
 create mode 100644 components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpoint.java
 create mode 100644 components/camel-google-calendar/src/main/resources/META-INF/services/org/apache/camel/component/google-calendar-stream
 create mode 100644 components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/stream/AbstractGoogleCalendarStreamTestSupport.java
 create mode 100644 components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConsumerIntegrationTest.java
 create mode 100644 components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtension.java
 create mode 100644 components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtension.java
 create mode 100644 components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtensionTest.java
 create mode 100644 components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentVerifierExtensionTest.java
 create mode 100644 components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentLengthTest.java
 create mode 100644 components/camel-http4/src/test/java/org/apache/camel/component/http4/ManagedHttpProducerPoolStatsTest.java
 create mode 100644 components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletInvalidURLTest.java
 create mode 100644 components/camel-slack/src/main/java/org/apache/camel/component/slack/utils/SlackUtils.java
 create mode 100644 components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java
 create mode 100644 components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMultiServerNoClientTest.java
 create mode 100644 components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinServerMulticastTest.java
 create mode 100644 docs/user-manual/en/component.adoc
 create mode 100644 docs/user-manual/en/examples.adoc
 create mode 100644 docs/user-manual/en/guice-jms-example.adoc
 create mode 100644 docs/user-manual/en/guice-maven-plugin.adoc
 create mode 100644 docs/user-manual/en/guice.adoc
 create mode 100644 docs/user-manual/en/how-do-i-add-a-component.adoc
 create mode 100644 docs/user-manual/en/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
 create mode 100644 docs/user-manual/en/producertemplate.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2170-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2171-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2172-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2173-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2174-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2175-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2176-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2177-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2180-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2181-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2182-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2183-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2184-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2185-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2190-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2191-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2192-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2193-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2194-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2195-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2200-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2201-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2202-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2203-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2204-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2210-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2211-release.adoc
 create mode 100644 docs/user-manual/en/release-notes/camel-2212-release.adoc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2013-4330.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2014-0002.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2014-0003.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2015-0263.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2015-0264.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2015-5344.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2015-5348.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2016-8749.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2017-12633.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2017-12634.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2017-3159.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2017-5643.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2018-8027.txt.asc
 create mode 100644 docs/user-manual/en/security-advisories/CVE-2018-8041.txt.asc
 create mode 100644 docs/user-manual/en/uris.adoc
 create mode 100644 docs/user-manual/en/using-propertyplaceholder.adoc
 create mode 100644 docs/user-manual/en/writing-components.adoc
 create mode 100644 platforms/spring-boot/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentAutoConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-jclouds-starter/pom.xml
 create mode 100644 platforms/spring-boot/components-starter/camel-jclouds-starter/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentAutoConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-jclouds-starter/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentConfiguration.java
 copy {tooling/maven/guice-maven-plugin => platforms/spring-boot/components-starter/camel-jclouds-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
 copy {tooling/maven/guice-maven-plugin => platforms/spring-boot/components-starter/camel-jclouds-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
 create mode 100644 platforms/spring-boot/components-starter/camel-jclouds-starter/src/main/resources/META-INF/spring.factories
 create mode 100644 platforms/spring-boot/components-starter/camel-jclouds-starter/src/main/resources/META-INF/spring.provides
 create mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAs2Test.java
 create mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJcloudsTest.java
 delete mode 100644 tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpRouteContentLengthTest.java
 delete mode 100644 tests/camel-itest/src/test/java/org/apache/camel/itest/http/JettyHttpRouteContentLengthTest.java
 create mode 100644 tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySedaRouteBuilder.java
 create mode 100644 tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMySedaRouteBuilderTest.java
 create mode 100644 tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/XmlLineNumberParserTest.java


[camel] 01/06: Temporary disable JDK 9 and karaf-itest and spr...

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 42b0115017935e990297cba327eab72be49c9743
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Aug 22 14:38:04 2018 +0200

    Temporary disable JDK 9 and karaf-itest and spr...
    
    ...ing-itest builds
---
 Jenkinsfile.daily | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 86051db..18a75d6 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -59,9 +59,9 @@ pipeline {
             }
             steps {
                 dir("tests/camel-itest-karaf/") {
-                    sh "./kill-karaf.sh"
+                    sh "true || ./kill-karaf.sh"
                     script {
-                        karaf_itests_result = sh script: "./run-tests.sh", returnStatus: true
+                        karaf_itests_result = sh script: "true || ./run-tests.sh", returnStatus: true
                     }
                 }
             }
@@ -74,7 +74,7 @@ pipeline {
             steps {
                 dir("tests/camel-itest-spring-boot/") {
                     script {
-                        spring_boot_itests_result = sh script: "../../mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
+                        spring_boot_itests_result = sh script: "true || ../../mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
                     }
                 }
             }
@@ -86,7 +86,7 @@ pipeline {
             }
             steps {
                 script {
-                    jdk9_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
+                    jdk9_result = sh script: "true || ./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
                 }
             }
             post {


[camel] 02/06: CAMEL-12618: Use fork of MVEL that supports Jav...

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git

commit e51d4e9afaecd0f18a87d9079284f3a5dd1a6be3
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jul 13 11:43:54 2018 +0200

    CAMEL-12618: Use fork of MVEL that supports Jav...
    
    ...a 11
    
    Try to fix Java 10 build with MVEL dependency built by jitpack.io.
    
    See mvel/mvel#159[2]
    
    [1] http://openjdk.java.net/jeps/320
    [2] https://github.com/mvel/mvel/issues/159
---
 tooling/maven/camel-package-maven-plugin/pom.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 50afd0f..47cf92a 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -44,6 +44,17 @@
     </dependencies>
   </dependencyManagement>
 
+  <!-- added to allow for Java 10+ compatibility in MVEL
+       there is no release that includes this fix
+       https://github.com/mvel/mvel/issues/159
+  -->
+  <repositories>
+    <repository>
+        <id>jitpack.io</id>
+        <url>https://jitpack.io</url>
+    </repository>
+  </repositories>
+
   <dependencies>
 
     <!-- use our patched ordered json-simple parser -->
@@ -53,10 +64,11 @@
       <version>${project.version}</version>
     </dependency>
 
+    <!-- see above, targeting MVEL with Java 10+ support -->
     <dependency>
-      <groupId>org.mvel</groupId>
-      <artifactId>mvel2</artifactId>
-      <version>${mvel-version}</version>
+      <groupId>com.github.mvel</groupId>
+      <artifactId>mvel</artifactId>
+      <version>97071e83fb</version>
     </dependency>
 
     <dependency>


[camel] 05/06: CAMEL-12618: upgrade Groovy Eclipse compiler

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git

commit e7f878174c223caf118b98e338602dfa3d101a7e
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Aug 23 10:56:33 2018 +0200

    CAMEL-12618: upgrade Groovy Eclipse compiler
---
 archetypes/camel-archetype-groovy/pom.xml                   | 13 ++++++++++++-
 .../src/main/resources/archetype-resources/pom.xml          |  4 ++--
 components/camel-grape/pom.xml                              |  8 +++-----
 components/camel-groovy-dsl/pom.xml                         |  4 ++--
 examples/camel-example-groovy/pom.xml                       |  4 ++--
 parent/pom.xml                                              |  7 ++-----
 pom.xml                                                     | 12 ++++++++++++
 7 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/archetypes/camel-archetype-groovy/pom.xml b/archetypes/camel-archetype-groovy/pom.xml
index 88d596f..e88d843 100644
--- a/archetypes/camel-archetype-groovy/pom.xml
+++ b/archetypes/camel-archetype-groovy/pom.xml
@@ -46,7 +46,7 @@
     <resources>
       <resource>
         <directory>src/main/resources</directory>
-        <filtering>false</filtering>
+        <filtering>true</filtering>
       </resource>
       <resource>
         <directory>src/main/resources-filtered</directory>
@@ -56,6 +56,17 @@
         </includes>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <configuration>
+            <useDefaultDelimiters>false</useDefaultDelimiters>
+            <delimiters>
+                <delimiter>@</delimiter>
+            </delimiters>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
 </project>
diff --git a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
index ed27546..18b945b 100644
--- a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
@@ -114,7 +114,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.9.2-01</version>
+            <version>@groovy-eclipse-compiler-version@</version>
             <exclusions>
               <exclusion>
                 <groupId>org.codehaus.groovy</groupId>
@@ -125,7 +125,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.4.3-01</version>
+            <version>@groovy-eclipse-batch-version@</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index e408f6d..811d5ac 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -32,8 +32,6 @@
   <description>The grape component allows you to fetch, load and manage additional jars when CamelContext is running</description>
 
   <properties>
-    <groovy-eclipse-batch.version>2.4.3-01</groovy-eclipse-batch.version>
-    <groovy-eclipse-compiler.version>2.9.2-01</groovy-eclipse-compiler.version>
     <plexus-compiler-api.version>2.8.3</plexus-compiler-api.version>
     <camel.osgi.export.pkg />
   </properties>
@@ -95,12 +93,12 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>${groovy-eclipse-batch.version}</version>
+            <version>${groovy-eclipse-batch-version}</version>
           </dependency>
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>${groovy-eclipse-compiler.version}</version>
+            <version>${groovy-eclipse-compiler-version}</version>
           </dependency>
           <dependency>
             <groupId>org.codehaus.plexus</groupId>
@@ -115,7 +113,7 @@
       <plugin>
         <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy-eclipse-compiler</artifactId>
-        <version>${groovy-eclipse-compiler.version}</version>
+        <version>${groovy-eclipse-compiler-version}</version>
         <extensions>true</extensions>
       </plugin>
       <plugin>
diff --git a/components/camel-groovy-dsl/pom.xml b/components/camel-groovy-dsl/pom.xml
index 62ac12a..79db32a 100644
--- a/components/camel-groovy-dsl/pom.xml
+++ b/components/camel-groovy-dsl/pom.xml
@@ -138,7 +138,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.9.2-01</version>
+            <version>${groovy-eclipse-compiler-version}</version>
             <exclusions>
               <exclusion>
                 <groupId>org.codehaus.groovy</groupId>
@@ -149,7 +149,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.4.3-01</version>
+            <version>${groovy-eclipse-batch-version}</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/examples/camel-example-groovy/pom.xml b/examples/camel-example-groovy/pom.xml
index 577f398..c26933b 100644
--- a/examples/camel-example-groovy/pom.xml
+++ b/examples/camel-example-groovy/pom.xml
@@ -97,7 +97,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.9.2-01</version>
+            <version>${groovy-eclipse-compiler-version}</version>
             <exclusions>
               <exclusion>
                 <groupId>org.codehaus.groovy</groupId>
@@ -108,7 +108,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.4.3-01</version>
+            <version>${groovy-eclipse-batch-version}</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index 451b2b6..41dc2f2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -255,19 +255,17 @@
     <geronimo-json-spec-version>1.0</geronimo-json-spec-version>
     <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
     <geronimo-servlet-spec-version>1.0</geronimo-servlet-spec-version>
-    <geronimo-servlet-2.5-spec-version>1.2</geronimo-servlet-2.5-spec-version>
     <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
     <gmetric4j-version>1.0.10</gmetric4j-version>
-    <google-guava-version>19.0</google-guava-version>
     <google-api-client-version>1.22.0</google-api-client-version>
     <google-api-services-drive-version>v2-rev297-1.22.0</google-api-services-drive-version>
-    <google-api-services-calendar-version>v3-rev291-1.22.0</google-api-services-calendar-version>
     <google-api-services-mail-version>v1-rev81-1.22.0</google-api-services-mail-version>
-    <google-api-services-bigquery-version>v2-rev352-1.22.0</google-api-services-bigquery-version>
     <google-api-services-pubsub-version>v1-rev12-1.22.0</google-api-services-pubsub-version>
     <google-mail-guava-version>17.0</google-mail-guava-version>
     <google-truth-version>0.30</google-truth-version>
     <grizzly-websockets-version>2.3.25</grizzly-websockets-version>
+    <groovy-eclipse-compiler-version>3.0.0-01</groovy-eclipse-compiler-version>
+    <groovy-eclipse-batch-version>2.5.2-01</groovy-eclipse-batch-version>
     <grpc-version>1.14.0</grpc-version>
     <grpc-google-auth-library-version>0.9.0</grpc-google-auth-library-version>
     <grpc-guava-version>20.0</grpc-guava-version>
@@ -278,7 +276,6 @@
     <gson-version>2.8.5</gson-version>
     <guice-version>4.0</guice-version>
     <guice3-version>3.0</guice3-version>
-    <guice-bundle-version>3.0_1</guice-bundle-version>
     <hadoop-bundle-version>1.2.1_1</hadoop-bundle-version>
     <hadoop-version>1.2.1</hadoop-version>
     <hadoop2-bundle-version>2.7.2_1</hadoop2-bundle-version>
diff --git a/pom.xml b/pom.xml
index 1156795..2ef5ac6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,6 +149,18 @@
         <enabled>false</enabled>
       </releases>
     </pluginRepository>
+    <!-- needed for Groovy Eclipse plugin -->
+    <pluginRepository>
+      <id>bintray</id>
+      <url>https://dl.bintray.com/groovy/maven</url>
+      <name>Bintray Repository</name>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </pluginRepository>
   </pluginRepositories>
 
   <modules>


[camel] 04/06: CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git

commit bce7bd23581f6b6ef1bd4c94055ee3ee1f937a9b
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Aug 17 12:33:14 2018 +0200

    CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
    
    ...enplus plugin
    
    There is no released Groovy version that supports Java 11[1], so this
    uses a snapshot version in the configuration of the gmavenplus plugin so
    the build can be performed on Java 11.
    
    [1] https://issues.apache.org/jira/browse/GROOVY-8727
---
 buildingtools/pom.xml                              | 14 -------
 components/camel-grpc/pom.xml                      | 14 -------
 .../camel-olingo2/camel-olingo2-component/pom.xml  |  8 ----
 components/camel-protobuf/pom.xml                  | 14 -------
 pom.xml                                            | 44 ++++++++++++++++++++++
 5 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 5e8d7bd..4e61020 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -113,20 +113,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-ant</artifactId>
-                        <version>${groovy-version}</version>
-                        <scope>runtime</scope>
-		    </dependency>
-	            <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-xml</artifactId>
-                        <version>${groovy-version}</version>
-                        <scope>runtime</scope>
-		    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <!--
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 1802868..01180d6 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -172,20 +172,6 @@
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
-            <version>${groovy-version}</version>
-            <scope>runtime</scope>
-          </dependency>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-ant</artifactId>
-            <version>${groovy-version}</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
       </plugin>
 
       <!-- gRPC and protobuf Java code generator plugin -->
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index ae1606b..8ac9bd9 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -330,14 +330,6 @@
                 </configuration>
               </execution>
             </executions>
-            <dependencies>
-                <dependency>
-                    <groupId>org.codehaus.groovy</groupId>
-                    <artifactId>groovy</artifactId>
-                    <version>${groovy-version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
           </plugin>
           <plugin>
             <artifactId>maven-archetype-plugin</artifactId>
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index d7a4861..98ced80 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -125,20 +125,6 @@
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
-            <version>${groovy-version}</version>
-            <scope>runtime</scope>
-          </dependency>
-	  <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-ant</artifactId>
-            <version>${groovy-version}</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
       </plugin>
 
       <!-- Protobuf Java code generator plugin -->
diff --git a/pom.xml b/pom.xml
index 0f39917..1156795 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,17 @@
         <enabled>false</enabled>
       </releases>
     </pluginRepository>
+    <!-- needed for Groovy SNAPSHOTs see gmaven plugin below -->
+    <pluginRepository>
+      <id>oss.jfrog.org-snapshots</id>
+      <url>https://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </pluginRepository>
   </pluginRepositories>
 
   <modules>
@@ -327,6 +338,39 @@
             <autoVersionSubmodules>true</autoVersionSubmodules>
           </configuration>
         </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.gmavenplus</groupId>
+          <artifactId>gmavenplus-plugin</artifactId>
+          <version>${gmavenplus-plugin-version}</version>
+          <dependencies>
+            <!-- until we get a release that fixes https://issues.apache.org/jira/browse/GROOVY-8727
+                 we use a snapshot version
+            -->
+            <dependency>
+              <groupId>org.codehaus.groovy</groupId>
+              <artifactId>groovy</artifactId>
+              <!--<version>${groovy-version}</version>-->
+              <version>3.0.0-SNAPSHOT</version>
+              <scope>runtime</scope>
+            </dependency>
+            <dependency>
+              <groupId>org.codehaus.groovy</groupId>
+              <artifactId>groovy-xml</artifactId>
+              <!--<version>${groovy-version}</version>-->
+              <version>3.0.0-SNAPSHOT</version>
+              <scope>runtime</scope>
+            </dependency>
+            <dependency>
+              <groupId>org.codehaus.groovy</groupId>
+              <artifactId>groovy-ant</artifactId>
+              <!--<version>${groovy-version}</version>-->
+              <version>3.0.0-SNAPSHOT</version>
+              <scope>runtime</scope>
+            </dependency>
+          </dependencies>
+        </plugin>
+
       </plugins>
     </pluginManagement>
   </build>


[camel] 06/06: CAMEL-12618: Additional dependencies needed on ...

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git

commit cc6c33b3dd64544b1d42377507f5dfe43e7f331c
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Aug 24 10:24:29 2018 +0200

    CAMEL-12618: Additional dependencies needed on ...
    
    ...Java 11
    
    Adds additional dependencies needed to compile on Java 11. Java 11
    stopped shipping Java EE classes[1], we need to add them as dependencies
    now.
    
    [1] http://openjdk.java.net/jeps/320
---
 .../src/main/resources/archetype-resources/pom.xml |  17 +++-
 camel-core/pom.xml                                 | 113 ++++++++-------------
 components/camel-as2/camel-as2-api/pom.xml         |  21 ----
 components/camel-bam/pom.xml                       |  58 +++++------
 components/camel-bindy/pom.xml                     |  25 ++---
 components/camel-blueprint/pom.xml                 | 111 ++++++++------------
 components/camel-bonita/pom.xml                    |  24 ++---
 components/camel-box/camel-box-api/pom.xml         |  21 ----
 components/camel-cdi/pom.xml                       |  78 +++-----------
 components/camel-context/pom.xml                   |  23 +----
 components/camel-cxf-transport/pom.xml             |  38 ++++---
 components/camel-dozer/pom.xml                     |   5 +
 components/camel-fhir/camel-fhir-api/pom.xml       |  21 ----
 components/camel-grape/pom.xml                     |  27 -----
 components/camel-groovy-dsl/pom.xml                |  27 -----
 components/camel-grpc/pom.xml                      |  13 +++
 components/camel-guice/pom.xml                     |  16 +++
 components/camel-hl7/pom.xml                       |  24 ++---
 components/camel-ignite/pom.xml                    |  21 ----
 components/camel-infinispan/pom.xml                |  32 ------
 components/camel-jetty9/pom.xml                    |  31 +++---
 components/camel-jmx/pom.xml                       |  83 ++++-----------
 .../camel-linkedin/camel-linkedin-api/pom.xml      |  21 ----
 components/camel-mail/pom.xml                      |  25 ++---
 components/camel-mustache/pom.xml                  |  19 ----
 components/camel-netty-http/pom.xml                |  16 +++
 components/camel-netty4/pom.xml                    |  26 ++---
 components/camel-olingo2/camel-olingo2-api/pom.xml |  22 ----
 components/camel-olingo4/camel-olingo4-api/pom.xml |  21 ----
 components/camel-ruby/pom.xml                      |  24 ++---
 components/camel-scala/pom.xml                     |  23 -----
 components/camel-soap/pom.xml                      |  94 ++++-------------
 components/camel-spring-boot/pom.xml               |  17 +++-
 components/camel-spring-javaconfig/pom.xml         |  25 ++---
 components/camel-spring-redis/pom.xml              |   6 ++
 components/camel-spring-ws/pom.xml                 |  73 ++-----------
 components/camel-spring/pom.xml                    |  66 ++++++++++--
 components/camel-syslog/pom.xml                    |  24 ++---
 components/camel-telegram/pom.xml                  |  17 +++-
 components/camel-test-blueprint/pom.xml            |  24 ++---
 components/camel-test-spring/pom.xml               |  17 +++-
 components/camel-test/pom.xml                      |  17 +++-
 components/camel-testcontainers-spring/pom.xml     |  18 +++-
 components/camel-testcontainers/pom.xml            |  22 ++--
 components/camel-testng/pom.xml                    |  25 ++---
 components/camel-thrift/pom.xml                    |   6 ++
 components/camel-undertow/pom.xml                  |   5 +
 components/camel-vertx/pom.xml                     |  20 ----
 components/camel-wordpress/pom.xml                 |  17 +++-
 connectors/camel-connector-maven-plugin/pom.xml    |  17 ++++
 connectors/examples/beverage-component/pom.xml     |  17 +++-
 connectors/examples/foo-bar-wine-example/pom.xml   |  17 +++-
 connectors/examples/petstore-example/pom.xml       |  17 +++-
 examples/camel-example-cafe/pom.xml                |  17 +++-
 examples/camel-example-cdi-metrics/pom.xml         |  17 +++-
 examples/camel-example-cdi-properties/pom.xml      |  17 +++-
 examples/camel-example-cdi-rest-servlet/pom.xml    |  21 +++-
 examples/camel-example-cdi-test/pom.xml            |  17 +++-
 examples/camel-example-cxf-blueprint/pom.xml       |  17 +++-
 examples/camel-example-cxf-proxy/pom.xml           |  17 +++-
 examples/camel-example-cxf-tomcat/pom.xml          |  15 ++-
 .../hello-camel-grpc-server-kubernetes/pom.xml     |  15 ++-
 examples/camel-example-loan-broker-cxf/pom.xml     |  17 +++-
 examples/camel-example-loan-broker-jms/pom.xml     |  17 +++-
 examples/camel-example-management/pom.xml          |  17 +++-
 examples/camel-example-pojo-messaging/pom.xml      |  17 +++-
 examples/camel-example-rabbitmq/pom.xml            |  17 +++-
 examples/camel-example-reportincident/pom.xml      |  17 +++-
 examples/camel-example-rest-producer/pom.xml       |  17 +++-
 .../camel-example-spring-boot-activemq/pom.xml     |  17 +++-
 .../pom.xml                                        |  17 +++-
 .../hello-camel-grpc-server/pom.xml                |  18 ++++
 .../pom.xml                                        |  17 +++-
 examples/camel-example-spring-boot-master/pom.xml  |  17 +++-
 examples/camel-example-spring-boot-pojo/pom.xml    |  17 +++-
 .../camel-example-spring-boot-rest-jpa/pom.xml     |  17 +++-
 .../pom.xml                                        |  17 +++-
 examples/camel-example-spring-boot-xml/pom.xml     |  17 +++-
 examples/camel-example-spring-boot/pom.xml         |  17 +++-
 examples/camel-example-spring-jms/pom.xml          |  17 +++-
 examples/camel-example-spring-ws/pom.xml           |  15 +++
 examples/camel-example-transformer-demo/pom.xml    |  17 +++-
 .../camel-example-validator-spring-boot/pom.xml    |  17 +++-
 parent/pom.xml                                     |  71 ++++++++++++-
 platforms/camel-catalog-rest/pom.xml               |   4 +-
 platforms/spring-boot/components-starter/pom.xml   |  17 +++-
 tests/camel-blueprint-test/pom.xml                 |  17 +++-
 tooling/apt/pom.xml                                |   6 ++
 .../pom.xml                                        |  27 +----
 tooling/maven/camel-package-maven-plugin/pom.xml   |  37 ++++---
 tooling/maven/camel-restdsl-swagger-plugin/pom.xml |  31 +++---
 .../src/it/simple-xml/pom.xml                      |   1 +
 tooling/pom.xml                                    |  27 -----
 tooling/swagger-rest-dsl-generator/pom.xml         |   5 +
 94 files changed, 1168 insertions(+), 1171 deletions(-)

diff --git a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
index c439407..b584ec6 100644
--- a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
@@ -152,9 +152,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -167,5 +167,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index f5d1c43..63f3b79 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -143,6 +143,41 @@
       <version>${project.version}</version>
     </dependency>
 
+    <!-- in Java 11+ JAXB is no longer included -->
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>${jaxb-version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>${jaxb-version}</version>
+      <optional>true</optional>
+    </dependency>
+
+    <!-- in Java 11+ Activation Framework is no longer included -->
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>javax.activation-api</artifactId>
+      <version>${activation-api-version}</version>
+      <optional>true</optional>
+    </dependency>
+
+    <!-- in Java 11+ SAAJ is no longer included -->
+    <dependency>
+      <groupId>javax.xml.soap</groupId>
+      <artifactId>javax.xml.soap-api</artifactId>
+      <version>${soap-api-version}</version>
+      <optional>true</optional>
+    </dependency>
+
     <!-- required dependencies by camel-core -->
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -236,6 +271,13 @@
       <scope>test</scope>
     </dependency>
 
+    <!-- xmltokenizer using woodstox -->
+    <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>woodstox-core-asl</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 
@@ -656,77 +698,8 @@
         </dependency>
       </dependencies>
     </profile>
-    <profile>
-      <id>woodstox</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <dependencies>
-        <!-- xmltokenizer using woodstox -->
-        <dependency>
-          <groupId>org.codehaus.woodstox</groupId>
-          <artifactId>woodstox-core-asl</artifactId>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <dependencies>
 
-        <!-- enable the APT processor -->
-        <dependency>
-          <groupId>org.apache.camel</groupId>
-          <artifactId>apt</artifactId>
-          <scope>provided</scope>
-        </dependency>
-        <!-- xmltokenizer using woodstox -->
-        <dependency>
-          <groupId>org.codehaus.woodstox</groupId>
-          <artifactId>woodstox-core-asl</artifactId>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <!-- skip file stress tests as they are intended to run manually -->
-              <excludes>
-                <exclude>org/apache/camel/component/file/stress/**.java</exclude>
-                <exclude>**/DistributedCompletionIntervalTest.java</exclude>
-                <exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
-                <exclude>${platform.skip.tests}</exclude>
-              </excludes>
-              <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
-              <!-- needed for testing the properties component -->
-              <environmentVariables>
-              <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
-              <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
-              </environmentVariables>
-              <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED</argLine>
-            </configuration>
-            <dependencies>
-              <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-core</artifactId>
-                <version>${jaxb-version}</version>
-              </dependency>
-              <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb-version}</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
 </project>
+
diff --git a/components/camel-as2/camel-as2-api/pom.xml b/components/camel-as2/camel-as2-api/pom.xml
index 342b511..da60a6d 100644
--- a/components/camel-as2/camel-as2-api/pom.xml
+++ b/components/camel-as2/camel-as2-api/pom.xml
@@ -109,25 +109,4 @@
 		</plugins>
 	</build>
 
-	<!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
-	<profiles>
-		<profile>
-			<id>doclint-java8-disable</id>
-			<activation>
-				<jdk>[1.8,</jdk>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<configuration>
-							<additionalparam>-Xdoclint:none</additionalparam>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 </project>
diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml
index 790bc26..b127e7d 100644
--- a/components/camel-bam/pom.xml
+++ b/components/camel-bam/pom.xml
@@ -99,8 +99,32 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
+  <build>
+    <testResources>
+      <testResource>
+        <directory>${basedir}/src/test/profiles/hibernate</directory>
+      </testResource>
+    </testResources>
+  </build>
+
   <profiles>
     <!-- Hibernate Derby profile -->
     <profile>
@@ -209,39 +233,5 @@
       </dependencies>
     </profile>
     
-    <profile>
-      <id>jdk9+-hibernate</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <testResources>
-          <testResource>
-            <directory>${basedir}/src/test/profiles/hibernate</directory>
-          </testResource>
-        </testResources>
-        
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-modules java.activation,java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.hibernate</groupId>
-          <artifactId>hibernate-entitymanager</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.1_spec</artifactId>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
   </profiles>
 </project>
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index 413f63e..a14cfa7 100644
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -89,6 +89,12 @@
             <artifactId>log4j-slf4j-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-version}</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
@@ -103,23 +109,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>jdk9+-build</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
-                            <argLine>-Duser.language=en -Duser.region=GB --add-modules java.xml.bind,java.xml.ws.annotation --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.xml.ws.annotation/javax.annotation=ALL-UNNAMED</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 86711ce..32294d0 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -92,6 +92,11 @@
       <version>${aries-util-version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
 
     <!-- for testing -->
     <dependency>
@@ -230,6 +235,31 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <id>include-sources</id>
+            <phase>package</phase>
+            <configuration>
+              <target>
+                <echo>Including source code from camel-core-xml in the camel-blueprint-sources.jar</echo>
+                <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar"
+                     update="true">
+                  <fileset dir="${basedir}/../camel-core-osgi/src/main/java" includes="**/*"/>
+                  <fileset dir="${basedir}/../camel-core-xml/src/main/java" includes="**/*"/>
+                </jar>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
 
     <pluginManagement>
@@ -251,6 +281,18 @@
             </artifactItems>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>jaxb2-maven-plugin</artifactId>
+          <version>2.4</version>
+          <dependencies>
+            <dependency>
+              <groupId>javax.activation</groupId>
+              <artifactId>javax.activation-api</artifactId>
+              <version>${activation-api-version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
         <!-- Eclipse m2e Lifecycle Management -->
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
@@ -412,10 +454,10 @@
               </execution>
             </executions>
           </plugin>
-		      <plugin>
+          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>jaxb2-maven-plugin</artifactId>
-            <version>2.3.1</version>
+            <version>2.4</version>
             <executions>
               <execution>
                 <id>generate-schema</id>
@@ -488,71 +530,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-        <property>
-          <name>!os.unsupported.schemagen</name>
-        </property>
-      </activation>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>jaxb2-maven-plugin</artifactId>
-              <version>2.3.1</version>
-              <dependencies>
-                <dependency>
-                  <groupId>org.glassfish.jaxb</groupId>
-                  <artifactId>jaxb-jxc-jdk9</artifactId>
-                  <version>${jaxb-version}</version>
-                </dependency>
-                <dependency>
-                  <groupId>javax.activation</groupId>
-                  <artifactId>javax.activation-api</artifactId>
-                  <version>1.2.0</version>
-                </dependency>
-              </dependencies>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <reuseForks>true</reuseForks>
-              <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.8</version>
-            <executions>
-              <execution>
-                <id>include-sources</id>
-                <phase>package</phase>
-                <configuration>
-                  <target>
-                    <echo>Including source code from camel-core-xml in the camel-blueprint-sources.jar</echo>
-                    <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar"
-                         update="true">
-                      <fileset dir="${basedir}/../camel-core-osgi/src/main/java" includes="**/*"/>
-                      <fileset dir="${basedir}/../camel-core-xml/src/main/java" includes="**/*"/>
-                    </jar>
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
   <reporting>
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 585565f..bf9580d 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -88,24 +88,12 @@
       <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-modules java.activation,java.xml.bind</argLine>
-            </configuration>
-         </plugin>
-       </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index 0043d30..7416fdd 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -69,27 +69,6 @@
     </plugins>
   </build>
 
-  <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
-  <profiles>
-    <profile>
-      <id>doclint-java8-disable</id>
-      <activation>
-        <jdk>[1.8,</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <additionalparam>-Xdoclint:none</additionalparam>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
   <dependencies>
     <dependency>
       <groupId>com.box</groupId>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 2f7c7cf..f374e89 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -84,6 +84,17 @@
       <artifactId>camel-core</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+    </dependency>
+
     <!-- DeltaSpike is only used to provide Main support thus optional -->
     <dependency>
       <groupId>org.apache.deltaspike.cdictrl</groupId>
@@ -507,73 +518,8 @@
 
       </dependencies>
 
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <reuseForks>true</reuseForks>
-              <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar --patch-module java.xml.bind=${project.basedir}/target/java9 ${camel.surefire.fork.vmargs} --add-opens java.base/java.lang=java.xml.bind</argLine>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>2.10</version>
-            <executions>
-              <execution>
-                <id>copy</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>copy</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>javax.annotation</groupId>
-                      <artifactId>javax.annotation-api</artifactId>
-                      <version>1.2</version>
-                      <type>jar</type>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${project.basedir}/target/java9</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                  <overWriteReleases>false</overWriteReleases>
-                  <overWriteSnapshots>true</overWriteSnapshots>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-jaxb</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>com.sun.xml.bind</groupId>
-                      <artifactId>jaxb-impl</artifactId>
-                      <version>${jaxb-version}</version>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${project.basedir}/target/java9</outputDirectory>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>com.sun.xml.bind</groupId>
-                      <artifactId>jaxb-core</artifactId>
-                      <version>${jaxb-version}</version>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${project.basedir}/target/java9</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                  <overWriteReleases>false</overWriteReleases>
-                  <overWriteSnapshots>true</overWriteSnapshots>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
     </profile>
+
   </profiles>
 
 </project>
diff --git a/components/camel-context/pom.xml b/components/camel-context/pom.xml
index 9148299..37bf1bc 100644
--- a/components/camel-context/pom.xml
+++ b/components/camel-context/pom.xml
@@ -82,24 +82,11 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-version}</version>
+        </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>jdk9+-build</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 02e1480..de8783e 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -84,6 +84,17 @@
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml</groupId>
+      <artifactId>webservices-api</artifactId>
+      <version>${webservices-api-version}</version>
+    </dependency>
 
     <!-- OSGi, Blueprint -->
     <dependency>
@@ -203,28 +214,15 @@
             </goals>
           </execution>
         </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>6.2</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>
   
-  <profiles>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <reuseForks>true</reuseForks>
-              <argLine>--add-modules java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index a7440c4..bd3c8b4 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -48,6 +48,11 @@
       <groupId>com.github.dozermapper</groupId>
       <artifactId>dozer-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+    </dependency>
 
     <!-- Expressions -->
     <dependency>
diff --git a/components/camel-fhir/camel-fhir-api/pom.xml b/components/camel-fhir/camel-fhir-api/pom.xml
index fa3130b..0099bfd 100644
--- a/components/camel-fhir/camel-fhir-api/pom.xml
+++ b/components/camel-fhir/camel-fhir-api/pom.xml
@@ -79,25 +79,4 @@
     </plugins>
   </build>
 
-  <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
-  <profiles>
-    <profile>
-      <id>doclint-java8-disable</id>
-      <activation>
-        <jdk>[1.8,</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <additionalparam>-Xdoclint:none</additionalparam>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index 811d5ac..23da699 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -141,31 +141,4 @@
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10905 -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>default-compile</id>
-                <phase>none</phase>
-              </execution>
-              <execution>
-                <id>default-testCompile</id>
-                <phase>none</phase>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/components/camel-groovy-dsl/pom.xml b/components/camel-groovy-dsl/pom.xml
index 79db32a..65cf6f3 100644
--- a/components/camel-groovy-dsl/pom.xml
+++ b/components/camel-groovy-dsl/pom.xml
@@ -179,31 +179,4 @@
     </testResources>
   </build>
   
-  <profiles>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10905 -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>default-compile</id>
-                <phase>none</phase>
-              </execution>
-              <execution>
-                <id>default-testCompile</id>
-                <phase>none</phase>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 01180d6..2724567 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -47,6 +47,18 @@
     </dependency>
     
     <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
+
+    <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
       <version>${grpc-version}</version>
@@ -220,4 +232,5 @@
       </plugin>
     </plugins>
   </build>
+
 </project>
diff --git a/components/camel-guice/pom.xml b/components/camel-guice/pom.xml
index dcda484..5dc6d4a 100644
--- a/components/camel-guice/pom.xml
+++ b/components/camel-guice/pom.xml
@@ -91,4 +91,20 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>${annotation-api-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 6982cd3..a439eb5 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -145,24 +145,12 @@
             <artifactId>log4j-slf4j-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>jdk9+-build</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>--add-modules java.xml.bind</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index d99a91e..a13bfeb 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -99,25 +99,4 @@
     
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <!-- TODO: See https://issues.apache.org/jira/browse/IGNITE-4615 for more information. -->
-                <exclude>**/**.java</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/components/camel-infinispan/pom.xml b/components/camel-infinispan/pom.xml
index 4a46d01..6304c89 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -153,40 +153,8 @@
         </dependency>
     </dependencies>
 
-    <!-- unit testing requires java 8 -->
     <profiles>
         <profile>
-            <id>jdk8-test</id>
-            <activation>
-                <jdk>!1.8</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>default-testCompile</id>
-                                <phase>test-compile</phase>
-                                <goals>
-                                    <goal>testCompile</goal>
-                                </goals>
-                                <configuration>
-                                    <skip>true</skip>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
             <id>infinispan-itests</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index 101bed7..43707dd 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -171,6 +171,18 @@
       <artifactId>httpclient</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -188,23 +200,4 @@
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 10aebc4..d02487d 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -42,6 +42,17 @@
             <artifactId>camel-core</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>javax.activation-api</artifactId>
+            <version>${activation-api-version}</version>
+        </dependency>
+
         <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
@@ -76,67 +87,13 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>jdk8-build</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jvnet.jaxb2.maven2</groupId>
-                        <artifactId>maven-jaxb2-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-           <!-- TODO: This is a temporary workaround until org.codehaus.mojo:jaxb2-maven-plugin supports JDK9.
-           (https://github.com/mojohaus/jaxb2-maven-plugin/issues/43). We need to add the plugin back
-           once we are sure it works on both JDK8 and JDK9.
-           See https://issues.apache.org/jira/browse/CAMEL-10141 for more info. -->
-            <id>jdk9+-build</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-xjc-plugin</artifactId>
-                        <version>${cxf-xjc-plugin-version}</version>
-                        <configuration>
-                            <extensions>
-                                <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
-                            </extensions>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>generate-sources</id>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <fork>${cxf.codegenplugin.forkmode}</fork>
-                                    <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
-                                    <sourceRoot>${basedir}/target/xjc</sourceRoot>
-                                    <xsdOptions>
-                                        <xsdOption>
-                                            <xsd>${basedir}/src/main/resources/notifications.xsd</xsd>
-                                            <packagename>org.apache.camel.component.jmx.jaxb</packagename>
-                                            <extensionArgs>
-                                                <extensionArg>-Xfluent-api</extensionArg>
-                                            </extensionArgs>
-                                        </xsdOption>
-                                    </xsdOptions>
-                                </configuration>
-                                <goals>
-                                    <goal>xsdtojava</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml
index cefbdb6..4816523 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -210,25 +210,4 @@
     </plugins>
   </build>
 
-  <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
-  <profiles>
-    <profile>
-      <id>doclint-java8-disable</id>
-      <activation>
-        <jdk>[1.8,</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <additionalparam>-Xdoclint:none</additionalparam>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 4c9cc48..eee5165 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -125,6 +125,12 @@
           <version>${assertj-version}</version>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+          <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -140,23 +146,4 @@
       </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>jdk9+-build</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <!-- required to make MailMimeDecodeHeadersTest work on operating systems with a different default encoding -->
-                            <argLine>-Dfile.encoding=UTF-8 --add-modules java.activation,java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml
index 5bfc721..9f3bcbd 100644
--- a/components/camel-mustache/pom.xml
+++ b/components/camel-mustache/pom.xml
@@ -72,23 +72,4 @@
 
   </dependencies>
   
-  <!-- unit testing requires java 8 -->
-  <profiles>
-    <profile>
-      <id>jdk8-test</id>
-        <activation>
-          <jdk>!1.8</jdk>
-        </activation>
-        <build>
-          <plugins>
-            <plugin>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <configuration>
-                 <skipTests>true</skipTests>
-              </configuration>
-            </plugin>
-          </plugins>
-        </build>
-     </profile>
-  </profiles>
 </project>
diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml
index f6e558f..a00043b 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -95,4 +95,20 @@
     </dependency>
 
 	</dependencies>
+
+  <profiles>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>${annotation-api-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index dca3ecf..25e6ee8 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -81,26 +81,12 @@
       <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
     
-  <profiles>
-      <profile>
-          <id>jdk9+-build</id>
-          <activation>
-              <jdk>[9,)</jdk>
-          </activation>
-          <build>
-              <plugins>
-                  <plugin>
-                      <artifactId>maven-surefire-plugin</artifactId>
-                      <configuration>
-                          <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
-                          <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED</argLine>
-                      </configuration>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-  </profiles>  
-
 </project>
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index d2cca42..5667478 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -115,26 +115,4 @@
     </plugins>
   </build>
 
-  <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
-  <profiles>
-    <profile>
-      <id>doclint-java8-disable</id>
-      <activation>
-        <jdk>[1.8,</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>${maven-javadoc-plugin-version}</version>
-            <configuration>
-              <additionalparam>-Xdoclint:none</additionalparam>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/components/camel-olingo4/camel-olingo4-api/pom.xml b/components/camel-olingo4/camel-olingo4-api/pom.xml
index 37b6aa5..342b875 100644
--- a/components/camel-olingo4/camel-olingo4-api/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-api/pom.xml
@@ -129,25 +129,4 @@
     </plugins>
   </build>
 
-  <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
-  <profiles>
-    <profile>
-      <id>doclint-java8-disable</id>
-      <activation>
-        <jdk>[1.8,</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <additionalparam>-Xdoclint:none</additionalparam>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/components/camel-ruby/pom.xml b/components/camel-ruby/pom.xml
index c3cd5a4..9077cf4 100644
--- a/components/camel-ruby/pom.xml
+++ b/components/camel-ruby/pom.xml
@@ -49,6 +49,12 @@
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+      <optional>true</optional>
+    </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -78,22 +84,4 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index cdb1574..9541356 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -209,27 +209,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>jdk9+-build</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10904 -->
-                        <groupId>net.alchim31.maven</groupId>
-                        <artifactId>scala-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>default</id>
-                                <phase>none</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index c210462..a1c1583 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -53,11 +53,25 @@
         </dependency>
 
         <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>javax.activation-api</artifactId>
+            <version>${activation-api-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml</groupId>
+            <artifactId>webservices-api</artifactId>
+            <version>${webservices-api-version}</version>
+        </dependency>
+        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
 
-
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -104,6 +118,10 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-xjc-plugin</artifactId>
                 <version>${cxf-xjc-plugin-version}</version>
@@ -200,78 +218,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>jdk8-build</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jvnet.jaxb2.maven2</groupId>
-                        <artifactId>maven-jaxb2-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <!-- TODO: This is a temporary workaround until org.codehaus.mojo:jaxb2-maven-plugin supports JDK9.
-            (https://github.com/mojohaus/jaxb2-maven-plugin/issues/43). We need to add the plugin back
-            once we are sure it works on both JDK8 and JDK9.
-            See https://issues.apache.org/jira/browse/CAMEL-10141 for more info. -->
-            <id>jdk9+-build</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-xjc-plugin</artifactId>
-                        <version>${cxf-xjc-plugin-version}</version>
-                        <configuration>
-                            <extensions>
-                                <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
-                            </extensions>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>generate-sources</id>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <fork>${cxf.codegenplugin.forkmode}</fork>
-                                    <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
-                                    <sourceRoot>${basedir}/target/xjc</sourceRoot>
-                                    <xsdOptions>
-                                        <xsdOption>
-                                            <xsd>${basedir}/src/main/resources/soap.xsd</xsd>
-                                            <extensionArgs>
-                                                <extensionArg>-Xfluent-api</extensionArg>
-                                            </extensionArgs>
-                                        </xsdOption>
-                                        <xsdOption>
-                                            <xsd>${basedir}/src/main/resources/soap12.xsd</xsd>
-                                            <extensionArgs>
-                                                <extensionArg>-Xfluent-api</extensionArg>
-                                            </extensionArgs>
-                                        </xsdOption>
-                                        <xsdOption>
-                                            <xsd>${basedir}/src/main/resources/xml.xsd</xsd>
-                                            <extensionArgs>
-                                                <extensionArg>-Xfluent-api</extensionArg>
-                                            </extensionArgs>
-                                        </xsdOption>
-                                    </xsdOptions>
-                                </configuration>
-                                <goals>
-                                    <goal>xsdtojava</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index b1a0676..e2a7028 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -159,9 +159,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -175,5 +175,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml
index c8a40d6..979f14c 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -61,6 +61,12 @@
       <version>${cglib-bundle-version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>junit</groupId>
@@ -94,23 +100,4 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <reuseForks>true</reuseForks>
-              <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 372bd46..a84faa2 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -82,6 +82,12 @@
       <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index bb7cea9..645a679 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -76,6 +76,17 @@
       <version>${spring-ws-version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.springframework.ws</groupId>
@@ -186,66 +197,4 @@
 
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>java9+</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--patch-module java.xml.bind=${project.basedir}/target/java9/stax-ex-1.7.8.jar  --patch-module java.xml.ws=${project.basedir}/target/java9/saaj-impl-1.3.28.jar --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar ${camel.surefire.fork.vmargs} --add-exports=java.xml/com.sun.org.apache.xerces.internal.dom=java.xml.ws --add-exports=java.xml.bind/org.jvnet.staxex.util=java.xml.ws</argLine>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>2.10</version>
-            <executions>
-              <execution>
-                <id>copy</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>copy</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.jvnet.staxex</groupId>
-                      <artifactId>stax-ex</artifactId>
-                      <version>1.7.8</version>
-                      <type>jar</type>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${project.basedir}/target/java9</outputDirectory>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>javax.annotation</groupId>
-                      <artifactId>javax.annotation-api</artifactId>
-                      <version>1.2</version>
-                      <type>jar</type>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${project.basedir}/target/java9</outputDirectory>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>com.sun.xml.messaging.saaj</groupId>
-                      <artifactId>saaj-impl</artifactId>
-                      <version>1.3.28</version>
-                      <type>jar</type>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${project.basedir}/target/java9</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                  <overWriteReleases>false</overWriteReleases>
-                  <overWriteSnapshots>true</overWriteSnapshots>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 72f88e0..e9e1134 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -575,7 +575,7 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>jaxb2-maven-plugin</artifactId>
-            <version>2.3.1</version>
+            <version>2.4</version>
             <executions>
               <execution>
                 <id>generate schema</id>
@@ -598,9 +598,9 @@
     </profile>
 
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <dependencies>
         <!-- xmltokenizer using woodstox -->
@@ -614,15 +614,9 @@
       <build>
         <plugins>
           <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>jaxb2-maven-plugin</artifactId>
-            <version>2.3.1</version>
+            <version>2.4</version>
             <dependencies>
               <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
@@ -652,6 +646,58 @@
               <createJavaDocAnnotations>false</createJavaDocAnnotations>
             </configuration>
           </plugin>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED</argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>jaxb2-maven-plugin</artifactId>
+            <version>2.4</version>
+            <executions>
+              <execution>
+                <id>generate schema</id>
+                <phase>generate-test-sources</phase>
+                <goals>
+                  <goal>schemagen</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <outputDirectory>${project.build.directory}/schema</outputDirectory>
+              <sources>
+                <source>${project.build.directory}/schema-src</source>
+              </sources>
+              <createJavaDocAnnotations>false</createJavaDocAnnotations>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>javax.activation</groupId>
+                <artifactId>javax.activation-api</artifactId>
+                <version>1.2.0</version>
+              </dependency>
+            </dependencies>
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index d032fc2..d86c62a 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -83,24 +83,12 @@
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml
index c5f740e..97544a2 100644
--- a/components/camel-telegram/pom.xml
+++ b/components/camel-telegram/pom.xml
@@ -141,9 +141,9 @@
       </build>
     </profile>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -156,6 +156,19 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
 </project>
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index 175073b..2ea65d4 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -62,6 +62,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-version}</version>
+        </dependency>
+
         <!-- the ordering of the dependencies can matter as we load the dependencies from the classpath
              with felix-connect, and you may get a weird error if wrong order -->
         <dependency>
@@ -176,22 +182,4 @@
 
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>jdk9+-build</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml
index a406a50..0a6be29 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -76,9 +76,9 @@
   
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -92,5 +92,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index 545d167..63ca268 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -72,9 +72,9 @@
 
     <profiles>
         <profile>
-            <id>jdk9+-build</id>
+            <id>jdk9-10-build</id>
             <activation>
-                <jdk>[9,)</jdk>
+                <jdk>[9,10]</jdk>
             </activation>
             <build>
                 <plugins>
@@ -87,5 +87,18 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>jdk11+-build</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <version>${jaxb-version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>
diff --git a/components/camel-testcontainers-spring/pom.xml b/components/camel-testcontainers-spring/pom.xml
index ceb0f51..c15f87e 100644
--- a/components/camel-testcontainers-spring/pom.xml
+++ b/components/camel-testcontainers-spring/pom.xml
@@ -75,9 +75,9 @@
 
     <profiles>
         <profile>
-            <id>jdk9+-build</id>
+            <id>jdk9-10-build</id>
             <activation>
-                <jdk>[9,)</jdk>
+                <jdk>[9,10]</jdk>
             </activation>
             <build>
                 <plugins>
@@ -91,6 +91,20 @@
             </build>
         </profile>
 
+        <profile>
+            <id>jdk11+-build</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <version>${jaxb-version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
         <!-- activate integration test if the docker socket file is accessible -->
         <profile>
             <id>testcontainers-spring-integration-tests-docker-file</id>
diff --git a/components/camel-testcontainers/pom.xml b/components/camel-testcontainers/pom.xml
index 4f95cbd..4e115bd 100644
--- a/components/camel-testcontainers/pom.xml
+++ b/components/camel-testcontainers/pom.xml
@@ -72,26 +72,16 @@
             <artifactId>log4j-slf4j-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-version}</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
     <profiles>
-        <profile>
-            <id>jdk9+-build</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
 
         <!-- activate integration test if the docker socket file is accessible -->
         <profile>
diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml
index 1ad175d..5be396a 100644
--- a/components/camel-testng/pom.xml
+++ b/components/camel-testng/pom.xml
@@ -63,6 +63,12 @@
             <artifactId>testng</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-version}</version>
+        </dependency>
+
         <!-- optional dependencies for running tests -->          
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -82,23 +88,4 @@
 
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>jdk9+-build</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <reuseForks>true</reuseForks>
-                            <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/components/camel-thrift/pom.xml b/components/camel-thrift/pom.xml
index 09bfba1..712c97e 100644
--- a/components/camel-thrift/pom.xml
+++ b/components/camel-thrift/pom.xml
@@ -105,6 +105,12 @@
       <version>${junit-toolbox-version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 7dc8d48..56703df 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -55,6 +55,11 @@
       <artifactId>undertow-core</artifactId>
       <version>${undertow-version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+    </dependency>
 
     <!-- testing -->
     <dependency>
diff --git a/components/camel-vertx/pom.xml b/components/camel-vertx/pom.xml
index c39b746..172afac 100644
--- a/components/camel-vertx/pom.xml
+++ b/components/camel-vertx/pom.xml
@@ -77,24 +77,4 @@
     </dependency>
   </dependencies>
 
-  <!-- unit testing requires java 8 -->
-  <profiles>
-    <profile>
-      <id>jdk8-test</id>
-      <activation>
-        <jdk>!1.8</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <skipTests>true</skipTests>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index 41b560b..d80c62a 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -127,9 +127,9 @@
 
 	<profiles>
 		<profile>
-			<id>jdk9+-build</id>
+			<id>jdk9-10-build</id>
 			<activation>
-				<jdk>[9,)</jdk>
+				<jdk>[9,10]</jdk>
 			</activation>
 			<build>
 				<plugins>
@@ -142,6 +142,19 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>jdk11+-build</id>
+			<activation>
+				<jdk>[11,)</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>javax.xml.bind</groupId>
+					<artifactId>jaxb-api</artifactId>
+					<version>${jaxb-version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
 	</profiles>
 
 </project>
diff --git a/connectors/camel-connector-maven-plugin/pom.xml b/connectors/camel-connector-maven-plugin/pom.xml
index a77590c..6cd3190 100644
--- a/connectors/camel-connector-maven-plugin/pom.xml
+++ b/connectors/camel-connector-maven-plugin/pom.xml
@@ -123,4 +123,21 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <!-- enable the APT processor -->
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>${annotation-api-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/connectors/examples/beverage-component/pom.xml b/connectors/examples/beverage-component/pom.xml
index 48d41e2..89d3329 100644
--- a/connectors/examples/beverage-component/pom.xml
+++ b/connectors/examples/beverage-component/pom.xml
@@ -95,9 +95,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -110,5 +110,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/connectors/examples/foo-bar-wine-example/pom.xml b/connectors/examples/foo-bar-wine-example/pom.xml
index 270dd0e..39466c8 100644
--- a/connectors/examples/foo-bar-wine-example/pom.xml
+++ b/connectors/examples/foo-bar-wine-example/pom.xml
@@ -107,9 +107,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -122,5 +122,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/connectors/examples/petstore-example/pom.xml b/connectors/examples/petstore-example/pom.xml
index cb495e9..9a050ca 100644
--- a/connectors/examples/petstore-example/pom.xml
+++ b/connectors/examples/petstore-example/pom.xml
@@ -110,9 +110,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -125,5 +125,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-cafe/pom.xml b/examples/camel-example-cafe/pom.xml
index 969c662..818fdbf 100644
--- a/examples/camel-example-cafe/pom.xml
+++ b/examples/camel-example-cafe/pom.xml
@@ -123,9 +123,9 @@
   
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -138,5 +138,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml
index 6528b12..607febc 100644
--- a/examples/camel-example-cdi-metrics/pom.xml
+++ b/examples/camel-example-cdi-metrics/pom.xml
@@ -137,9 +137,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -152,5 +152,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml
index 7a3b533..22402f7 100644
--- a/examples/camel-example-cdi-properties/pom.xml
+++ b/examples/camel-example-cdi-properties/pom.xml
@@ -134,9 +134,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -149,5 +149,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml
index b202c9a..9dfa724 100644
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -178,7 +178,7 @@
       </dependencies>
     </profile>
     <profile>
-      <id>jdk9+-build-jetty</id>
+      <id>jdk9+-jetty</id>
       <activation>
         <jdk>[9,)</jdk>
       </activation>
@@ -208,6 +208,12 @@
           </exclusions>
         </dependency>
       </dependencies>
+    </profile>
+    <profile>
+      <id>jdk9-10-build</id>
+      <activation>
+        <jdk>[9,10]</jdk>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -219,6 +225,19 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
   <build>
diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml
index 35b7e86..7e4cdb9 100644
--- a/examples/camel-example-cdi-test/pom.xml
+++ b/examples/camel-example-cdi-test/pom.xml
@@ -118,9 +118,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -133,5 +133,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-cxf-blueprint/pom.xml b/examples/camel-example-cxf-blueprint/pom.xml
index 32652cb..22c98a1 100644
--- a/examples/camel-example-cxf-blueprint/pom.xml
+++ b/examples/camel-example-cxf-blueprint/pom.xml
@@ -102,9 +102,9 @@
   
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -117,5 +117,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-cxf-proxy/pom.xml b/examples/camel-example-cxf-proxy/pom.xml
index 49dfa31..d7e58bf 100644
--- a/examples/camel-example-cxf-proxy/pom.xml
+++ b/examples/camel-example-cxf-proxy/pom.xml
@@ -154,9 +154,9 @@
   
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -169,5 +169,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-cxf-tomcat/pom.xml b/examples/camel-example-cxf-tomcat/pom.xml
index fd50281..7af41ff 100644
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -138,7 +138,7 @@
       </properties>
     </profile>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
         <jdk>[9,)</jdk>
       </activation>
@@ -153,6 +153,19 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
 </project>
diff --git a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
index b526418..535e77b 100644
--- a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
+++ b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
@@ -165,5 +165,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>${annotation-api-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/camel-example-loan-broker-cxf/pom.xml b/examples/camel-example-loan-broker-cxf/pom.xml
index 3be3754..789a221 100644
--- a/examples/camel-example-loan-broker-cxf/pom.xml
+++ b/examples/camel-example-loan-broker-cxf/pom.xml
@@ -172,9 +172,9 @@
       </properties>
     </profile>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -187,6 +187,19 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
 </project>
diff --git a/examples/camel-example-loan-broker-jms/pom.xml b/examples/camel-example-loan-broker-jms/pom.xml
index 38ff034..a93fc08 100644
--- a/examples/camel-example-loan-broker-jms/pom.xml
+++ b/examples/camel-example-loan-broker-jms/pom.xml
@@ -180,9 +180,9 @@
       </properties>
     </profile>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -195,6 +195,19 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
 </project>
diff --git a/examples/camel-example-management/pom.xml b/examples/camel-example-management/pom.xml
index f60ff98..12d56ca 100644
--- a/examples/camel-example-management/pom.xml
+++ b/examples/camel-example-management/pom.xml
@@ -140,9 +140,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -155,5 +155,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml
index d4a4d99..986a083 100644
--- a/examples/camel-example-pojo-messaging/pom.xml
+++ b/examples/camel-example-pojo-messaging/pom.xml
@@ -158,9 +158,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -173,5 +173,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-rabbitmq/pom.xml b/examples/camel-example-rabbitmq/pom.xml
index 00c88dc..0f83223 100644
--- a/examples/camel-example-rabbitmq/pom.xml
+++ b/examples/camel-example-rabbitmq/pom.xml
@@ -138,9 +138,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -153,5 +153,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml
index 0cffa44..a164b1c 100644
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -198,9 +198,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -213,5 +213,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml
index d3a88e7..4f1edf1 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -134,9 +134,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -149,5 +149,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-spring-boot-activemq/pom.xml b/examples/camel-example-spring-boot-activemq/pom.xml
index 6ab6da6..9ddc478 100644
--- a/examples/camel-example-spring-boot-activemq/pom.xml
+++ b/examples/camel-example-spring-boot-activemq/pom.xml
@@ -127,9 +127,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -143,6 +143,19 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
 </project>
diff --git a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
index fac7c9c..54d9fe9 100644
--- a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
@@ -48,9 +48,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -63,5 +63,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
index a12ec56..0b3c47a 100644
--- a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
+++ b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
@@ -108,4 +108,22 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <!-- enable the APT processor -->
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>${annotation-api-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/examples/camel-example-spring-boot-health-checks/pom.xml b/examples/camel-example-spring-boot-health-checks/pom.xml
index ecbb3bb..55e68c9 100644
--- a/examples/camel-example-spring-boot-health-checks/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/pom.xml
@@ -49,9 +49,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -64,5 +64,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-spring-boot-master/pom.xml b/examples/camel-example-spring-boot-master/pom.xml
index 034e6f9..7e6b8f5 100644
--- a/examples/camel-example-spring-boot-master/pom.xml
+++ b/examples/camel-example-spring-boot-master/pom.xml
@@ -114,9 +114,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -129,5 +129,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-spring-boot-pojo/pom.xml b/examples/camel-example-spring-boot-pojo/pom.xml
index 7920fe0..2785969 100644
--- a/examples/camel-example-spring-boot-pojo/pom.xml
+++ b/examples/camel-example-spring-boot-pojo/pom.xml
@@ -112,9 +112,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -127,5 +127,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-spring-boot-rest-jpa/pom.xml b/examples/camel-example-spring-boot-rest-jpa/pom.xml
index a79b32d..5c94611 100644
--- a/examples/camel-example-spring-boot-rest-jpa/pom.xml
+++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml
@@ -145,9 +145,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -160,6 +160,19 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
 
diff --git a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
index 6210564..42a9c0f 100644
--- a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
@@ -141,9 +141,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -156,5 +156,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-spring-boot-xml/pom.xml b/examples/camel-example-spring-boot-xml/pom.xml
index 29e6a0a..1055a66 100644
--- a/examples/camel-example-spring-boot-xml/pom.xml
+++ b/examples/camel-example-spring-boot-xml/pom.xml
@@ -139,9 +139,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -154,5 +154,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml
index 64808c4..4c3e662 100644
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -138,9 +138,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -153,5 +153,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml
index 64fd1e4..2c9f819 100644
--- a/examples/camel-example-spring-jms/pom.xml
+++ b/examples/camel-example-spring-jms/pom.xml
@@ -145,9 +145,9 @@
       </properties>
     </profile>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -160,6 +160,19 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
   <build>
 
diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml
index 02e896b..33ecaea 100644
--- a/examples/camel-example-spring-ws/pom.xml
+++ b/examples/camel-example-spring-ws/pom.xml
@@ -129,4 +129,19 @@
 
   </build>
 
+  <profiles>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>
diff --git a/examples/camel-example-transformer-demo/pom.xml b/examples/camel-example-transformer-demo/pom.xml
index a85874b..37a9939 100644
--- a/examples/camel-example-transformer-demo/pom.xml
+++ b/examples/camel-example-transformer-demo/pom.xml
@@ -106,9 +106,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -121,5 +121,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/examples/camel-example-validator-spring-boot/pom.xml b/examples/camel-example-validator-spring-boot/pom.xml
index 417f2b4..b3bde27 100644
--- a/examples/camel-example-validator-spring-boot/pom.xml
+++ b/examples/camel-example-validator-spring-boot/pom.xml
@@ -127,9 +127,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -142,5 +142,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index 41dc2f2..9d38b39 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,10 +40,12 @@
     <!-- dependency versions -->
     <abdera-version>1.1.3</abdera-version>
     <!-- Note that activemq dependency is only used for testing! -->
+    <activation-api-version>1.2.0</activation-api-version>
     <activemq-version>5.15.5</activemq-version>
     <activemq-artemis-version>2.6.3</activemq-artemis-version>
     <aether-version>1.0.2.v20150114</aether-version>
     <ahc-version>2.5.3</ahc-version>
+    <annotation-api-version>1.3.2</annotation-api-version>
     <ant-bundle-version>1.7.0_6</ant-bundle-version>
     <antlr-bundle-version>3.5.2_1</antlr-bundle-version>
     <antlr-runtime-bundle-version>3.5.2_1</antlr-runtime-bundle-version>
@@ -170,7 +172,7 @@
     <couchbase-client-version>1.4.13</couchbase-client-version>
     <couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version>
     <curator-version>2.12.0</curator-version>
-    <cxf-version>3.2.6</cxf-version>
+    <cxf-version>3.3.0-SNAPSHOT</cxf-version><!-- we need SNAPSHOT version for Java 11 support, see CXF-7741 -->
     <cxf-version-range>[3.1,4.0)</cxf-version-range>
     <cxf-xjc-plugin-version>3.2.0</cxf-xjc-plugin-version>
     <cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version>
@@ -255,18 +257,22 @@
     <geronimo-json-spec-version>1.0</geronimo-json-spec-version>
     <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
     <geronimo-servlet-spec-version>1.0</geronimo-servlet-spec-version>
+    <geronimo-servlet-2.5-spec-version>1.2</geronimo-servlet-2.5-spec-version>
     <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
     <gmetric4j-version>1.0.10</gmetric4j-version>
+    <google-guava-version>19.0</google-guava-version>
     <google-api-client-version>1.22.0</google-api-client-version>
     <google-api-services-drive-version>v2-rev297-1.22.0</google-api-services-drive-version>
+    <google-api-services-calendar-version>v3-rev291-1.22.0</google-api-services-calendar-version>
     <google-api-services-mail-version>v1-rev81-1.22.0</google-api-services-mail-version>
+    <google-api-services-bigquery-version>v2-rev352-1.22.0</google-api-services-bigquery-version>
     <google-api-services-pubsub-version>v1-rev12-1.22.0</google-api-services-pubsub-version>
     <google-mail-guava-version>17.0</google-mail-guava-version>
     <google-truth-version>0.30</google-truth-version>
     <grizzly-websockets-version>2.3.25</grizzly-websockets-version>
+    <grpc-version>1.14.0</grpc-version>
     <groovy-eclipse-compiler-version>3.0.0-01</groovy-eclipse-compiler-version>
     <groovy-eclipse-batch-version>2.5.2-01</groovy-eclipse-batch-version>
-    <grpc-version>1.14.0</grpc-version>
     <grpc-google-auth-library-version>0.9.0</grpc-google-auth-library-version>
     <grpc-guava-version>20.0</grpc-guava-version>
     <grpc-java-jwt-version>3.2.0</grpc-java-jwt-version>
@@ -276,6 +282,7 @@
     <gson-version>2.8.5</gson-version>
     <guice-version>4.0</guice-version>
     <guice3-version>3.0</guice3-version>
+    <guice-bundle-version>3.0_1</guice-bundle-version>
     <hadoop-bundle-version>1.2.1_1</hadoop-bundle-version>
     <hadoop-version>1.2.1</hadoop-version>
     <hadoop2-bundle-version>2.7.2_1</hadoop2-bundle-version>
@@ -621,6 +628,7 @@
     <snakeyaml-version>1.23</snakeyaml-version>
     <snappy-version>1.1.4</snappy-version>
     <snmp4j-version>2.6.3_1</snmp4j-version>
+    <soap-api-version>1.4.0</soap-api-version>
     <solr-bundle-version>7.2.1_1</solr-bundle-version>
     <!-- solr version aligned with lucene -->
     <solr-version>7.2.1</solr-version>
@@ -700,6 +708,7 @@
     <vysper-version>0.7</vysper-version>
     <web3j-version>3.5.0</web3j-version>
     <web3j-quorum-version>0.8.0</web3j-quorum-version>
+    <webservices-api-version>2.1-b16</webservices-api-version>
     <weld1-version>1.1.28.Final</weld1-version>
     <weld2-version>2.4.7.Final</weld2-version>
     <weld3-version>3.0.5.Final</weld3-version>
@@ -5262,7 +5271,7 @@
         <plugin>
           <groupId>org.jvnet.jaxb2.maven2</groupId>
           <artifactId>maven-jaxb2-plugin</artifactId>
-          <version>0.8.3</version>
+          <version>0.14.0</version>
           <executions>
             <execution>
               <goals>
@@ -5735,9 +5744,9 @@
     </profile>
 
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <properties>
         <cxf.codegen.jvmArgs>--add-modules java.activation,java.xml.bind,java.xml.ws --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.marshaller=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-open [...]
@@ -5791,5 +5800,57 @@
         </pluginManagement>
       </build>
     </profile>
+
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <properties>
+        <cxf.codegen.jvmArgs>--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</cxf.codegen.jvmArgs>
+        <cxf.xjc.jvmArgs>--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</cxf.xjc.jvmArgs>
+        <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
+        <camel.surefire.fork.vmargs>--add-modules java.sql --add-opens java.base/javax.net=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add [...]
+      </properties>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.cxf</groupId>
+              <artifactId>cxf-codegen-plugin</artifactId>
+              <dependencies>
+                <dependency>
+                  <groupId>javax.xml.bind</groupId>
+                  <artifactId>jaxb-api</artifactId>
+                  <version>${jaxb-version}</version>
+                </dependency>
+              </dependencies>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.camel</groupId>
+              <artifactId>camel-package-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <version>${maven-compiler-plugin-version}</version>
+              <configuration>
+                <source>${jdk.version}</source>
+                <target>${jdk.version}</target>
+                <maxmem>512M</maxmem>
+                <fork>true</fork>
+              </configuration>
+            </plugin>
+            <plugin>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <!--lets avoid polluting every pom.xml as these settings are almost always needed-->
+              <configuration>
+                <argLine>${camel.surefire.fork.vmargs}</argLine>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/platforms/camel-catalog-rest/pom.xml b/platforms/camel-catalog-rest/pom.xml
index f9c4c3b..332ce41 100644
--- a/platforms/camel-catalog-rest/pom.xml
+++ b/platforms/camel-catalog-rest/pom.xml
@@ -184,7 +184,7 @@
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar ${camel.surefire.fork.vmargs}</argLine>
+              <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${annotation-api-version}.jar ${camel.surefire.fork.vmargs}</argLine>
             </configuration>
           </plugin>
           <plugin>
@@ -203,7 +203,7 @@
                     <artifactItem>
                       <groupId>javax.annotation</groupId>
                       <artifactId>javax.annotation-api</artifactId>
-                      <version>1.2</version>
+                      <version>${annotation-api-version}</version>
                       <type>jar</type>
                       <overWrite>false</overWrite>
                       <outputDirectory>${project.basedir}/target/java9</outputDirectory>
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 07d9880..76553b7 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -371,9 +371,9 @@
   </modules>
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -386,5 +386,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/tests/camel-blueprint-test/pom.xml b/tests/camel-blueprint-test/pom.xml
index af08026..939129b 100644
--- a/tests/camel-blueprint-test/pom.xml
+++ b/tests/camel-blueprint-test/pom.xml
@@ -64,9 +64,9 @@
 
   <profiles>
     <profile>
-      <id>jdk9+-build</id>
+      <id>jdk9-10-build</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>[9,10]</jdk>
       </activation>
       <build>
         <plugins>
@@ -79,5 +79,18 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk11+-build</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${jaxb-version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml
index 6afd3aa..5381f49 100644
--- a/tooling/apt/pom.xml
+++ b/tooling/apt/pom.xml
@@ -51,6 +51,12 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
+
     <!-- logging -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
index 95b9b29..67f0ef5 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
@@ -156,7 +156,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>3.3</version>
+          <version>3.6-SNAPSHOT</version>
           <configuration>
             <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
             <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -180,29 +180,4 @@
     </pluginManagement>
   </build>
 
-  <profiles>
-    <profile>
-      <id>jdk9+-build</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>xalan</groupId>
-          <artifactId>xalan</artifactId>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 47cf92a..c30c92e 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -162,6 +162,27 @@
       <version>${freemarker-version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
+
     <!-- logging -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
@@ -186,20 +207,4 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>jigsaw</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-          <version>1.3</version>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 11b0d95..960351d 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -98,26 +98,25 @@
       <artifactId>maven-plugin-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>${jaxb-version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>jigsaw</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-          <version>1.3</version>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
index 95307f0..aa623cb 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
@@ -54,4 +54,5 @@
       </plugin>
     </plugins>
   </build>
+
 </project>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 52804e2..d6d127e 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -48,31 +48,4 @@
     <module>camel-manual</module>
   </modules>
 
-  <!-- profiles>
-    <profile>
-      <id>build.manual</id>
-      <modules>
-        <module>camel-manual</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>assembly</id>
-      <modules>
-        <module>camel-manual</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>deploy</id>
-      <modules>
-        <module>camel-manual</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>apache-release</id>
-      <modules>
-        <module>camel-manual</module>
-      </modules>
-    </profile>
-  </profiles -->
-
 </project>
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index ca8acb5..0c1ba8f 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -47,6 +47,11 @@
       <artifactId>swagger-parser</artifactId>
       <version>${swagger-java-parser-version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${annotation-api-version}</version>
+    </dependency>
 
     <!-- test -->
     <dependency>


[camel] 03/06: CAMEL-12618: Use fork of maven-plugin-plugin th...

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 659325ee922c813d8579819bbd4926d7e89c1d54
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Jul 18 14:56:45 2018 +0200

    CAMEL-12618: Use fork of maven-plugin-plugin th...
    
    ...at supports Java 11
    
    Changes the maven-plugin-plugin version used to a fork built by
    jitpack.io that contains the Java 11 compatibility needed.
---
 tooling/maven/camel-api-component-maven-plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml
index 0070fd6..ff85641 100644
--- a/tooling/maven/camel-api-component-maven-plugin/pom.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml
@@ -174,9 +174,9 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
+          <groupId>com.github.zregvart.maven-plugin-tools</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>3.3</version>
+          <version>MPLUGIN-336-SNAPSHOT</version>
           <configuration>
             <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
             <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>