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 d7f9d9f CAMEL-12618: Additional dependencies needed on ... discard 80b15a1 CAMEL-12618: Use fork of maven-plugin-plugin th... discard 9638fec CAMEL-12618: Use fork of MVEL that supports Jav... discard 693b653 Temporary disable JDK 9 and karaf-itest builds add 65bc219 Upgrade Chronicle Core to version 1.16.14 add 6def9cf Fixed the camel-braintree Karaf feature add 324591f Upgrade Brave Zipkin to version 5.1.3 add 8559c9e Added a Spring-boot Itests stage to the Jenkinsfile.daily pipeline add 8de48b3 Add XML schemas for release 2.20.4 add acac02a Camel-Nats: Polish add 7af1dfc Camel-Nats: Fixed CS add 01422c2 Camel-Nats: refactored some tests add a5d14e4 Fixed Maven Wrapper path in Jenkinsfile.daily pipeline for SB itests add 8d43cf6 Remove unused import add 074d199 CAMEL-12690: Annotation processors used in buil... add 188d204 Upgrade ElSql to version 1.3 add bb84485 Add camel-service karaf feature add efd7aaa Regen add 6512ee0 [CAMEL-12689] EndpointRegistry, TransformerRegistry and ValidatorRegistry use wrong generics add 8d7eee4 [CAMEL-12688] Add specific implementation of getShortName() to avoid reflection during route setup add ff41e9f [CAMEL-12688] Add protected methods to allow subclass to provide specific implementations add 2a8432d [CAMEL-12688] Possibility to use a simple LRUCache add 9fc335f [CAMEL-12688] Avoid lamba add 0e9830d [CAMEL-12688] Improve Scanner performances add 7af6206 [CAMEL-12688] Improve introspection performances add 0a88d13 [CAMEL-12688] Generate a fallback converter containing all core converters for performances add 63be5a1 CAMEL-12674 - upgrade sshd-core and replace it specific ones by version 2.0.0 add 0929fd8 Upgrade Web3J to version 3.5.0 add a036d13 Upgrade Zipkin to version 2.10.4 add 441128b Upgrade Bouncycastle to version 1.60 add e1a7130 Upgrade Brave Zipkin to version 5.1.4 add 1a2dc4f CAMEL-12692: Add camel-as2 to camel-parent POM add 7b9a14d [CAMEL-12693] Upgraded camel-dozer to dozer v6.3.0 add 34191fa CAMEL-12693 - Upgraded camel-dozer to dozer v6.3.0 add 0df9a3c CAMEL-12693 - Fix CS add ec8765e [CAMEL-12696] Updated docs for dozer add 7b75b74 Upgrade Chronicle Core to version 1.16.15 add 65458ed Upgrade Chronicle Wire to version 1.16.13 add acc38a2 Upgrade maven-compiler-plugin to version 3.8.0 add f81716e Fixed minor typos add 31b8a7e Updated Javadoc to fix the docs generation add 34aa0d1 Regen with new json docs for include add a78bfc7 Upgrade Hazelcast to version 3.10.4 add 699ec91 CAMEL-12697: Add hapi-structures-v21 to camel-parent POM add 190051c Use latest Hazelcast-Kubernetes docker image 3.10.4 add 6426b0d Bump Jnats to version 2.0.1 add c4447f9 Jnats 2.0.1 is again a bundle, lets use it in the karaf feature add 932c417 Fixed typos add 05eb6ca Upgrade Log4j2 to version 2.11.1 add 231e6af Regen add 65868cf Component docs for camel-fhir add d94a58e Fixed adoc warning add a39e39d Component docs add 05632f2 Component docs add e29dd91 Polished add 17adf9b Component docs add faae58f Upgrade Spring-boot to version 2.0.4.RELEASE add 18cb61c Upgrade Spring to version 5.0.8.RELEASE add b4b3943 Regen add 938487d Upgrade Spring Boot add 9e4d580 Upgrade JackRabbit to version 2.17.5 add 1b5040f CAMEL-6840 - add more regression which is similar to already existing ThrottlerTests where grouping is added and fix some CS errors in camel-core add a5b1957 CAMEL-12687 - upgrade shrinkwrap and arquillian versions add 7d2dc92 Upgrade RXJava to version 2.2.0 add 1f1fe58 Upgrade Flink to version 1.5.2 add 92a090e CAMEL-12701: servicenow: meta data serivce ignores tables without parent when retrieving table list add 0253d09 Upgrade testcontainers-java to v1.8.2 add 5212a7e CAMEL-12691: XmlConverter should use logger api when reporting parsin… (#2445) add 0056199 Upgrade testcontainers-java to v1.8.2 add ffa5063 CAMEL-12702: Improved spring boot docs add 338d058 CAMEL-6840 - add more regression which is similar to already existing ThrottlerTests where grouping is added and fix some CS errors in camel-core add ad2b04d Regen add ddc94d1 CAMEL-12575:NPE on GET request with Content-Type header add 80c5c3b CAMEL-12703: camel-salesforce - Added JSON as a valid contentType add 35577b8 Upgrade Brave to version 5.1.5 add 83e8d12 CAMEL-12656: Fixed root span id for multiple routes. (#2448) add 6ce65d6 Upgrade PdfBox 1.8.x to version 1.8.15 add 01c43a2 Regen add 5412cfd Upgrade Spring-Cloud-Commons to version 2.0.1.RELEASE add 2a918c0 Upgrade Spring-Cloud-Consul to version 2.0.1.RELEASE add c6a6edc Upgrade Spring-Cloud-Netflix to version 2.0.1.RELEASE add f109764 Lets clean the workspace on each Karaf itests when using run-tests script add bebdd67 CAMEL-12702: Improved spring boot docs add 9c66be0 CAMEL-12702: Improved spring boot docs add c4e4d9e CAMEL-12702: Improved spring boot docs add c3ba586 Lets use a single version of Libthrift everywhere (0.11.0) add ed7a3e6 CAMEL-12702: Improved spring boot docs add ecbc815 CAMEL-12702: Improved spring boot docs add d614666 CAMEL-12702: Enable validation during built that all the spring boot auto configuration option has documentation for camel-spring-boot module add 0f04241 Disable check until we get camel-as2-starter added its missing docs add 3ce3cce Upgrade Chronicle Bytes to version 1.16.21 add c5e647f Upgrade Chronicle Wire to version 1.16.14 add 9d6f8b9 Fix asciidoc format add 5c920c8 CAMEL-12705: Added unit test to reproduce the issue, ignored until fixed. add 162b751 Upgrade Jgit to version 5.0.2.201807311906-r add 355b848 Upgrade Fabric8 Maven Plugin to version 3.5.41 add abb1611 CAMEL-11497: Update user guide toc in summary and migrate some pages add b0f4cb5 CAMEL-12705: Fixed camel-catalog syntax parser issue with hostname and dots such as when parsing the netty4-http endpoints. add ce9b887 CAMEL-12705: Remove unused imports add c9dc100 Upgrade Xchange to version 4.3.9 add e02997f Upgrade Univocity Parsers to version 2.7.3 add 1994519 CAMEL-12707: Make docker integration test profiles respect skipTests property add 671d1a4 testcontainers(-spring).adoc: minimal improvement add 954d875 CS fixes add 1fb62e9 Regen add 050950b Upgrade Chronicle Core to version 1.16.15 add 59424fa Upgrade Chronicle Wire to version 1.16.15 add ad7f206 Upgrade Weld 3 to version 3.0.5.Final add 15a5714 Lets use the same general jackson version for camel-vertx Karaf feature too add 0fae25a Upgrade Netty to version 4.1.28.Final add 2e69ead CAMEL-11497: Migrate error handling related guides and EIPs add bbd58e6 Upgrade Smack to version 4.3.0 add 6911756 Upgrade Zipkin to version 2.11.0 add 2e2fd2b CAMEL-12710: Kept a single version of hamcrest classes on the classpath add 33bae98 CAMEL-12699: Allow hystrix EIP to inherit error handler so you can combine Camels error handler for redeliveries with the circuit breaker. new e24218d Temporary disable JDK 9 and karaf-itest builds new 3f2666c CAMEL-12618: Use fork of MVEL that supports Jav... new b23dba9 CAMEL-12618: Use fork of maven-plugin-plugin th... new 217aac5 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 (d7f9d9f) \ N -- N -- N refs/heads/java-10-test (217aac5) 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 4 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: Jenkinsfile.daily | 16 +- bom/camel-bom/pom.xml | 5 + camel-core/pom.xml | 20 +- .../main/docs/eips/content-based-router-eip.adoc | 79 ++ .../src/main/docs/eips/dead-letter-channel.adoc | 18 +- camel-core/src/main/docs/eips/hystrix-eip.adoc | 33 + .../src/main/docs/eips/transactional-client.adoc | 265 +++++++ camel-core/src/main/docs/validator.adoc | 10 +- .../main/java/org/apache/camel/CamelContext.java | 7 +- .../apache/camel/builder/ExpressionBuilder.java | 11 +- .../apache/camel/component/bean/BeanComponent.java | 7 +- .../camel/component/dataset/FileDataSet.java | 8 +- .../camel/component/file/GenericFileProducer.java | 4 +- .../apache/camel/converter/jaxp/XmlConverter.java | 46 +- .../java/org/apache/camel/impl/ConsumerCache.java | 2 +- .../org/apache/camel/impl/DefaultCamelContext.java | 237 ++++-- .../apache/camel/impl/DefaultEndpointRegistry.java | 105 ++- .../impl/DefaultEndpointUtilizationStatistics.java | 7 +- .../apache/camel/impl/DefaultFactoryFinder.java | 29 +- .../camel/impl/DefaultTransformerRegistry.java | 105 +-- .../camel/impl/DefaultValidatorRegistry.java | 106 ++- .../java/org/apache/camel/impl/EndpointKey.java | 11 +- .../org/apache/camel/impl/FileStateRepository.java | 15 +- .../java/org/apache/camel/impl/ProducerCache.java | 2 +- .../impl/converter/BaseTypeConverterRegistry.java | 3 +- .../language/simple/SimpleExpressionParser.java | 6 +- .../camel/language/simple/SimpleLanguage.java | 16 +- .../language/simple/SimplePredicateParser.java | 5 +- .../simple/ast/SimpleFunctionExpression.java | 6 +- .../language/simple/ast/SimpleFunctionStart.java | 6 +- .../camel/management/MBeanInfoAssembler.java | 5 +- .../java/org/apache/camel/model/AOPDefinition.java | 5 + .../apache/camel/model/AggregateDefinition.java | 5 + .../org/apache/camel/model/BeanDefinition.java | 5 + .../org/apache/camel/model/CatchDefinition.java | 5 + .../org/apache/camel/model/ChoiceDefinition.java | 5 + .../apache/camel/model/ClaimCheckDefinition.java | 5 + .../apache/camel/model/ConvertBodyDefinition.java | 5 + .../org/apache/camel/model/DelayDefinition.java | 5 + .../camel/model/DynamicRouterDefinition.java | 5 + .../org/apache/camel/model/EnrichDefinition.java | 5 + .../org/apache/camel/model/FilterDefinition.java | 5 + .../org/apache/camel/model/FinallyDefinition.java | 5 + .../org/apache/camel/model/FromDefinition.java | 6 + .../org/apache/camel/model/HystrixDefinition.java | 5 + .../camel/model/IdempotentConsumerDefinition.java | 5 + .../org/apache/camel/model/InOnlyDefinition.java | 5 + .../org/apache/camel/model/InOutDefinition.java | 5 + .../apache/camel/model/InputTypeDefinition.java | 5 + .../apache/camel/model/InterceptDefinition.java | 5 + .../camel/model/InterceptFromDefinition.java | 5 + .../model/InterceptSendToEndpointDefinition.java | 5 + .../apache/camel/model/LoadBalanceDefinition.java | 5 + .../java/org/apache/camel/model/LogDefinition.java | 5 + .../org/apache/camel/model/LoopDefinition.java | 5 + .../org/apache/camel/model/MarshalDefinition.java | 5 + .../apache/camel/model/MulticastDefinition.java | 5 + .../apache/camel/model/NoOutputExpressionNode.java | 2 +- .../apache/camel/model/OnCompletionDefinition.java | 5 + .../apache/camel/model/OnExceptionDefinition.java | 5 + .../apache/camel/model/OnFallbackDefinition.java | 5 + .../camel/model/OptionalIdentifiedDefinition.java | 22 - .../apache/camel/model/OtherwiseDefinition.java | 5 + .../org/apache/camel/model/OutputDefinition.java | 5 + .../apache/camel/model/OutputTypeDefinition.java | 5 + .../org/apache/camel/model/PipelineDefinition.java | 5 + .../apache/camel/model/PollEnrichDefinition.java | 5 + .../org/apache/camel/model/ProcessDefinition.java | 5 + .../apache/camel/model/ProcessorDefinition.java | 10 +- .../camel/model/RecipientListDefinition.java | 5 + .../apache/camel/model/RemoveHeaderDefinition.java | 5 + .../camel/model/RemoveHeadersDefinition.java | 5 + .../camel/model/RemovePropertiesDefinition.java | 5 + .../camel/model/RemovePropertyDefinition.java | 5 + .../apache/camel/model/ResequenceDefinition.java | 5 + .../org/apache/camel/model/RollbackDefinition.java | 5 + .../org/apache/camel/model/RouteDefinition.java | 5 + .../org/apache/camel/model/RoutesDefinition.java | 5 + .../apache/camel/model/RoutingSlipDefinition.java | 5 + .../org/apache/camel/model/ScriptDefinition.java | 5 + .../org/apache/camel/model/SetBodyDefinition.java | 5 + .../camel/model/SetExchangePatternDefinition.java | 5 + .../apache/camel/model/SetFaultBodyDefinition.java | 5 + .../apache/camel/model/SetHeaderDefinition.java | 5 + .../apache/camel/model/SetOutHeaderDefinition.java | 5 + .../apache/camel/model/SetPropertyDefinition.java | 5 + .../org/apache/camel/model/SortDefinition.java | 5 + .../org/apache/camel/model/SplitDefinition.java | 5 + .../org/apache/camel/model/StopDefinition.java | 5 + .../camel/model/ThreadPoolProfileDefinition.java | 5 + .../org/apache/camel/model/ThreadsDefinition.java | 5 + .../org/apache/camel/model/ThrottleDefinition.java | 5 + .../camel/model/ThrowExceptionDefinition.java | 5 + .../java/org/apache/camel/model/ToDefinition.java | 5 + .../apache/camel/model/ToDynamicDefinition.java | 5 + .../apache/camel/model/TransactedDefinition.java | 5 + .../apache/camel/model/TransformDefinition.java | 5 + .../java/org/apache/camel/model/TryDefinition.java | 5 + .../apache/camel/model/UnmarshalDefinition.java | 5 + .../org/apache/camel/model/ValidateDefinition.java | 5 + .../org/apache/camel/model/WhenDefinition.java | 5 + .../model/WhenSkipSendToEndpointDefinition.java | 4 + .../org/apache/camel/model/WireTapDefinition.java | 5 + .../camel/model/cloud/ServiceCallDefinition.java | 5 + .../model/dataformat/JacksonXMLDataFormat.java | 2 +- .../camel/model/dataformat/JsonDataFormat.java | 2 +- .../camel/model/rest/RestBindingDefinition.java | 5 + .../apache/camel/model/rest/RestDefinition.java | 5 + .../apache/camel/model/rest/RestsDefinition.java | 5 + .../apache/camel/model/rest/VerbDefinition.java | 5 + .../java/org/apache/camel/processor/Splitter.java | 15 +- .../idempotent/FileIdempotentRepository.java | 42 +- .../camel/runtimecatalog/AbstractCamelCatalog.java | 4 +- .../camel/support/TokenPairExpressionIterator.java | 4 +- .../support/TokenXMLPairExpressionIterator.java | 4 +- .../org/apache/camel/util/CompoundIterator.java | 64 ++ .../java/org/apache/camel/util/GroupIterator.java | 13 +- .../org/apache/camel/util/GroupTokenIterator.java | 14 +- .../main/java/org/apache/camel/util/IOHelper.java | 23 + .../apache/camel/util/IntrospectionSupport.java | 30 +- .../org/apache/camel/util/LRUCacheFactory.java | 92 ++- .../java/org/apache/camel/util/ObjectHelper.java | 59 +- .../main/java/org/apache/camel/util/Scanner.java | 303 +++++++ .../java/org/apache/camel/util/SkipIterator.java | 13 +- .../camel/processor/ThrottlingGroupingTest.java | 134 ++++ .../apache/camel/util/GroupTokenIteratorTest.java | 10 +- .../src/main/docs/ahc-ws-component.adoc | 31 +- .../camel-ahc/src/main/docs/ahc-component.adoc | 31 +- .../camel-amqp/src/main/docs/amqp-component.adoc | 407 ++-------- .../camel-apns/src/main/docs/apns-component.adoc | 8 +- .../src/main/docs/as2-component.adoc | 53 +- .../camel-asn1/src/main/docs/asn1-dataformat.adoc | 12 +- .../src/main/docs/asterisk-component.adoc | 4 +- .../camel-atmos/src/main/docs/atmos-component.adoc | 4 +- .../main/docs/atmosphere-websocket-component.adoc | 31 +- .../camel-atom/src/main/docs/atom-component.adoc | 4 +- components/camel-atomix/pom.xml | 6 + .../src/main/docs/atomix-map-component.adoc | 13 +- .../src/main/docs/atomix-messaging-component.adoc | 10 +- .../src/main/docs/atomix-multimap-component.adoc | 13 +- .../src/main/docs/atomix-queue-component.adoc | 10 +- .../src/main/docs/atomix-set-component.adoc | 10 +- .../src/main/docs/atomix-value-component.adoc | 10 +- .../camel-avro/src/main/docs/avro-component.adoc | 16 +- .../camel-avro/src/main/docs/avro-dataformat.adoc | 16 +- .../camel-aws/src/main/docs/aws-cw-component.adoc | 4 +- .../camel-aws/src/main/docs/aws-ddb-component.adoc | 13 +- .../src/main/docs/aws-ddbstream-component.adoc | 13 +- .../camel-aws/src/main/docs/aws-ec2-component.adoc | 9 +- .../camel-aws/src/main/docs/aws-iam-component.adoc | 7 +- .../src/main/docs/aws-kinesis-component.adoc | 14 +- .../main/docs/aws-kinesis-firehose-component.adoc | 7 +- .../camel-aws/src/main/docs/aws-kms-component.adoc | 7 +- .../src/main/docs/aws-lambda-component.adoc | 10 +- .../camel-aws/src/main/docs/aws-mq-component.adoc | 10 +- .../camel-aws/src/main/docs/aws-s3-component.adoc | 59 +- .../camel-aws/src/main/docs/aws-sdb-component.adoc | 4 +- .../camel-aws/src/main/docs/aws-ses-component.adoc | 16 +- .../camel-aws/src/main/docs/aws-sns-component.adoc | 7 +- .../camel-aws/src/main/docs/aws-sqs-component.adoc | 63 +- .../camel-aws/src/main/docs/aws-swf-component.adoc | 17 +- .../src/main/docs/azure-blob-component.adoc | 4 +- .../src/main/docs/azure-queue-component.adoc | 4 +- .../src/main/docs/barcode-dataformat.adoc | 5 +- .../src/main/docs/base64-dataformat.adoc | 12 +- .../src/main/docs/bean-validator-component.adoc | 4 +- .../src/main/docs/beanio-dataformat.adoc | 20 +- .../src/main/docs/beanstalk-component.adoc | 10 +- .../src/main/docs/bindy-dataformat.adoc | 33 +- .../src/main/docs/bonita-component.adoc | 4 +- .../camel-boon/src/main/docs/boon-dataformat.adoc | 5 +- .../src/main/docs/box-component.adoc | 11 +- .../src/main/docs/braintree-component.adoc | 8 +- .../camel-cache/src/main/docs/cache-component.adoc | 32 +- .../src/main/docs/caffeine-cache-component.adoc | 22 +- .../main/docs/caffeine-loadcache-component.adoc | 22 +- .../src/main/docs/cql-component.adoc | 4 +- .../src/main/docs/castor-dataformat.adoc | 19 +- components/camel-cdi/pom.xml | 6 + components/camel-cdi/src/main/docs/cdi.adoc | 1 + .../src/main/docs/chronicle-engine-component.adoc | 4 +- .../camel-chunk/src/main/docs/chunk-component.adoc | 4 +- .../src/main/docs/cm-sms-component.adoc | 4 +- .../camel-cmis/src/main/docs/cmis-component.adoc | 8 +- .../camel-coap/src/main/docs/coap-component.adoc | 4 +- .../src/main/docs/cometd-component.adoc | 13 +- components/camel-consul/pom.xml | 4 +- .../src/main/docs/consul-component.adoc | 21 +- .../src/main/docs/context-component.adoc | 4 +- .../src/main/docs/couchbase-component.adoc | 4 +- .../src/main/docs/couchdb-component.adoc | 4 +- .../src/main/docs/crypto-cms-component.adoc | 17 +- .../src/main/docs/crypto-component.adoc | 84 +- .../src/main/docs/crypto-dataformat.adoc | 84 +- .../camel-csv/src/main/docs/csv-dataformat.adoc | 22 +- .../camel-cxf/src/main/docs/cxf-component.adoc | 13 +- .../camel-cxf/src/main/docs/cxfrs-component.adoc | 8 +- .../component/cxf/jaxrs/DefaultCxfRsBinding.java | 9 +- .../src/main/resources/META-INF/spring.schemas | 1 + .../src/main/docs/digitalocean-component.adoc | 4 +- .../src/main/docs/disruptor-component.adoc | 26 +- .../camel-dns/src/main/docs/dns-component.adoc | 4 +- .../src/main/docs/docker-component.adoc | 7 +- .../camel-dozer/src/main/docs/dozer-component.adoc | 4 +- .../camel/component/dozer/BaseConverter.java | 2 +- .../camel/component/dozer/DozerConfiguration.java | 2 +- .../camel/component/dozer/DozerEndpoint.java | 6 +- .../dozer/DozerBeanMapperConfiguration.java | 14 +- .../dozer/DozerThreadContextClassLoader.java | 6 +- .../camel/converter/dozer/DozerTypeConverter.java | 6 +- .../converter/dozer/DozerTypeConverterLoader.java | 14 +- .../camel/converter/dozer/MapperFactory.java | 24 +- .../converter/dozer/DozerTestArtifactsFactory.java | 3 +- .../converter/dozer/DozerTypeConverterDTOTest.java | 4 +- .../converter/dozer/DozerTypeConverterTest.java | 4 +- .../test/resources/application-context-map-id.xml | 2 +- .../src/test/resources/application-context.xml | 2 +- .../camel-drill/src/main/docs/drill-component.adoc | 4 +- .../src/main/docs/dropbox-component.adoc | 4 +- components/camel-ehcache/pom.xml | 6 + .../src/main/docs/ehcache-component.adoc | 27 +- .../main/docs/elasticsearch-rest-component.adoc | 22 +- .../src/main/docs/elasticsearch-component.adoc | 8 +- .../src/main/docs/elasticsearch5-component.adoc | 9 +- .../camel-elsql/src/main/docs/elsql-component.adoc | 17 +- .../camel-etcd/src/main/docs/etcd-component.adoc | 7 +- .../camel-exec/src/main/docs/exec-component.adoc | 4 +- .../src/main/docs/facebook-component.adoc | 8 +- .../src/main/docs/json-fastjson-dataformat.adoc | 74 +- .../src/main/docs/fhir-component.adoc | 34 +- .../src/main/docs/fhirJson-dataformat.adoc | 89 +-- .../src/main/docs/fhirXml-dataformat.adoc | 89 +-- .../apache/camel/component/fhir/FhirEndpoint.java | 4 +- .../src/main/docs/flatpack-component.adoc | 24 +- .../src/main/docs/flatpack-dataformat.adoc | 24 +- .../camel-flink/src/main/docs/flink-component.adoc | 16 +- .../camel-fop/src/main/docs/fop-component.adoc | 4 +- .../src/main/docs/freemarker-component.adoc | 7 +- components/camel-ftp/pom.xml | 8 +- .../camel-ftp/src/main/docs/ftp-component.adoc | 4 +- .../camel-ftp/src/main/docs/ftps-component.adoc | 4 +- .../src/main/docs/ganglia-component.adoc | 18 +- .../src/main/docs/geocoder-component.adoc | 4 +- .../camel-git/src/main/docs/git-component.adoc | 4 +- .../src/main/docs/github-component.adoc | 4 +- .../src/main/docs/google-bigquery-component.adoc | 7 +- .../src/main/docs/google-calendar-component.adoc | 31 +- .../src/main/docs/google-drive-component.adoc | 22 +- .../src/main/docs/google-mail-component.adoc | 15 +- .../main/docs/google-mail-stream-component.adoc | 21 +- .../src/main/docs/google-pubsub-component.adoc | 4 +- .../camel-gora/src/main/docs/gora-component.adoc | 4 +- .../src/main/docs/groovy-language.adoc | 3 +- .../camel-grpc/src/main/docs/grpc-component.adoc | 4 +- .../src/main/docs/json-gson-dataformat.adoc | 71 +- .../src/main/docs/guava-eventbus-component.adoc | 13 +- components/camel-hawtdb/src/main/docs/hawtdb.adoc | 2 +- .../main/docs/hazelcast-atomicvalue-component.adoc | 12 +- .../main/docs/hazelcast-instance-component.adoc | 12 +- .../src/main/docs/hazelcast-list-component.adoc | 12 +- .../src/main/docs/hazelcast-map-component.adoc | 12 +- .../main/docs/hazelcast-multimap-component.adoc | 12 +- .../src/main/docs/hazelcast-queue-component.adoc | 12 +- .../docs/hazelcast-replicatedmap-component.adoc | 12 +- .../main/docs/hazelcast-ringbuffer-component.adoc | 12 +- .../src/main/docs/hazelcast-seda-component.adoc | 12 +- .../src/main/docs/hazelcast-set-component.adoc | 12 +- .../src/main/docs/hazelcast-topic-component.adoc | 12 +- .../camel-hbase/src/main/docs/hbase-component.adoc | 10 +- .../camel-hdfs/src/main/docs/hdfs-component.adoc | 7 +- .../camel-hdfs2/src/main/docs/hdfs2-component.adoc | 7 +- .../src/main/docs/hessian-dataformat.adoc | 5 +- components/camel-hipchat/pom.xml | 6 + .../src/main/docs/hipchat-component.adoc | 4 +- .../camel-hl7/src/main/docs/hl7-dataformat.adoc | 8 +- .../camel-http/src/main/docs/http-component.adoc | 28 +- .../camel-http4/src/main/docs/http4-component.adoc | 70 +- .../camel-hystrix/src/main/docs/hystrix.adoc | 4 +- .../processor/HystrixInheritErrorHandlerTest.java} | 44 +- .../camel-ical/src/main/docs/ical-dataformat.adoc | 5 +- .../src/main/docs/iec60870-client-component.adoc | 7 +- .../src/main/docs/iec60870-server-component.adoc | 23 +- .../src/main/docs/ignite-cache-component.adoc | 10 +- .../src/main/docs/ignite-compute-component.adoc | 10 +- .../src/main/docs/ignite-events-component.adoc | 10 +- .../src/main/docs/ignite-idgen-component.adoc | 10 +- .../src/main/docs/ignite-messaging-component.adoc | 10 +- .../src/main/docs/ignite-queue-component.adoc | 10 +- .../src/main/docs/ignite-set-component.adoc | 10 +- .../src/main/docs/infinispan-component.adoc | 34 +- .../src/main/docs/influxdb-component.adoc | 4 +- .../camel-irc/src/main/docs/irc-component.adoc | 4 +- .../src/main/docs/ironmq-component.adoc | 4 +- .../src/main/docs/json-jackson-dataformat.adoc | 71 +- .../src/main/docs/jacksonxml-dataformat.adoc | 54 +- .../src/main/docs/javaspace-component.adoc | 4 +- .../camel-jaxb/src/main/docs/jaxb-dataformat.adoc | 49 +- .../camel-jbpm/src/main/docs/jbpm-component.adoc | 4 +- components/camel-jcache/pom.xml | 6 + .../src/main/docs/jcache-component.adoc | 10 +- .../camel-jcr/src/main/docs/jcr-component.adoc | 4 +- .../camel-jdbc/src/main/docs/jdbc-component.adoc | 7 +- .../src/main/docs/jetty-component.adoc | 102 +-- .../src/main/docs/jgroups-component.adoc | 8 +- .../camel-jibx/src/main/docs/jibx-dataformat.adoc | 5 +- .../camel-jing/src/main/docs/jing-component.adoc | 4 +- .../camel-jira/src/main/docs/jira-component.adoc | 4 +- .../camel-jms/src/main/docs/jms-component.adoc | 869 ++++----------------- .../camel-jmx/src/main/docs/jmx-component.adoc | 4 +- .../src/main/docs/json-johnzon-dataformat.adoc | 71 +- .../camel-jolt/src/main/docs/jolt-component.adoc | 8 +- .../camel-josql/src/main/docs/sql-language.adoc | 3 +- .../camel-jpa/src/main/docs/jpa-component.adoc | 21 +- components/camel-jsch/pom.xml | 8 +- .../camel-jsch/src/main/docs/scp-component.adoc | 8 +- .../src/main/docs/json-validator-component.adoc | 7 +- .../src/main/docs/jsonpath-language.adoc | 6 +- .../camel-jt400/src/main/docs/jt400-component.adoc | 7 +- .../camel-juel/src/main/docs/el-language.adoc | 3 +- .../src/main/docs/jxpath-language.adoc | 7 +- .../camel-kafka/src/main/docs/kafka-component.adoc | 429 ++-------- .../src/main/docs/kestrel-component.adoc | 4 +- .../camel-krati/src/main/docs/krati-component.adoc | 4 +- .../src/main/docs/kubernetes-component.adoc | 10 +- .../docs/kubernetes-config-maps-component.adoc | 7 +- .../docs/kubernetes-deployments-component.adoc | 7 +- .../src/main/docs/kubernetes-hpa-component.adoc | 7 +- .../src/main/docs/kubernetes-job-component.adoc | 7 +- .../main/docs/kubernetes-namespaces-component.adoc | 7 +- .../src/main/docs/kubernetes-nodes-component.adoc | 7 +- ...rnetes-persistent-volumes-claims-component.adoc | 8 +- .../kubernetes-persistent-volumes-component.adoc | 7 +- .../src/main/docs/kubernetes-pods-component.adoc | 7 +- ...bernetes-replication-controllers-component.adoc | 7 +- .../docs/kubernetes-resources-quota-component.adoc | 7 +- .../main/docs/kubernetes-secrets-component.adoc | 7 +- .../kubernetes-service-accounts-component.adoc | 7 +- .../main/docs/kubernetes-services-component.adoc | 7 +- .../camel-ldap/src/main/docs/ldap-component.adoc | 4 +- .../camel-ldif/src/main/docs/ldif-component.adoc | 7 +- .../src/main/docs/linkedin-component.adoc | 24 +- .../src/main/docs/lucene-component.adoc | 16 +- .../src/main/docs/lumberjack-component.adoc | 8 +- .../camel-lzf/src/main/docs/lzf-dataformat.adoc | 5 +- .../camel-mail/src/main/docs/mail-component.adoc | 136 +--- .../src/main/docs/master-component.adoc | 14 +- components/camel-metrics/pom.xml | 6 + .../src/main/docs/metrics-component.adoc | 7 +- components/camel-micrometer/pom.xml | 6 + .../src/main/docs/micrometer-component.adoc | 10 +- .../src/main/docs/milo-client-component.adoc | 13 +- .../src/main/docs/milo-server-component.adoc | 25 +- .../camel-mina2/src/main/docs/mina2-component.adoc | 71 +- .../camel-mllp/src/main/docs/mllp-component.adoc | 85 +- .../src/main/docs/mongodb-gridfs-component.adoc | 4 +- .../src/main/docs/mongodb-component.adoc | 4 +- .../src/main/docs/mongodb3-component.adoc | 4 +- .../camel-mqtt/src/main/docs/mqtt-component.adoc | 7 +- .../camel-msv/src/main/docs/msv-component.adoc | 12 +- .../src/main/docs/mustache-component.adoc | 7 +- .../camel-mvel/src/main/docs/mvel-component.adoc | 7 +- .../camel-mvel/src/main/docs/mvel-language.adoc | 7 +- .../src/main/docs/mybatis-bean-component.adoc | 13 +- .../src/main/docs/mybatis-component.adoc | 10 +- .../src/main/docs/nagios-component.adoc | 4 +- components/camel-nats/pom.xml | 4 +- .../camel-nats/src/main/docs/nats-component.adoc | 4 +- .../apache/camel/component/nats/NatsConsumer.java | 11 +- .../apache/camel/component/nats/NatsProducer.java | 11 +- .../camel/component/nats/NatsConsumerLoadTest.java | 1 - .../nats/NatsConsumerWithConnectionLoadTest.java | 2 +- .../src/main/docs/netty-http-component.adoc | 115 +-- .../camel-netty/src/main/docs/netty-component.adoc | 185 ++--- .../src/main/docs/netty4-http-component.adoc | 119 +-- .../src/main/docs/netty4-component.adoc | 227 ++---- .../camel-ognl/src/main/docs/ognl-language.adoc | 3 +- .../src/main/docs/olingo2-component.adoc | 26 +- .../src/main/docs/olingo4-component.adoc | 26 +- .../src/main/docs/openshift-component.adoc | 8 +- .../src/main/docs/openstack-cinder-component.adoc | 4 +- .../src/main/docs/openstack-glance-component.adoc | 4 +- .../main/docs/openstack-keystone-component.adoc | 4 +- .../src/main/docs/openstack-neutron-component.adoc | 4 +- .../src/main/docs/openstack-nova-component.adoc | 4 +- .../src/main/docs/openstack-swift-component.adoc | 4 +- .../src/main/docs/optaplanner-component.adoc | 4 +- .../camel-paho/src/main/docs/paho-component.adoc | 7 +- components/camel-pdf/pom.xml | 6 + .../camel-pdf/src/main/docs/pdf-component.adoc | 4 +- .../src/main/docs/pgevent-component.adoc | 4 +- .../camel-printer/src/main/docs/lpr-component.adoc | 4 +- .../src/main/docs/protobuf-dataformat.adoc | 10 +- .../src/main/docs/pubnub-component.adoc | 4 +- .../src/main/docs/quartz2-component.adoc | 32 +- .../src/main/docs/quickfix-component.adoc | 18 +- .../src/main/docs/rabbitmq-component.adoc | 110 +-- .../src/main/docs/reactive-streams-component.adoc | 21 +- .../src/main/docs/rest-swagger-component.adoc | 41 +- .../src/main/docs/restlet-component.adoc | 49 +- .../camel-rmi/src/main/docs/rmi-component.adoc | 4 +- .../src/main/docs/routebox-component.adoc | 4 +- .../camel-rss/src/main/docs/rss-component.adoc | 9 +- .../camel-rss/src/main/docs/rss-dataformat.adoc | 9 +- .../docs/{rxjava2-component.adoc => rxjava2.adoc} | 6 +- .../src/main/docs/salesforce-component.adoc | 176 ++--- .../salesforce/api/dto/bulk/ContentType.java | 6 +- .../src/main/docs/sap-netweaver-component.adoc | 4 +- .../src/main/docs/xquery-component.adoc | 19 +- .../camel-saxon/src/main/docs/xquery-language.adoc | 19 +- .../src/main/docs/schematron-component.adoc | 4 +- .../src/main/docs/javaScript-language.adoc | 12 +- .../src/main/docs/service-component.adoc | 13 +- .../src/main/docs/servicenow-component.adoc | 70 +- .../servicenow/ServiceNowMetaDataExtension.java | 51 +- .../src/main/docs/servlet-component.adoc | 31 +- .../camel-sip/src/main/docs/sip-component.adoc | 4 +- .../src/main/docs/sjms-batch-component.adoc | 26 +- .../camel-sjms/src/main/docs/sjms-component.adoc | 60 +- .../camel-sjms2/src/main/docs/sjms2-component.adoc | 63 +- .../camel-slack/src/main/docs/slack-component.adoc | 4 +- .../camel-smpp/src/main/docs/smpp-component.adoc | 143 +--- .../src/main/docs/yaml-snakeyaml-dataformat.adoc | 8 +- .../camel-snmp/src/main/docs/snmp-component.adoc | 4 +- .../src/main/docs/soapjaxb-dataformat.adoc | 33 +- .../camel-solr/src/main/docs/solr-component.adoc | 4 +- .../camel-spark/src/main/docs/spark-component.adoc | 10 +- .../src/main/docs/splunk-component.adoc | 7 +- .../src/main/docs/spring-batch-component.adoc | 10 +- components/camel-spring-boot/pom.xml | 2 +- .../src/main/docs/spring-boot.adoc | 315 +++----- .../spring/boot/CamelConfigurationProperties.java | 95 +-- .../cloud/CamelCloudConfigurationProperties.java | 49 +- .../ClusteredRouteControllerConfiguration.java | 7 +- .../health/AbstractHealthCheckConfiguration.java | 10 +- .../health/HealthCheckRoutesConfiguration.java | 13 +- .../HealthCheckServiceAutoConfiguration.java | 1 - .../health/HealthCheckServiceConfiguration.java | 6 +- .../security/CamelSSLConfigurationProperties.java | 204 ++++- .../security/CamelSSLAutoConfigurationTest.java | 1 - components/camel-spring-cloud-consul/pom.xml | 4 +- .../main/docs/spring-integration-component.adoc | 4 +- .../src/main/resources/META-INF/spring.schemas | 1 + .../src/main/docs/spring-ldap-component.adoc | 4 +- .../src/main/docs/spring-redis-component.adoc | 4 +- .../src/main/resources/META-INF/spring.schemas | 1 + .../src/main/docs/spring-ws-component.adoc | 4 +- .../src/main/docs/spring-event-component.adoc | 7 +- components/camel-spring/src/main/docs/spring.adoc | 1 + .../src/main/resources/META-INF/spring.schemas | 1 + .../processor/SpringThrottlerGroupingTest.java | 2 - .../spring/processor/ThrottlerGroupingTest.xml | 39 + .../camel-sql/src/main/docs/sql-component.adoc | 10 +- .../src/main/docs/sql-stored-component.adoc | 7 +- .../stored/CallableStatementWrapperFactory.java | 6 +- .../camel-ssh/src/main/docs/ssh-component.adoc | 73 +- .../camel/component/ssh/EchoCommandFactory.java | 4 +- .../component/ssh/TestEchoCommandFactory.java | 2 +- .../camel-stax/src/main/docs/stax-component.adoc | 4 +- .../camel-stomp/src/main/docs/stomp-component.adoc | 8 +- .../src/main/docs/stream-component.adoc | 4 +- .../src/main/docs/string-template-component.adoc | 4 +- .../src/main/docs/syslog-dataformat.adoc | 5 +- .../src/main/docs/tidyMarkup-dataformat.adoc | 8 +- .../src/main/docs/tarfile-dataformat.adoc | 15 +- .../src/main/docs/telegram-component.adoc | 7 +- components/camel-testcontainers-spring/pom.xml | 2 +- .../src/main/docs/testcontainers-spring.adoc | 9 + .../src/main/docs/testcontainers.adoc | 2 +- .../src/main/docs/thrift-component.adoc | 20 +- .../src/main/docs/thrift-dataformat.adoc | 20 +- components/camel-tika/pom.xml | 6 + .../camel-tika/src/main/docs/tika-component.adoc | 4 +- .../src/main/docs/twilio-component.adoc | 7 +- .../src/main/docs/twitter-component.adoc | 4 +- .../main/docs/twitter-directmessage-component.adoc | 7 +- .../src/main/docs/twitter-search-component.adoc | 7 +- .../src/main/docs/twitter-streaming-component.adoc | 7 +- .../src/main/docs/twitter-timeline-component.adoc | 7 +- .../src/main/docs/undertow-component.adoc | 11 +- .../src/main/docs/univocity-csv-dataformat.adoc | 32 +- .../src/main/docs/univocity-fixed-dataformat.adoc | 35 +- .../src/main/docs/univocity-tsv-dataformat.adoc | 32 +- .../src/main/docs/velocity-component.adoc | 7 +- .../camel-vertx/src/main/docs/vertx-component.adoc | 16 +- .../src/main/docs/weather-component.adoc | 7 +- .../camel-web3j/src/main/docs/web3j-component.adoc | 25 +- .../src/main/docs/websocket-component.adoc | 35 +- .../src/main/docs/wordpress-component.adoc | 7 +- .../src/main/docs/xchange-component.adoc | 7 +- .../src/main/docs/xmlBeans-dataformat.adoc | 5 +- .../src/main/docs/xmljson-dataformat.adoc | 54 +- .../src/main/docs/xmlrpc-component.adoc | 9 +- .../src/main/docs/xmlrpc-dataformat.adoc | 9 +- .../src/main/docs/xmlsecurity-component.adoc | 310 ++------ .../camel-xmpp/src/main/docs/xmpp-component.adoc | 4 +- .../apache/camel/component/xmpp/XmppEndpoint.java | 8 +- .../apache/camel/component/xmpp/XmppLogger.java | 2 +- .../src/main/docs/json-xstream-dataformat.adoc | 2 +- .../src/main/docs/xstream-dataformat.adoc | 113 +-- .../src/main/docs/yammer-component.adoc | 30 +- components/camel-yql/pom.xml | 6 + .../camel-yql/src/main/docs/yql-component.adoc | 10 +- .../src/main/docs/zendesk-component.adoc | 7 +- .../src/main/docs/zipfile-dataformat.adoc | 15 +- components/camel-zipkin/src/main/docs/zipkin.adoc | 22 +- .../java/org/apache/camel/zipkin/ZipkinTracer.java | 29 +- .../src/main/docs/zookeeper-master-component.adoc | 15 +- .../src/main/docs/zookeeper-component.adoc | 7 +- components/readme.adoc | 11 +- docs/user-manual/en/SUMMARY.md | 33 +- docs/user-manual/en/async.adoc | 11 +- docs/user-manual/en/camel-boot.adoc | 37 + docs/user-manual/en/camel-jar-dependencies.adoc | 55 ++ docs/user-manual/en/defaulterrorhandler.adoc | 66 ++ docs/user-manual/en/dozer-type-conversion.adoc | 68 +- docs/user-manual/en/error-handling-in-camel.adoc | 235 ++++++ docs/user-manual/en/exception-clause.adoc | 766 ++++++++++++++++++ docs/user-manual/en/predicate.adoc | 222 ++++++ docs/user-manual/en/transactionerrorhandler.adoc | 178 +++++ docs/user-manual/en/try-catch-finally.adoc | 132 ++++ examples/camel-example-cdi-metrics/pom.xml | 6 + examples/camel-example-cdi-properties/pom.xml | 6 + examples/camel-example-cdi-rest-servlet/pom.xml | 6 + examples/camel-example-cdi-test/pom.xml | 6 + examples/camel-example-cdi-xml/pom.xml | 12 + .../main/java/sample/camel/MyCamelApplication.java | 1 + .../src/main/java/sample/camel/MyCamelRouter.java | 12 +- .../resources/fabric8/hazelcast-deployment.yaml | 2 +- parent/pom.xml | 82 +- .../apache/camel/catalog/AbstractCamelCatalog.java | 4 +- .../org/apache/camel/catalog/CamelCatalogTest.java | 11 + .../karaf/features/src/main/resources/features.xml | 16 +- .../FastjsonDataFormatConfiguration.java | 2 +- .../springboot/FhirComponentConfiguration.java | 2 +- .../springboot/GsonDataFormatConfiguration.java | 2 +- .../springboot/JacksonDataFormatConfiguration.java | 2 +- .../JacksonXMLDataFormatConfiguration.java | 2 +- .../springboot/JohnzonDataFormatConfiguration.java | 2 +- .../springboot/JsonDataFormatConfiguration.java | 2 +- platforms/spring-boot/components-starter/pom.xml | 2 +- .../camel-spring-boot-dependencies/pom.xml | 18 +- platforms/spring-boot/spring-boot-dm/pom.xml | 4 +- pom.xml | 2 +- tests/camel-itest-karaf/run-tests.sh | 2 +- tests/camel-itest-spring-boot/pom.xml | 12 + .../apache/camel/itest/springboot/ITestConfig.java | 50 +- .../itest/springboot/util/ArquillianPackager.java | 6 +- .../camel/itest/springboot/util/BOMResolver.java | 22 +- .../apache/camel/tools/apt/ConverterProcessor.java | 198 +++++ .../tools/apt/EndpointAnnotationProcessor.java | 3 +- .../camel/tools/apt/ModelAnnotationProcessor.java | 3 +- .../services/javax.annotation.processing.Processor | 1 + .../pom.xml | 6 + .../camel/maven/packaging/PrepareCatalogMojo.java | 9 +- ...pdateSpringBootAutoConfigurationReadmeMojo.java | 17 +- .../model/SpringBootAutoConfigureOptionModel.java | 2 - .../src/it/simple-xml/pom.xml | 4 +- 557 files changed, 6616 insertions(+), 7199 deletions(-) create mode 100644 camel-core/src/main/docs/eips/content-based-router-eip.adoc create mode 100644 camel-core/src/main/docs/eips/transactional-client.adoc create mode 100644 camel-core/src/main/java/org/apache/camel/util/CompoundIterator.java create mode 100644 camel-core/src/main/java/org/apache/camel/util/Scanner.java copy components/{camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerLoadTest.java => camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixInheritErrorHandlerTest.java} (50%) rename components/camel-rxjava2/src/main/docs/{rxjava2-component.adoc => rxjava2.adoc} (66%) create mode 100644 components/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc create mode 100644 docs/user-manual/en/camel-boot.adoc create mode 100644 docs/user-manual/en/camel-jar-dependencies.adoc create mode 100644 docs/user-manual/en/defaulterrorhandler.adoc create mode 100644 docs/user-manual/en/error-handling-in-camel.adoc create mode 100644 docs/user-manual/en/exception-clause.adoc create mode 100644 docs/user-manual/en/predicate.adoc create mode 100644 docs/user-manual/en/transactionerrorhandler.adoc create mode 100644 docs/user-manual/en/try-catch-finally.adoc create mode 100644 tooling/apt/src/main/java/org/apache/camel/tools/apt/ConverterProcessor.java